diff options
Diffstat (limited to 'src/superio')
| -rw-r--r-- | src/superio/acpi/pnp.asl | 2 | ||||
| -rw-r--r-- | src/superio/winbond/w83627hf/acpi/superio.asl | 32 |
2 files changed, 17 insertions, 17 deletions
diff --git a/src/superio/acpi/pnp.asl b/src/superio/acpi/pnp.asl index 167c3636b1..965145e2f7 100644 --- a/src/superio/acpi/pnp.asl +++ b/src/superio/acpi/pnp.asl @@ -102,7 +102,7 @@ #define PNP_READ_IO(IO_FROM, RESOURCE_TEMPLATE, IO_TAG) \ CreateWordField (RESOURCE_TEMPLATE, IO_TAG._MIN, IO_TAG##I)\ CreateWordField (RESOURCE_TEMPLATE, IO_TAG._MAX, IO_TAG##A)\ - Or (IO_FROM##_HIGH_BYTE << 8, IO_FROM##_LOW_BYTE, Local0)\ + Local0 = (IO_FROM##_HIGH_BYTE << 8) | IO_FROM##_LOW_BYTE \ IO_TAG##I = Local0 \ IO_TAG##A = Local0 diff --git a/src/superio/winbond/w83627hf/acpi/superio.asl b/src/superio/winbond/w83627hf/acpi/superio.asl index 24c1323ea7..b2dffc63b8 100644 --- a/src/superio/winbond/w83627hf/acpi/superio.asl +++ b/src/superio/winbond/w83627hf/acpi/superio.asl @@ -259,7 +259,7 @@ Device(SIO) { EXIT_CONFIG_MODE () /* Calculate full IO port address */ - Or(Local1 << 8, Local0, Local0) + Local0 |= Local1 << 8 /* Modify the resource template and return it */ CreateWordField (CRS, IO0._MIN, IMIN) @@ -305,7 +305,7 @@ Device(SIO) { Local2 = IO1L EXIT_CONFIG_MODE () Local1 <<= 8 - Or(Local1, Local2, Local1) + Local1 |= Local2 If (!Local0) { Return (FDE) } @@ -402,7 +402,7 @@ Device(SIO) { And(Arg0, 0x07, Local0) ENTER_CONFIG_MODE (1) And(OPT1, 0x3, Local1) - Or(Local1, Local0, OPT1) + OPT1 = Local1 | Local0 EXIT_CONFIG_MODE() } @@ -483,7 +483,7 @@ Device(SIO) { Local5 = IRQ0 EXIT_CONFIG_MODE () /* Calculate IO port and modify template */ - Or(Local1 << 8, Local0, Local0) + Local0 |= Local1 << 8 IOP0 = Local1 IOR0 = Local1 @@ -579,7 +579,7 @@ Device(SIO) { /* Mode */ Local3 = OPT1 And (Local3, 0xF8, Local3) - Or (Local2, Local3, OPT1) + OPT1 = Local2 | Local3 /* DMA off */ DMA0 = 0x04 /* IRQ */ @@ -651,7 +651,7 @@ Device(SIO) { Local1 = IO1H Local2 = IRQ0 EXIT_CONFIG_MODE () - Or(Local1 << 8, Local0, Local0) + Local0 |= Local1 << 8 CreateWordField (CRS, IO0._MIN, IMIN) IMIN = Local0 @@ -776,7 +776,7 @@ Device(SIO) { Local1 = IO1H Local2 = IRQ0 EXIT_CONFIG_MODE () - Or(Local1 << 8, Local0, Local0) + Local0 |= Local1 << 8 CreateWordField (CRS, IO0._MIN, IMIN) IMIN = Local0 @@ -901,7 +901,7 @@ Device(SIO) { Local0 = IO1L Local2 = IRQ0 EXIT_CONFIG_MODE () - Or(Local1 << 8, Local0, Local0) + Local0 |= Local1 << 8 CreateWordField (CRS, IO0._MIN, IMIN) IMIN = Local0 @@ -1004,7 +1004,7 @@ Device(SIO) { Local1 = IO1H Local2 = IRQ0 EXIT_CONFIG_MODE () - Or(Local1 << 8, Local0, Local0) + Local0 |= Local1 << 8 CreateWordField (CRS, IO0._MIN, IMIN) IMIN = Local0 @@ -1099,8 +1099,8 @@ Device(SIO) { Local4 = IRQ0 EXIT_CONFIG_MODE () - Or(Local1 << 8, Local0, Local0) - Or(Local3 << 8, Local2, Local2) + Local0 |= Local1 << 8 + Local2 |= Local3 << 8 CreateWordField (CRS, IO0._MIN, IMIN) IMIN = Local0 @@ -1268,7 +1268,7 @@ Device(SIO) { Local2 = IRQ0 EXIT_CONFIG_MODE () - Or(Local1 << 8, Local0, Local0) + Local0 |= Local1 << 8 CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MAX, IMAX) @@ -1323,7 +1323,7 @@ Device(SIO) { Local2 = IRQ1 EXIT_CONFIG_MODE () - Or(Local1 << 8, Local0, Local0) + Local0 |= Local1 << 8 CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MAX, IMAX) @@ -1348,7 +1348,7 @@ Device(SIO) { ENTER_CONFIG_MODE (9) Local0 = OPT4 And(Local0, 63, Local0) - Or(Local0, And(Arg0, 0x03) << 6, OPT4) + OPT4 = Local0 | (And(Arg0, 0x03) << 6) EXIT_CONFIG_MODE () } @@ -1358,7 +1358,7 @@ Device(SIO) { ENTER_CONFIG_MODE (8) Local0 = OPT4 And(Local0, 63, Local0) - Or(Local0, And(Arg0, 0x03) << 6, OPT4) + OPT4 = Local0 | (And(Arg0, 0x03) << 6) EXIT_CONFIG_MODE () } @@ -1422,7 +1422,7 @@ Device(SIO) { Local2 = IRQ1 EXIT_CONFIG_MODE () - Or(Local1 << 8, Local0, Local0) + Local0 |= Local1 << 8 CreateWordField (CRS, IO0._MIN, IMIN) CreateWordField (CRS, IO0._MAX, IMAX) |