Clean up DuetBdsLib:

Refine to pass CYGWIN GCC tool chain.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7410 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
index 7a4f7e8af32cde33c6c6c29fea32c20f78a59acf..e39700ddb02e5c5fc266abcaf8121b86959cabaa 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
@@ -27,6 +27,11 @@ Abstract:
 CHAR16  mFirmwareVendor[] = L"TianoCore.org";\r
 extern BOOLEAN  gConnectAllHappened;\r
 extern USB_CLASS_FORMAT_DEVICE_PATH gUsbClassKeyboardDevicePath;\r
+\r
+EFI_GUID                    *gTableGuidArray[] = {\r
+    &gEfiAcpi20TableGuid, &gEfiAcpiTableGuid, &gEfiSmbiosTableGuid, &gEfiMpsTableGuid\r
+  };\r
+\r
 //\r
 // BDS Platform Functions\r
 //\r
@@ -52,9 +57,6 @@ Returns:
   EFI_PEI_HOB_POINTERS        HobStart;\r
   EFI_PHYSICAL_ADDRESS        *Table;\r
   UINTN                       Index;\r
-  EFI_GUID                    *TableGuidArray[] = {\r
-    &gEfiAcpi20TableGuid, &gEfiAcpiTableGuid, &gEfiSmbiosTableGuid, &gEfiMpsTableGuid\r
-  };\r
 \r
   //\r
   // Get Hob List\r
@@ -63,8 +65,8 @@ Returns:
   //\r
   // Iteratively add ACPI Table, SMBIOS Table, MPS Table to EFI System Table\r
   //\r
-  for (Index = 0; Index < sizeof (TableGuidArray) / sizeof (*TableGuidArray); ++Index) {\r
-    GuidHob.Raw = GetNextGuidHob (TableGuidArray[Index], HobStart.Raw);\r
+  for (Index = 0; Index < sizeof (gTableGuidArray) / sizeof (*gTableGuidArray); ++Index) {\r
+    GuidHob.Raw = GetNextGuidHob (gTableGuidArray[Index], HobStart.Raw);\r
     if (GuidHob.Raw != NULL) {\r
       Table = GET_GUID_HOB_DATA (GuidHob.Guid);\r
       if (Table != NULL) {\r
@@ -73,8 +75,8 @@ Returns:
         // According to UEFI Spec, we should make sure Smbios table, \r
         // ACPI table and Mps tables kept in memory of specified type\r
         //\r
-        ConvertSystemTable(TableGuidArray[Index], (VOID**)&Table);\r
-        gBS->InstallConfigurationTable (TableGuidArray[Index], (VOID *)Table);\r
+        ConvertSystemTable(gTableGuidArray[Index], (VOID**)&Table);\r
+        gBS->InstallConfigurationTable (gTableGuidArray[Index], (VOID *)Table);\r
       }\r
     }\r
   }\r

diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
index 9419607410eb99d50cf210c8900c64ce14de645d..ed4bc1ef669ac35f889c4ebac78d3fecf9182af3 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
@@ -75,18 +75,24 @@ extern VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode;
   { \\r
     HARDWARE_DEVICE_PATH, \\r
     HW_PCI_DP, \\r
-    (UINT8) (sizeof (PCI_DEVICE_PATH)), \\r
-    (UINT8) ((sizeof (PCI_DEVICE_PATH)) >> 8), \\r
+    { \\r
+      (UINT8) (sizeof (PCI_DEVICE_PATH)), \\r
+      (UINT8) ((sizeof (PCI_DEVICE_PATH)) >> 8) \\r
+    }, \\r
     (Func), \\r
     (Dev) \\r
   }\r
 \r
 #define PNPID_DEVICE_PATH_NODE(PnpId) \\r
   { \\r
-    ACPI_DEVICE_PATH, \\r
-    ACPI_DP, \\r
-    (UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), \\r
-    (UINT8) ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8), \\r
+    { \\r
+      ACPI_DEVICE_PATH, \\r
+      ACPI_DP, \\r
+      { \\r
+        (UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), \\r
+        (UINT8) ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8) \\r
+      } \\r
+    }, \\r
     EISA_PNP_ID((PnpId)), \\r
     0 \\r
   }\r
