From: tgingold <tgingold@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 12 Feb 2007 07:21:12 +0000 (+0000)
Subject: fix gcc warnings (missing braces around initializer)
X-Git-Tag: edk2-stable201903~23512
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=2419bd23d2bc617af79dfd89fdbf3a05fa6251fe

fix gcc warnings (missing braces around initializer)

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

diff --git a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscDevicePath.h b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscDevicePath.h
index dd78a7af12..ae0e6337f6 100644
--- a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscDevicePath.h
+++ b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscDevicePath.h
@@ -43,23 +43,23 @@ Abstract:
 //
 #define DP_ACPI \
   { \
-    ACPI_DEVICE_PATH, ACPI_DP, (UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), (UINT8) \
-      ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8), EISA_PNP_ID (0x0A03), 0 \
+      {ACPI_DEVICE_PATH, ACPI_DP, {(UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), (UINT8) \
+      ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8)}}, EISA_PNP_ID (0x0A03), 0 \
   }
 #define DP_PCI(device, function) \
   { \
-    HARDWARE_DEVICE_PATH, HW_PCI_DP, (UINT8) (sizeof (PCI_DEVICE_PATH)), (UINT8) \
-      ((sizeof (PCI_DEVICE_PATH)) >> 8), function, device \
+      {HARDWARE_DEVICE_PATH, HW_PCI_DP, {(UINT8) (sizeof (PCI_DEVICE_PATH)), (UINT8) \
+       ((sizeof (PCI_DEVICE_PATH)) >> 8)}}, function, device \
   }
 #define DP_END \
   { \
-    END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, END_DEVICE_PATH_LENGTH, 0 \
+    END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, {END_DEVICE_PATH_LENGTH, 0} \
   }
 
 #define DP_LPC(eisaid, function) \
   { \
-    ACPI_DEVICE_PATH, ACPI_DP, (UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), (UINT8) \
-      ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8), EISA_PNP_ID (eisaid), function \
+    {ACPI_DEVICE_PATH, ACPI_DP, {(UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), (UINT8) \
+     ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8)}}, EISA_PNP_ID (eisaid), function \
   }
 
 //
diff --git a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscPortInternalConnectorDesignatorData.c b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscPortInternalConnectorDesignatorData.c
index 78eac76393..3cfc871553 100644
--- a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscPortInternalConnectorDesignatorData.c
+++ b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscPortInternalConnectorDesignatorData.c
@@ -31,7 +31,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortConnectorTypeOther,  // PortInternalConnectorType
   EfiPortConnectorTypeOther,  // PortExternalConnectorType
   EfiPortTypeNone,            // PortType
-  {0, 0, 0}                         // PortPath
+  {{{{0, 0, {0, 0}}, 0, 0}, {{0, 0, {0, 0}}, 0, 0}, {0, 0, {0, 0}}}} // PortPath
 };
 
 //
@@ -45,7 +45,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortTypeKeyboard,      // PortType
   // mPs2KbyboardDevicePath                          // PortPath
   //
-  {0}
+  {{{{0, 0, {0, 0}}, 0, 0}, {{0, 0, {0, 0}}, 0, 0}, {0, 0, {0, 0}}}} // PortPath
 };
 
 MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscPortMouse) = {
@@ -56,7 +56,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortTypeMouse,         // PortType
   // mPs2MouseDevicePath                // PortPath
   //
-  {0}
+  {{{{0, 0, {0, 0}}, 0, 0}, {{0, 0, {0, 0}}, 0, 0}, {0, 0, {0, 0}}}} // PortPath
 };
 
 
@@ -66,7 +66,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortConnectorTypeNone,
   EfiPortConnectorTypeDB9Female,
   EfiPortTypeSerial16550ACompatible,
-  {0}
+  {{{{0, 0, {0, 0}}, 0, 0}, {{0, 0, {0, 0}}, 0, 0}, {0, 0, {0, 0}}}} // PortPath
 };
 
 MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscPortCom2) = {
@@ -75,7 +75,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortConnectorTypeNone,
   EfiPortConnectorTypeDB9Female,
   EfiPortTypeSerial16550ACompatible,
-  0
+  {{{{0, 0, {0, 0}}, 0, 0}, {{0, 0, {0, 0}}, 0, 0}, {0, 0, {0, 0}}}} // PortPath
 };
 
 MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscPortExtensionPower) = {
@@ -84,7 +84,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortConnectorTypeOther,
   EfiPortConnectorTypeNone,
   EfiPortTypeOther,
-  {0}
+  {{{{0, 0, {0, 0}}, 0, 0}, {{0, 0, {0, 0}}, 0, 0}, {0, 0, {0, 0}}}} // PortPath
 };
 
 MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscPortFloppy) = {
@@ -93,7 +93,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortConnectorTypeOnboardFloppy,
   EfiPortConnectorTypeNone,
   EfiPortTypeOther,
-  {0}
+  {{{{0, 0, {0, 0}}, 0, 0}, {{0, 0, {0, 0}}, 0, 0}, {0, 0, {0, 0}}}} // PortPath
 };
 
 /* eof - MiscPortInternalConnectorDesignatorData.c */
diff --git a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSystemManufacturerData.c b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSystemManufacturerData.c
index be53e39a71..6d795313a2 100644
--- a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSystemManufacturerData.c
+++ b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSystemManufacturerData.c
@@ -39,14 +39,16 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_SYSTEM_MANUFACTURER_DATA, MiscSystemManufactur
     0xbadfaced,
     0xdead,
     0xbeef,
-    0x13,
-    0x13,
-    0x13,
-    0x13,
-    0x13,
-    0x13,
-    0x13,
-    0x13
+    {
+      0x13,
+      0x13,
+      0x13,
+      0x13,
+      0x13,
+      0x13,
+      0x13,
+      0x13
+    }
   },
   // SystemUuid
   EfiSystemWakeupTypePowerSwitch  // SystemWakeupType
diff --git a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSystemOptionStringData.c b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSystemOptionStringData.c
index 8c00350f64..8627f1c24d 100644
--- a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSystemOptionStringData.c
+++ b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSystemOptionStringData.c
@@ -26,7 +26,7 @@ Abstract:
 // Static (possibly build generated) Bios Vendor data.
 //
 MISC_SUBCLASS_TABLE_DATA(EFI_MISC_SYSTEM_OPTION_STRING_DATA, SystemOptionString) = {
-  STRING_TOKEN(STR_MISC_SYSTEM_OPTION_STRING)
+  {STRING_TOKEN(STR_MISC_SYSTEM_OPTION_STRING)}
 };
 
 /* eof - MiscSystemOptionStringData.c */
diff --git a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSystemSlotDesignationData.c b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSystemSlotDesignationData.c
index d5e1474fe2..1ea2615c08 100644
--- a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSystemSlotDesignationData.c
+++ b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSystemSlotDesignationData.c
@@ -46,7 +46,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_SYSTEM_SLOT_DESIGNATION_DATA, MiscSystemSlotDe
     0,                      // SmbusSignalSupported    :1;
     0                       // Reserved                :21;
   },
-  0                         // SlotDevicePath
+  {0, 0, {0, 0}}            // SlotDevicePath
 };
 
 /* eof - MiscSystemSlotsData.c */