Clean up to update the reference of the these macros:

[mirror_edk2.git] / DuetPkg / DxeIpl / LegacyTable.c

diff --git a/DuetPkg/DxeIpl/LegacyTable.c b/DuetPkg/DxeIpl/LegacyTable.c
index 1175d560d88405aaa2bea1dc9f758be11356033c..823a25ac5a472d9171e4c0088a9a9f7a55bb1e5f 100644 (file)
--- a/DuetPkg/DxeIpl/LegacyTable.c
+++ b/DuetPkg/DxeIpl/LegacyTable.c
@@ -20,10 +20,11 @@ Revision History:
 \r
 #include "DxeIpl.h"\r
 #include "HobGeneration.h"\r
+#include "Debug.h"\r
 \r
 #define ACPI_RSD_PTR      0x2052545020445352LL\r
-#define MPS_PTR           EFI_SIGNATURE_32('_','M','P','_')\r
-#define SMBIOS_PTR        EFI_SIGNATURE_32('_','S','M','_')\r
+#define MPS_PTR           SIGNATURE_32('_','M','P','_')\r
+#define SMBIOS_PTR        SIGNATURE_32('_','S','M','_')\r
 \r
 #define EBDA_BASE_ADDRESS 0x40E\r
 \r
@@ -225,7 +226,7 @@ FindAcpiPtr (
   //\r
   // Check ACPI2.0 table\r
   //\r
-  if (Hob->Acpi20.Table > 0) {\r
+  if ((int)Hob->Acpi20.Table != -1) {\r
     Rsdp = (RSDP_TABLE *)(UINTN)Hob->Acpi20.Table;\r
     Rsdt = (RSDT_TABLE *)(UINTN)Rsdp->RsdtAddress;\r
     Xsdt = NULL;\r
@@ -249,7 +250,7 @@ FindAcpiPtr (
   //\r
   // Check ACPI1.0 table\r
   //\r
-  if ((AcpiTable == NULL) && (Hob->Acpi.Table > 0)) {\r
+  if ((AcpiTable == NULL) && ((int)Hob->Acpi.Table != -1)) {\r
     Rsdp = (RSDP_TABLE *)(UINTN)Hob->Acpi.Table;\r
     Rsdt = (RSDT_TABLE *)(UINTN)Rsdp->RsdtAddress;\r
     //\r
@@ -265,7 +266,7 @@ FindAcpiPtr (
 \r
 #pragma pack(1)\r
 //#define MCFG_SIGNATURE  0x4746434D\r
-#define MCFG_SIGNATURE EFI_SIGNATURE_32 ('M', 'C', 'F', 'G')\r
+#define MCFG_SIGNATURE SIGNATURE_32 ('M', 'C', 'F', 'G')\r
 typedef struct {\r
   UINT64  BaseAddress;\r
   UINT16  PciSegmentGroupNumber;\r
@@ -274,7 +275,7 @@ typedef struct {
   UINT32  Reserved;\r
 } MCFG_STRUCTURE;\r
 \r
-#define FADT_SIGNATURE EFI_SIGNATURE_32 ('F', 'A', 'C', 'P')\r
+#define FADT_SIGNATURE SIGNATURE_32 ('F', 'A', 'C', 'P')\r
 typedef struct {\r
   DESCRIPTION_HEADER    Header;\r
   UINT32                FIRMWARE_CTRL;\r
@@ -400,7 +401,7 @@ PrepareFadtTable (
   if (AcpiDescription->PM_TMR_BLK.Address == 0) {\r
     AcpiDescription->PM_TMR_BLK.Address          = Fadt->PM_TMR_BLK;\r
     AcpiDescription->PM_TMR_BLK.AddressSpaceId   = ACPI_ADDRESS_ID_IO;\r
-    AcpiDescription->PM_TMR_BLK.RegisterBitWidth = (AcpiDescription->TMR_VAL_EXT == 0) ? 24 : 32;\r
+    AcpiDescription->PM_TMR_BLK.RegisterBitWidth = (UINT8) ((AcpiDescription->TMR_VAL_EXT == 0) ? 24 : 32);\r
   }\r
 \r
   return ;\r
@@ -411,10 +412,18 @@ PrepareHobLegacyTable (
   IN HOB_TEMPLATE  *Hob\r
   )\r
 {\r
+  CHAR8    PrintBuffer[256];\r
+\r
   Hob->Acpi.Table   = (EFI_PHYSICAL_ADDRESS)(UINTN)FindAcpiRsdPtr ();\r
+  AsciiSPrint (PrintBuffer, 256, "\nAcpiTable=0x%x ", (UINT32)(UINTN)Hob->Acpi.Table);\r
+  PrintString (PrintBuffer);\r
   Hob->Acpi20.Table = (EFI_PHYSICAL_ADDRESS)(UINTN)FindAcpiRsdPtr ();\r
   Hob->Smbios.Table = (EFI_PHYSICAL_ADDRESS)(UINTN)FindSMBIOSPtr ();\r
+  AsciiSPrint (PrintBuffer, 256, "SMBIOS Table=0x%x ", (UINT32)(UINTN)Hob->Smbios.Table);\r
+  PrintString (PrintBuffer);\r
   Hob->Mps.Table    = (EFI_PHYSICAL_ADDRESS)(UINTN)FindMPSPtr ();\r
+  AsciiSPrint (PrintBuffer, 256, "MPS Table=0x%x\n", (UINT32)(UINTN)Hob->Mps.Table);\r
+  PrintString (PrintBuffer);\r
 \r
   PrepareMcfgTable (Hob);\r
 \r