Revision: 13981
http://edk2.svn.sourceforge.net/edk2/?rev=13981&view=rev
Author: jyao1
Date: 2012-12-03 01:06:28 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
Fix build error.
ACPI4.0/5.0 have clear description:
FIRMWARE_CTRL: If the X_FIRMWARE_CTRL field contains a non zero value then this
field must be zero.
X_FIRMWARE_CTRL: This field is used when the physical address of the FACS is
above 4GB. If the FIRMWARE_CTRL field contains a non zero value then this field
must be zero.
Update code in AcpiSupport/AcpiTable when it produces this field to set one
only.
Update code in AcpiS3Save when it consumes this field, check 0 value.
Signed-off-by: [email protected]
Reviewed-by: [email protected]
Modified Paths:
--------------
trunk/edk2/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
Modified:
trunk/edk2/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
2012-11-30 09:03:15 UTC (rev 13980)
+++ trunk/edk2/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
2012-12-03 01:06:28 UTC (rev 13981)
@@ -720,7 +720,7 @@
// Note: If the FIRMWARE_CTRL is non-zero, then X_FIRMWARE_CTRL must be
zero, and
// vice-versa.
//
- if ((UINT64)(UINTN)AcpiSupportInstance->Facs3 < BASE_4GB) {
+ if ((UINT64)(UINTN)AcpiTableInstance->Facs3 < BASE_4GB) {
AcpiTableInstance->Fadt3->FirmwareCtrl = (UINT32) (UINTN)
AcpiTableInstance->Facs3;
} else {
Buffer64 = (UINT64) (UINTN) AcpiTableInstance->Facs3;
@@ -849,7 +849,7 @@
// Note: If the FIRMWARE_CTRL is non-zero, then X_FIRMWARE_CTRL must
be zero, and
// vice-versa.
//
- if ((UINT64)(UINTN)AcpiSupportInstance->Facs3 < BASE_4GB) {
+ if ((UINT64)(UINTN)AcpiTableInstance->Facs3 < BASE_4GB) {
AcpiTableInstance->Fadt3->FirmwareCtrl = (UINT32) (UINTN)
AcpiTableInstance->Facs3;
} else {
Buffer64 = (UINT64) (UINTN) AcpiTableInstance->Facs3;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Keep yourself connected to Go Parallel:
BUILD Helping you discover the best ways to construct your parallel projects.
http://goparallel.sourceforge.net
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
