From f7d8f09d7637915c98fca4832d4085aec949c7e0 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Sat, 31 May 2014 13:57:52 +1000 Subject: amd/agesa,cimx: Rename ACPI OS detection methods Try to 'standardize' the otherwise peculiar method naming to be somewhat more in-line with other ACPI implementations. This makes it easier to compare with vendor DSDT dumps for example. Change-Id: I5ba54f7361796669ac0cab7ff91e7de43b22e846 Signed-off-by: Edward O'Callaghan Reviewed-on: http://review.coreboot.org/5888 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones --- src/mainboard/amd/bimini_fam10/dsdt.asl | 20 ++++++++++---------- src/mainboard/amd/dbm690t/dsdt.asl | 20 ++++++++++---------- src/mainboard/amd/inagua/acpi/mainboard.asl | 16 ++++++++-------- src/mainboard/amd/mahogany/dsdt.asl | 20 ++++++++++---------- src/mainboard/amd/mahogany_fam10/dsdt.asl | 20 ++++++++++---------- src/mainboard/amd/olivehill/acpi/mainboard.asl | 2 +- src/mainboard/amd/parmer/acpi/mainboard.asl | 2 +- src/mainboard/amd/persimmon/acpi/mainboard.asl | 16 ++++++++-------- src/mainboard/amd/pistachio/dsdt.asl | 20 ++++++++++---------- src/mainboard/amd/serengeti_cheetah/dsdt.asl | 2 +- src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl | 2 +- src/mainboard/amd/south_station/acpi/mainboard.asl | 16 ++++++++-------- src/mainboard/amd/thatcher/acpi/mainboard.asl | 2 +- src/mainboard/amd/tilapia_fam10/dsdt.asl | 20 ++++++++++---------- src/mainboard/amd/union_station/acpi/mainboard.asl | 16 ++++++++-------- 15 files changed, 97 insertions(+), 97 deletions(-) (limited to 'src/mainboard/amd') diff --git a/src/mainboard/amd/bimini_fam10/dsdt.asl b/src/mainboard/amd/bimini_fam10/dsdt.asl index 03a00e028e..7daf35c497 100644 --- a/src/mainboard/amd/bimini_fam10/dsdt.asl +++ b/src/mainboard/amd/bimini_fam10/dsdt.asl @@ -54,7 +54,7 @@ DefinitionBlock ( Name(UOM9, 6) /* Some global data */ - Name(OSTP, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ + Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ Name(PMOD, One) /* Assume APIC */ @@ -410,25 +410,25 @@ DefinitionBlock ( Scope(\_SB) { - Method(CkOT, 0){ + Method(OSFL, 0){ - if(LNotEqual(OSTP, Ones)) {Return(OSTP)} /* OS version was already detected */ + if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(CondRefOf(\_OSI,Local1)) { - Store(1, OSTP) /* Assume some form of XP */ + Store(1, OSVR) /* Assume some form of XP */ if (\_OSI("Windows 2006")) /* Vista */ { - Store(2, OSTP) + Store(2, OSVR) } } else { If(WCMP(\_OS,"Linux")) { - Store(3, OSTP) /* Linux */ + Store(3, OSVR) /* Linux */ } Else { - Store(4, OSTP) /* Gotta be WinCE */ + Store(4, OSVR) /* Gotta be WinCE */ } } - Return(OSTP) + Return(OSVR) } Method(_PIC, 0x01, NotSerialized) @@ -1381,7 +1381,7 @@ DefinitionBlock ( } Method(_INI) { - If(LEqual(OSTP,3)){ /* If we are running Linux */ + If(LEqual(OSVR,3)){ /* If we are running Linux */ Store(zero, NSEN) Store(one, NSDO) Store(one, NSDI) @@ -1628,7 +1628,7 @@ DefinitionBlock ( /* DBGO("\n") */ /* Determine the OS we're running on */ - CkOT() + OSFL() /* On older chips, clear PciExpWakeDisEn */ /*if (LLessEqual(\SBRI, 0x13)) { diff --git a/src/mainboard/amd/dbm690t/dsdt.asl b/src/mainboard/amd/dbm690t/dsdt.asl index 32df67325b..78408b5a85 100644 --- a/src/mainboard/amd/dbm690t/dsdt.asl +++ b/src/mainboard/amd/dbm690t/dsdt.asl @@ -54,7 +54,7 @@ DefinitionBlock ( Name(UOM9, 6) /* Some global data */ - Name(OSTP, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ + Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ Name(PMOD, One) /* Assume APIC */ @@ -374,25 +374,25 @@ DefinitionBlock ( Scope(\_SB) { - Method(CkOT, 0){ + Method(OSFL, 0){ - if(LNotEqual(OSTP, Ones)) {Return(OSTP)} /* OS version was already detected */ + if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(CondRefOf(\_OSI,Local1)) { - Store(1, OSTP) /* Assume some form of XP */ + Store(1, OSVR) /* Assume some form of XP */ if (\_OSI("Windows 2006")) /* Vista */ { - Store(2, OSTP) + Store(2, OSVR) } } else { If(WCMP(\_OS,"Linux")) { - Store(3, OSTP) /* Linux */ + Store(3, OSVR) /* Linux */ } Else { - Store(4, OSTP) /* Gotta be WinCE */ + Store(4, OSVR) /* Gotta be WinCE */ } } - Return(OSTP) + Return(OSVR) } Method(_PIC, 0x01, NotSerialized) @@ -1292,7 +1292,7 @@ DefinitionBlock ( } Method(_INI) { - If(LEqual(OSTP,3)){ /* If we are running Linux */ + If(LEqual(OSVR,3)){ /* If we are running Linux */ Store(zero, NSEN) Store(one, NSDO) Store(one, NSDI) @@ -1598,7 +1598,7 @@ DefinitionBlock ( /* DBGO("\n") */ /* Determine the OS we're running on */ - CkOT() + OSFL() /* On older chips, clear PciExpWakeDisEn */ /*if (LLessEqual(\SBRI, 0x13)) { diff --git a/src/mainboard/amd/inagua/acpi/mainboard.asl b/src/mainboard/amd/inagua/acpi/mainboard.asl index 49ea44fabf..caa6fee95c 100644 --- a/src/mainboard/amd/inagua/acpi/mainboard.asl +++ b/src/mainboard/amd/inagua/acpi/mainboard.asl @@ -30,30 +30,30 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ Name(SSFG, 0x0D) /* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */ /* Some global data */ -Name(OSTP, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ +Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ Name(PMOD, One) /* Assume APIC */ Scope(\_SB) { - Method(CkOT, 0){ + Method(OSFL, 0){ - if(LNotEqual(OSTP, Ones)) {Return(OSTP)} /* OS version was already detected */ + if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(CondRefOf(\_OSI,Local1)) { - Store(1, OSTP) /* Assume some form of XP */ + Store(1, OSVR) /* Assume some form of XP */ if (\_OSI("Windows 2006")) /* Vista */ { - Store(2, OSTP) + Store(2, OSVR) } } else { If(WCMP(\_OS,"Linux")) { - Store(3, OSTP) /* Linux */ + Store(3, OSVR) /* Linux */ } Else { - Store(4, OSTP) /* Gotta be WinCE */ + Store(4, OSVR) /* Gotta be WinCE */ } } - Return(OSTP) + Return(OSVR) } } diff --git a/src/mainboard/amd/mahogany/dsdt.asl b/src/mainboard/amd/mahogany/dsdt.asl index 01cb8dd250..9c2dbdffec 100644 --- a/src/mainboard/amd/mahogany/dsdt.asl +++ b/src/mainboard/amd/mahogany/dsdt.asl @@ -54,7 +54,7 @@ DefinitionBlock ( Name(UOM9, 6) /* Some global data */ - Name(OSTP, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ + Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ Name(PMOD, One) /* Assume APIC */ @@ -373,25 +373,25 @@ DefinitionBlock ( Scope(\_SB) { - Method(CkOT, 0){ + Method(OSFL, 0){ - if(LNotEqual(OSTP, Ones)) {Return(OSTP)} /* OS version was already detected */ + if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(CondRefOf(\_OSI,Local1)) { - Store(1, OSTP) /* Assume some form of XP */ + Store(1, OSVR) /* Assume some form of XP */ if (\_OSI("Windows 2006")) /* Vista */ { - Store(2, OSTP) + Store(2, OSVR) } } else { If(WCMP(\_OS,"Linux")) { - Store(3, OSTP) /* Linux */ + Store(3, OSVR) /* Linux */ } Else { - Store(4, OSTP) /* Gotta be WinCE */ + Store(4, OSVR) /* Gotta be WinCE */ } } - Return(OSTP) + Return(OSVR) } Method(_PIC, 0x01, NotSerialized) @@ -1308,7 +1308,7 @@ DefinitionBlock ( } Method(_INI) { - If(LEqual(OSTP,3)){ /* If we are running Linux */ + If(LEqual(OSVR,3)){ /* If we are running Linux */ Store(zero, NSEN) Store(one, NSDO) Store(one, NSDI) @@ -1613,7 +1613,7 @@ DefinitionBlock ( /* DBGO("\n") */ /* Determine the OS we're running on */ - CkOT() + OSFL() /* On older chips, clear PciExpWakeDisEn */ /*if (LLessEqual(\SBRI, 0x13)) { diff --git a/src/mainboard/amd/mahogany_fam10/dsdt.asl b/src/mainboard/amd/mahogany_fam10/dsdt.asl index f55480d509..c7ee70a2c5 100644 --- a/src/mainboard/amd/mahogany_fam10/dsdt.asl +++ b/src/mainboard/amd/mahogany_fam10/dsdt.asl @@ -54,7 +54,7 @@ DefinitionBlock ( Name(UOM9, 6) /* Some global data */ - Name(OSTP, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ + Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ Name(PMOD, One) /* Assume APIC */ @@ -415,25 +415,25 @@ DefinitionBlock ( Scope(\_SB) { - Method(CkOT, 0){ + Method(OSFL, 0){ - if(LNotEqual(OSTP, Ones)) {Return(OSTP)} /* OS version was already detected */ + if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(CondRefOf(\_OSI,Local1)) { - Store(1, OSTP) /* Assume some form of XP */ + Store(1, OSVR) /* Assume some form of XP */ if (\_OSI("Windows 2006")) /* Vista */ { - Store(2, OSTP) + Store(2, OSVR) } } else { If(WCMP(\_OS,"Linux")) { - Store(3, OSTP) /* Linux */ + Store(3, OSVR) /* Linux */ } Else { - Store(4, OSTP) /* Gotta be WinCE */ + Store(4, OSVR) /* Gotta be WinCE */ } } - Return(OSTP) + Return(OSVR) } Method(_PIC, 0x01, NotSerialized) @@ -1350,7 +1350,7 @@ DefinitionBlock ( } Method(_INI) { - If(LEqual(OSTP,3)){ /* If we are running Linux */ + If(LEqual(OSVR,3)){ /* If we are running Linux */ Store(zero, NSEN) Store(one, NSDO) Store(one, NSDI) @@ -1673,7 +1673,7 @@ DefinitionBlock ( /* DBGO("\n") */ /* Determine the OS we're running on */ - CkOT() + OSFL() /* On older chips, clear PciExpWakeDisEn */ /*if (LLessEqual(\SBRI, 0x13)) { diff --git a/src/mainboard/amd/olivehill/acpi/mainboard.asl b/src/mainboard/amd/olivehill/acpi/mainboard.asl index 40451438c7..05523fb19a 100644 --- a/src/mainboard/amd/olivehill/acpi/mainboard.asl +++ b/src/mainboard/amd/olivehill/acpi/mainboard.asl @@ -29,7 +29,7 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ Name(SSFG, 0x0D) /* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */ /* Some global data */ -Name(OSTP, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ +Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ Name(PMOD, One) /* Assume APIC */ diff --git a/src/mainboard/amd/parmer/acpi/mainboard.asl b/src/mainboard/amd/parmer/acpi/mainboard.asl index 040f0694fe..7631cfc654 100644 --- a/src/mainboard/amd/parmer/acpi/mainboard.asl +++ b/src/mainboard/amd/parmer/acpi/mainboard.asl @@ -31,7 +31,7 @@ Name(SSFG, 0x0D) /* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */ /* Some global data */ - Name(OSTP, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ + Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ Name(PMOD, One) /* Assume APIC */ diff --git a/src/mainboard/amd/persimmon/acpi/mainboard.asl b/src/mainboard/amd/persimmon/acpi/mainboard.asl index 49ea44fabf..caa6fee95c 100644 --- a/src/mainboard/amd/persimmon/acpi/mainboard.asl +++ b/src/mainboard/amd/persimmon/acpi/mainboard.asl @@ -30,30 +30,30 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ Name(SSFG, 0x0D) /* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */ /* Some global data */ -Name(OSTP, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ +Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ Name(PMOD, One) /* Assume APIC */ Scope(\_SB) { - Method(CkOT, 0){ + Method(OSFL, 0){ - if(LNotEqual(OSTP, Ones)) {Return(OSTP)} /* OS version was already detected */ + if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(CondRefOf(\_OSI,Local1)) { - Store(1, OSTP) /* Assume some form of XP */ + Store(1, OSVR) /* Assume some form of XP */ if (\_OSI("Windows 2006")) /* Vista */ { - Store(2, OSTP) + Store(2, OSVR) } } else { If(WCMP(\_OS,"Linux")) { - Store(3, OSTP) /* Linux */ + Store(3, OSVR) /* Linux */ } Else { - Store(4, OSTP) /* Gotta be WinCE */ + Store(4, OSVR) /* Gotta be WinCE */ } } - Return(OSTP) + Return(OSVR) } } diff --git a/src/mainboard/amd/pistachio/dsdt.asl b/src/mainboard/amd/pistachio/dsdt.asl index 3e5ba54cb5..1f512894a6 100644 --- a/src/mainboard/amd/pistachio/dsdt.asl +++ b/src/mainboard/amd/pistachio/dsdt.asl @@ -54,7 +54,7 @@ DefinitionBlock ( Name(UOM9, 6) /* Some global data */ - Name(OSTP, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ + Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ Name(PMOD, One) /* Assume APIC */ @@ -374,25 +374,25 @@ DefinitionBlock ( Scope(\_SB) { - Method(CkOT, 0){ + Method(OSFL, 0){ - if(LNotEqual(OSTP, Ones)) {Return(OSTP)} /* OS version was already detected */ + if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(CondRefOf(\_OSI,Local1)) { - Store(1, OSTP) /* Assume some form of XP */ + Store(1, OSVR) /* Assume some form of XP */ if (\_OSI("Windows 2006")) /* Vista */ { - Store(2, OSTP) + Store(2, OSVR) } } else { If(WCMP(\_OS,"Linux")) { - Store(3, OSTP) /* Linux */ + Store(3, OSVR) /* Linux */ } Else { - Store(4, OSTP) /* Gotta be WinCE */ + Store(4, OSVR) /* Gotta be WinCE */ } } - Return(OSTP) + Return(OSVR) } Method(_PIC, 0x01, NotSerialized) @@ -1291,7 +1291,7 @@ DefinitionBlock ( } Method(_INI) { - If(LEqual(OSTP,3)){ /* If we are running Linux */ + If(LEqual(OSVR,3)){ /* If we are running Linux */ Store(zero, NSEN) Store(one, NSDO) Store(one, NSDI) @@ -1521,7 +1521,7 @@ DefinitionBlock ( /* DBGO("\n") */ /* Determine the OS we're running on */ - CkOT() + OSFL() /* On older chips, clear PciExpWakeDisEn */ /*if (LLessEqual(\SBRI, 0x13)) { diff --git a/src/mainboard/amd/serengeti_cheetah/dsdt.asl b/src/mainboard/amd/serengeti_cheetah/dsdt.asl index da14fe89bf..06c9996e79 100644 --- a/src/mainboard/amd/serengeti_cheetah/dsdt.asl +++ b/src/mainboard/amd/serengeti_cheetah/dsdt.asl @@ -89,7 +89,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, "AMD-K8", "AMDACPI", 100925440) 0x0918,,, , TypeStatic) //0-CF7h }) - \_SB.OSTP () + \_SB.OSVR () CreateDWordField (BUF0, 0x3E, VLEN) CreateDWordField (BUF0, 0x36, VMAX) CreateDWordField (BUF0, 0x32, VMIN) diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl b/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl index 553a6956db..7d7d675556 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl +++ b/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl @@ -105,7 +105,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, "AMD-FAM10", "AMDACPI", 100925440) 0x0918,,, , TypeStatic) //0-CF7h }) - \_SB.OSTP () + \_SB.OSVR () CreateDWordField (BUF0, 0x3E, VLEN) CreateDWordField (BUF0, 0x36, VMAX) CreateDWordField (BUF0, 0x32, VMIN) diff --git a/src/mainboard/amd/south_station/acpi/mainboard.asl b/src/mainboard/amd/south_station/acpi/mainboard.asl index 49ea44fabf..caa6fee95c 100644 --- a/src/mainboard/amd/south_station/acpi/mainboard.asl +++ b/src/mainboard/amd/south_station/acpi/mainboard.asl @@ -30,30 +30,30 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ Name(SSFG, 0x0D) /* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */ /* Some global data */ -Name(OSTP, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ +Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ Name(PMOD, One) /* Assume APIC */ Scope(\_SB) { - Method(CkOT, 0){ + Method(OSFL, 0){ - if(LNotEqual(OSTP, Ones)) {Return(OSTP)} /* OS version was already detected */ + if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(CondRefOf(\_OSI,Local1)) { - Store(1, OSTP) /* Assume some form of XP */ + Store(1, OSVR) /* Assume some form of XP */ if (\_OSI("Windows 2006")) /* Vista */ { - Store(2, OSTP) + Store(2, OSVR) } } else { If(WCMP(\_OS,"Linux")) { - Store(3, OSTP) /* Linux */ + Store(3, OSVR) /* Linux */ } Else { - Store(4, OSTP) /* Gotta be WinCE */ + Store(4, OSVR) /* Gotta be WinCE */ } } - Return(OSTP) + Return(OSVR) } } diff --git a/src/mainboard/amd/thatcher/acpi/mainboard.asl b/src/mainboard/amd/thatcher/acpi/mainboard.asl index 040f0694fe..7631cfc654 100644 --- a/src/mainboard/amd/thatcher/acpi/mainboard.asl +++ b/src/mainboard/amd/thatcher/acpi/mainboard.asl @@ -31,7 +31,7 @@ Name(SSFG, 0x0D) /* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */ /* Some global data */ - Name(OSTP, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ + Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ Name(PMOD, One) /* Assume APIC */ diff --git a/src/mainboard/amd/tilapia_fam10/dsdt.asl b/src/mainboard/amd/tilapia_fam10/dsdt.asl index e6816b0aa0..91d0bc9dfd 100644 --- a/src/mainboard/amd/tilapia_fam10/dsdt.asl +++ b/src/mainboard/amd/tilapia_fam10/dsdt.asl @@ -54,7 +54,7 @@ DefinitionBlock ( Name(UOM9, 6) /* Some global data */ - Name(OSTP, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ + Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ Name(PMOD, One) /* Assume APIC */ @@ -415,25 +415,25 @@ DefinitionBlock ( Scope(\_SB) { - Method(CkOT, 0){ + Method(OSFL, 0){ - if(LNotEqual(OSTP, Ones)) {Return(OSTP)} /* OS version was already detected */ + if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(CondRefOf(\_OSI,Local1)) { - Store(1, OSTP) /* Assume some form of XP */ + Store(1, OSVR) /* Assume some form of XP */ if (\_OSI("Windows 2006")) /* Vista */ { - Store(2, OSTP) + Store(2, OSVR) } } else { If(WCMP(\_OS,"Linux")) { - Store(3, OSTP) /* Linux */ + Store(3, OSVR) /* Linux */ } Else { - Store(4, OSTP) /* Gotta be WinCE */ + Store(4, OSVR) /* Gotta be WinCE */ } } - Return(OSTP) + Return(OSVR) } Method(_PIC, 0x01, NotSerialized) @@ -1350,7 +1350,7 @@ DefinitionBlock ( } Method(_INI) { - If(LEqual(OSTP,3)){ /* If we are running Linux */ + If(LEqual(OSVR,3)){ /* If we are running Linux */ Store(zero, NSEN) Store(one, NSDO) Store(one, NSDI) @@ -1676,7 +1676,7 @@ DefinitionBlock ( /* DBGO("\n") */ /* Determine the OS we're running on */ - CkOT() + OSFL() /* On older chips, clear PciExpWakeDisEn */ /*if (LLessEqual(\SBRI, 0x13)) { diff --git a/src/mainboard/amd/union_station/acpi/mainboard.asl b/src/mainboard/amd/union_station/acpi/mainboard.asl index 49ea44fabf..caa6fee95c 100644 --- a/src/mainboard/amd/union_station/acpi/mainboard.asl +++ b/src/mainboard/amd/union_station/acpi/mainboard.asl @@ -30,30 +30,30 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ Name(SSFG, 0x0D) /* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */ /* Some global data */ -Name(OSTP, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ +Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ Name(PMOD, One) /* Assume APIC */ Scope(\_SB) { - Method(CkOT, 0){ + Method(OSFL, 0){ - if(LNotEqual(OSTP, Ones)) {Return(OSTP)} /* OS version was already detected */ + if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ if(CondRefOf(\_OSI,Local1)) { - Store(1, OSTP) /* Assume some form of XP */ + Store(1, OSVR) /* Assume some form of XP */ if (\_OSI("Windows 2006")) /* Vista */ { - Store(2, OSTP) + Store(2, OSVR) } } else { If(WCMP(\_OS,"Linux")) { - Store(3, OSTP) /* Linux */ + Store(3, OSVR) /* Linux */ } Else { - Store(4, OSTP) /* Gotta be WinCE */ + Store(4, OSVR) /* Gotta be WinCE */ } } - Return(OSTP) + Return(OSVR) } } -- cgit v1.2.3