@@ -108,10 +114,14 @@ extern VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode;
 \r
 #define gUart \\r
   { \\r
-    MESSAGING_DEVICE_PATH, \\r
-    MSG_UART_DP, \\r
-    (UINT8) (sizeof (UART_DEVICE_PATH)), \\r
-    (UINT8) ((sizeof (UART_DEVICE_PATH)) >> 8), \\r
+    { \\r
+      MESSAGING_DEVICE_PATH, \\r
+      MSG_UART_DP, \\r
+      { \\r
+        (UINT8) (sizeof (UART_DEVICE_PATH)), \\r
+        (UINT8) ((sizeof (UART_DEVICE_PATH)) >> 8) \\r
+      } \\r
+    }, \\r
     0, \\r
     115200, \\r
     8, \\r
@@ -121,10 +131,14 @@ extern VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode;
 \r
 #define gPcAnsiTerminal \\r
   { \\r
-    MESSAGING_DEVICE_PATH, \\r
-    MSG_VENDOR_DP, \\r
-    (UINT8) (sizeof (VENDOR_DEVICE_PATH)), \\r
-    (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8), \\r
+    { \\r
+      MESSAGING_DEVICE_PATH, \\r
+      MSG_VENDOR_DP, \\r
+      { \\r
+        (UINT8) (sizeof (VENDOR_DEVICE_PATH)), \\r
+        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8) \\r
+      } \\r
+    }, \\r
     DEVICE_PATH_MESSAGING_PC_ANSI \\r
   }\r
 \r
@@ -132,8 +146,10 @@ extern VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode;
   { \\r
     END_DEVICE_PATH_TYPE, \\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE, \\r
-    END_DEVICE_PATH_LENGTH, \\r
-    0 \\r
+    { \\r
+      END_DEVICE_PATH_LENGTH, \\r
+      0 \\r
+    } \\r
   }\r
 \r
 #define PCI_CLASS_SCC          0x07\r

diff --git a/DuetPkg/Library/DuetBdsLib/PlatformData.c b/DuetPkg/Library/DuetBdsLib/PlatformData.c
index e1a0cde3d4b50bac2023c9969087d9156510a83d..8aafa16a06d17e02043b66f6ca596b6f88028a53 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/PlatformData.c
+++ b/DuetPkg/Library/DuetBdsLib/PlatformData.c
@@ -50,8 +50,10 @@ USB_CLASS_FORMAT_DEVICE_PATH gUsbClassKeyboardDevicePath = {
     {\r
       MESSAGING_DEVICE_PATH,\r
       MSG_USB_CLASS_DP,\r
-      (UINT8) (sizeof (USB_CLASS_DEVICE_PATH)),\r
-      (UINT8) ((sizeof (USB_CLASS_DEVICE_PATH)) >> 8)\r
+      {\r
+        (UINT8) (sizeof (USB_CLASS_DEVICE_PATH)),\r
+        (UINT8) ((sizeof (USB_CLASS_DEVICE_PATH)) >> 8)\r
+      }\r
     },\r
     0xffff,           // VendorId \r
     0xffff,           // ProductId \r
@@ -63,8 +65,10 @@ USB_CLASS_FORMAT_DEVICE_PATH gUsbClassKeyboardDevicePath = {
   { \r
     END_DEVICE_PATH_TYPE, \r
     END_ENTIRE_DEVICE_PATH_SUBTYPE, \r
-    END_DEVICE_PATH_LENGTH, \r
-    0\r
+    {\r
+      END_DEVICE_PATH_LENGTH, \r
+      0\r
+    }\r
   }\r
 };\r
 \r