summaryrefslogtreecommitdiff
path: root/src/superio
diff options
context:
space:
mode:
Diffstat (limited to 'src/superio')
-rw-r--r--src/superio/acpi/pnp.asl2
-rw-r--r--src/superio/winbond/w83627hf/acpi/superio.asl8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/superio/acpi/pnp.asl b/src/superio/acpi/pnp.asl
index 965145e2f7..4d3adaa9ed 100644
--- a/src/superio/acpi/pnp.asl
+++ b/src/superio/acpi/pnp.asl
@@ -116,7 +116,7 @@
#define PNP_WRITE_IO(IO_TO, RESOURCE, IO_TAG) \
CreateWordField (RESOURCE, IO_TAG._MIN, IO_TAG##I)\
- IO_TO##_LOW_BYTE = And(IO_TAG##I, 0xff) \
+ IO_TO##_LOW_BYTE = IO_TAG##I & 0xff \
IO_TO##_HIGH_BYTE = IO_TAG##I >> 8
#define PNP_WRITE_IRQ(IRQ_TO, RESOURCE, IRQ_TAG) \
diff --git a/src/superio/winbond/w83627hf/acpi/superio.asl b/src/superio/winbond/w83627hf/acpi/superio.asl
index 051fab5db5..1da3bbf035 100644
--- a/src/superio/winbond/w83627hf/acpi/superio.asl
+++ b/src/superio/winbond/w83627hf/acpi/superio.asl
@@ -724,7 +724,7 @@ Device(SIO) {
{
Local0 = 0x00
ENTER_CONFIG_MODE (3)
- If (!And(OPT2, 0x30))
+ If (!(OPT2 & 0x30))
{
If (ACTR) {
Local0 = 0x0F
@@ -849,7 +849,7 @@ Device(SIO) {
{
Local0 = 0x00
ENTER_CONFIG_MODE (3)
- If (And(OPT2, 0x30))
+ If (OPT2 & 0x30)
{
If (ACTR) {
Local0 = 0x0F
@@ -1348,7 +1348,7 @@ Device(SIO) {
ENTER_CONFIG_MODE (9)
Local0 = OPT4
Local0 &= 63
- OPT4 = Local0 | (And(Arg0, 0x03) << 6)
+ OPT4 = Local0 | ((Arg0 & 3) << 6)
EXIT_CONFIG_MODE ()
}
@@ -1358,7 +1358,7 @@ Device(SIO) {
ENTER_CONFIG_MODE (8)
Local0 = OPT4
Local0 &= 63
- OPT4 = Local0 | (And(Arg0, 0x03) << 6)
+ OPT4 = Local0 | ((Arg0 & 3) << 6)
EXIT_CONFIG_MODE ()
}