diff options
| -rw-r--r-- | src/mainboard/packardbell/ms2290/acpi/platform.asl | 22 | ||||
| -rw-r--r-- | src/mainboard/packardbell/ms2290/acpi/thermal.asl | 12 |
2 files changed, 17 insertions, 17 deletions
diff --git a/src/mainboard/packardbell/ms2290/acpi/platform.asl b/src/mainboard/packardbell/ms2290/acpi/platform.asl index 297eeb4f31..9ec8e6ef41 100644 --- a/src/mainboard/packardbell/ms2290/acpi/platform.asl +++ b/src/mainboard/packardbell/ms2290/acpi/platform.asl @@ -46,47 +46,47 @@ Scope(\_SB) */ /* Let's assume we're running at least Windows 2000 */ - Store (2000, OSYS) + OSYS = 2000 If (CondRefOf(_OSI)) { If (_OSI("Windows 2001")) { - Store (2001, OSYS) + OSYS = 2001 } If (_OSI("Windows 2001 SP1")) { - Store (2001, OSYS) + OSYS = 2001 } If (_OSI("Windows 2001 SP2")) { - Store (2002, OSYS) + OSYS = 2002 } If (_OSI("Windows 2001.1")) { - Store (2001, OSYS) + OSYS = 2001 } If (_OSI("Windows 2001.1 SP1")) { - Store (2001, OSYS) + OSYS = 2001 } If (_OSI("Windows 2006")) { - Store (2006, OSYS) + OSYS = 2006 } If (_OSI("Windows 2006.1")) { - Store (2006, OSYS) + OSYS = 2006 } If (_OSI("Windows 2006 SP1")) { - Store (2006, OSYS) + OSYS = 2006 } If (_OSI("Windows 2009")) { - Store (2009, OSYS) + OSYS = 2009 } If (_OSI("Windows 2012")) { - Store (2012, OSYS) + OSYS = 2012 } } } diff --git a/src/mainboard/packardbell/ms2290/acpi/thermal.asl b/src/mainboard/packardbell/ms2290/acpi/thermal.asl index 8d24127748..a6935041b8 100644 --- a/src/mainboard/packardbell/ms2290/acpi/thermal.asl +++ b/src/mainboard/packardbell/ms2290/acpi/thermal.asl @@ -6,13 +6,13 @@ Scope(\_TZ) Method(C2K, 1, NotSerialized) { - Multiply(Arg0, 10, Local0) - Add (Local0, 2732, Local0) - if (LLessEqual(Local0, 2732)) { + Local0 = Arg0 * 10 + Local0 += 2732 + if (Local0 <= 2732) { Return (3000) } - if (LGreater(Local0, 4012)) { + if (Local0 > 4012) { Return (3000) } Return (Local0) @@ -25,10 +25,10 @@ Scope(\_TZ) } Method(_TMP) { /* Avoid tripping alarm if ME isn't booted at all yet */ - If (LAnd (LNot (MEBT), LEqual (\_SB.PCI0.LPCB.EC.TMP0, 128))) { + If (!MEBT && (\_SB.PCI0.LPCB.EC.TMP0 == 128)) { Return (C2K(40)) } - Store (1, MEBT) + MEBT = 1 Return (C2K(\_SB.PCI0.LPCB.EC.TMP0)) } } |