diff options
Diffstat (limited to 'Core')
| -rw-r--r-- | Core/CSPLib/FID.c | 6 | ||||
| -rw-r--r-- | Core/EM/ACPI/AcpiCore.c | 4 | ||||
| -rw-r--r-- | Core/EM/ACPI/mptable.c | 4 | ||||
| -rw-r--r-- | Core/EM/SMM/SmmCommunicate.c | 6 |
4 files changed, 11 insertions, 9 deletions
diff --git a/Core/CSPLib/FID.c b/Core/CSPLib/FID.c index 8b33f92..17b0ba0 100644 --- a/Core/CSPLib/FID.c +++ b/Core/CSPLib/FID.c @@ -81,8 +81,10 @@ FW_VERSION FwVersionData = { TWO_DIGIT_MINUTE_INT, TWO_DIGIT_SECOND_INT, 0xffff, - CONVERT_TO_STRING(T_ACPI_OEM_ID), - CONVERT_TO_STRING(T_ACPI_OEM_TBL_ID), +// CONVERT_TO_STRING(T_ACPI_OEM_ID), +// CONVERT_TO_STRING(T_ACPI_OEM_TBL_ID), + T_ACPI_OEM_ID, + T_ACPI_OEM_TBL_ID, 49, { 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, diff --git a/Core/EM/ACPI/AcpiCore.c b/Core/EM/ACPI/AcpiCore.c index 7cb3366..fa37a46 100644 --- a/Core/EM/ACPI/AcpiCore.c +++ b/Core/EM/ACPI/AcpiCore.c @@ -586,8 +586,8 @@ MADT_ENTRY_HEADER * BuildLocalApicNmi( IN UINT16 Flags ); -UINT8 ACPI_OEM_ID[6] = ACPI_OEM_ID_MAK; //"A M I"; //add 0 at the end.OemId 6 bytes -UINT8 ACPI_OEM_TBL_ID[8] = ACPI_OEM_TBL_ID_MAK; //"ALASKA"; //add 0 at the end.OemTableId 8 bytes +UINT8 ACPI_OEM_ID[6] = T_ACPI_OEM_ID ;//ACPI_OEM_ID_MAK; //"A M I"; //add 0 at the end.OemId 6 bytes +UINT8 ACPI_OEM_TBL_ID[8] = T_ACPI_OEM_TBL_ID ;//ACPI_OEM_TBL_ID_MAK; //"ALASKA"; //add 0 at the end.OemTableId 8 bytes #if defined(OemActivation_SUPPORT) && (OemActivation_SUPPORT == 1) #define EFI_OA3_MSDM_VARIABLE L"OA3MSDMvariable" diff --git a/Core/EM/ACPI/mptable.c b/Core/EM/ACPI/mptable.c index 66fe0d4..9260a7b 100644 --- a/Core/EM/ACPI/mptable.c +++ b/Core/EM/ACPI/mptable.c @@ -188,8 +188,8 @@ static VOID *MpsExTableCurrentPointer = NULL; static UINT16 BaseTableLength = 0; static UINT16 BaseTableEntryCount = 0; static UINT16 ExtendedTableLength = 0; -static UINT8 OemId[8] = CONVERT_TO_STRING(T_ACPI_OEM_TBL_ID); //{ 0,1,2,3,4,5,6,7 }; -static UINT8 ProductId[12] = CONVERT_TO_STRING(T_ACPI_OEM_ID); //{ 0,1,2,3,4,5,6,7,8,9,0xA, 0xB }; +static UINT8 OemId[8] = T_ACPI_OEM_TBL_ID ;//CONVERT_TO_STRING(T_ACPI_OEM_TBL_ID); //{ 0,1,2,3,4,5,6,7 }; +static UINT8 ProductId[12] = T_ACPI_OEM_ID ;//CONVERT_TO_STRING(T_ACPI_OEM_ID); //{ 0,1,2,3,4,5,6,7,8,9,0xA, 0xB }; static BUS_INFO BusEntry[MP_TABLE_MAX_BUS_ENTRIES]; static UINT8 MaxBusId = 0; diff --git a/Core/EM/SMM/SmmCommunicate.c b/Core/EM/SMM/SmmCommunicate.c index 929118e..6eeb459 100644 --- a/Core/EM/SMM/SmmCommunicate.c +++ b/Core/EM/SMM/SmmCommunicate.c @@ -28,7 +28,7 @@ // [Category] Bug Fix // [Severity] Important // [Symptom] Using SMM Communication can cause OS to hang -// [RootCause] SMM Communication Protocol’s Communicate API does not +// [RootCause] SMM Communication Protocol�s Communicate API does not // function in UEFI OS after Exit boot services event because // ConvertPointer() did not convert SMM_COMMUNICATE_DATA *gCommunicateData // pointer from a Physical Memory Map Pointer to a Virtual Memory Map @@ -251,8 +251,8 @@ ACPI_SMM_COMM_TABLE gAcpiSmmCommTable = sizeof(ACPI_SMM_COMM_TABLE), 1, //Revision 0, //Checksum - CONVERT_TO_STRING(T_ACPI_OEM_ID), - CONVERT_TO_STRING(T_ACPI_OEM_TBL_ID), + T_ACPI_OEM_ID, //CONVERT_TO_STRING(T_ACPI_OEM_ID), + T_ACPI_OEM_TBL_ID, //CONVERT_TO_STRING(T_ACPI_OEM_TBL_ID), ACPI_OEM_REV, 0, //Creator ID 0, //Creator Revision, |