271,272c271,272
< #define ACPI_REGISTER_PREPARE_BITS(Val, Pos, Mask) ((Val << Pos) & Mask)
< #define ACPI_REGISTER_INSERT_VALUE(Reg, Pos, Mask, Val) Reg = (Reg & (~(Mask))) | ACPI_REGISTER_PREPARE_BITS(Val, Pos, Mask)
---
> #define ACPI_REGISTER_PREPARE_BITS(Val, Pos, Mask) \
> ((Val << Pos) & Mask)
274c274,275
< #define ACPI_INSERT_BITS(Target, Mask, Source) Target = ((Target & (~(Mask))) | (Source & Mask))
---
> #define ACPI_REGISTER_INSERT_VALUE(Reg, Pos, Mask, Val) \
> Reg = (Reg & (~(Mask))) | ACPI_REGISTER_PREPARE_BITS(Val, Pos, Mask)
275a277,298
> #define ACPI_INSERT_BITS(Target, Mask, Source) \
> Target = ((Target & (~(Mask))) | (Source & Mask))
>
> /* Generic bitfield macros and masks */
>
> #define ACPI_GET_BITS(SourcePtr, Position, Mask) \
> ((*SourcePtr >> Position) & Mask)
>
> #define ACPI_SET_BITS(TargetPtr, Position, Mask, Value) \
> (*TargetPtr |= ((Value & Mask) << Position))
>
> #define ACPI_1BIT_MASK 0x00000001
> #define ACPI_2BIT_MASK 0x00000003
> #define ACPI_3BIT_MASK 0x00000007
> #define ACPI_4BIT_MASK 0x0000000F
> #define ACPI_5BIT_MASK 0x0000001F
> #define ACPI_6BIT_MASK 0x0000003F
> #define ACPI_7BIT_MASK 0x0000007F
> #define ACPI_8BIT_MASK 0x000000FF
> #define ACPI_16BIT_MASK 0x0000FFFF
> #define ACPI_24BIT_MASK 0x00FFFFFF
>