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/southbridge/amd/agesa/hudson/acpi/audio.asl | 2 +- src/southbridge/amd/agesa/hudson/acpi/fch.asl | 16 ++++++++-------- src/southbridge/amd/cimx/sb800/acpi/fch.asl | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/southbridge') diff --git a/src/southbridge/amd/agesa/hudson/acpi/audio.asl b/src/southbridge/amd/agesa/hudson/acpi/audio.asl index 3140215904..2c25ab5bd0 100644 --- a/src/southbridge/amd/agesa/hudson/acpi/audio.asl +++ b/src/southbridge/amd/agesa/hudson/acpi/audio.asl @@ -47,7 +47,7 @@ Device(AZHD) { /* 0:14.2 - HD Audio */ Method (_INI, 0, NotSerialized) { - If (LEqual (OSTP, 0x03)) + If (LEqual (OSVR, 0x03)) { Store (Zero, NSEN) Store (One, NSDO) diff --git a/src/southbridge/amd/agesa/hudson/acpi/fch.asl b/src/southbridge/amd/agesa/hudson/acpi/fch.asl index b04bc59557..997677ef8c 100644 --- a/src/southbridge/amd/agesa/hudson/acpi/fch.asl +++ b/src/southbridge/amd/agesa/hudson/acpi/fch.asl @@ -177,30 +177,30 @@ Method(_INI, 0) { /* DBGO("\n") */ /* Determine the OS we're running on */ - CkOT() + OSFL() /* TODO: It is unstable. */ //#include "acpi/AmdImc.asl" /* Hudson IMC function */ //ITZE() /* enable IMC Fan Control*/ } /* End Method(_SB._INI) */ -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/southbridge/amd/cimx/sb800/acpi/fch.asl b/src/southbridge/amd/cimx/sb800/acpi/fch.asl index 77c47325b6..9bbd8bcad9 100644 --- a/src/southbridge/amd/cimx/sb800/acpi/fch.asl +++ b/src/southbridge/amd/cimx/sb800/acpi/fch.asl @@ -178,7 +178,7 @@ Method(_INI, 0) { /* DBGO("\n") */ /* Determine the OS we're running on */ - CkOT() + OSFL() /* On older chips, clear PciExpWakeDisEn */ /*if (LLessEqual(\SBRI, 0x13)) { -- cgit v1.2.3