fix gcc warnings (missing braces around initializer)
authortgingold <tgingold@de2fecce-e211-0410-80a6-f3fac2684e05>
Mon, 12 Feb 2007 07:21:12 +0000 (07:21 +0000)
committertgingold <tgingold@de2fecce-e211-0410-80a6-f3fac2684e05>
Mon, 12 Feb 2007 07:21:12 +0000 (07:21 +0000)
git-svn-id: https://edk2.tianocore.org/svn/edk2/trunk@2365 de2fecce-e211-0410-80a6-f3fac2684e05

edk2/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscDevicePath.h
edk2/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscPortInternalConnectorDesignatorData.c
edk2/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSystemManufacturerData.c
edk2/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSystemOptionStringData.c
edk2/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSystemSlotDesignationData.c

index dd78a7a..ae0e633 100644 (file)
@@ -43,23 +43,23 @@ Abstract:
 //\r
 #define DP_ACPI \\r
   { \\r
-    ACPI_DEVICE_PATH, ACPI_DP, (UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), (UINT8) \\r
-      ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8), EISA_PNP_ID (0x0A03), 0 \\r
+      {ACPI_DEVICE_PATH, ACPI_DP, {(UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), (UINT8) \\r
+      ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8)}}, EISA_PNP_ID (0x0A03), 0 \\r
   }\r
 #define DP_PCI(device, function) \\r
   { \\r
-    HARDWARE_DEVICE_PATH, HW_PCI_DP, (UINT8) (sizeof (PCI_DEVICE_PATH)), (UINT8) \\r
-      ((sizeof (PCI_DEVICE_PATH)) >> 8), function, device \\r
+      {HARDWARE_DEVICE_PATH, HW_PCI_DP, {(UINT8) (sizeof (PCI_DEVICE_PATH)), (UINT8) \\r
+       ((sizeof (PCI_DEVICE_PATH)) >> 8)}}, function, device \\r
   }\r
 #define DP_END \\r
   { \\r
-    END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, END_DEVICE_PATH_LENGTH, 0 \\r
+    END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, {END_DEVICE_PATH_LENGTH, 0} \\r
   }\r
 \r
 #define DP_LPC(eisaid, function) \\r
   { \\r
-    ACPI_DEVICE_PATH, ACPI_DP, (UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), (UINT8) \\r
-      ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8), EISA_PNP_ID (eisaid), function \\r
+    {ACPI_DEVICE_PATH, ACPI_DP, {(UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), (UINT8) \\r
+     ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8)}}, EISA_PNP_ID (eisaid), function \\r
   }\r
 \r
 //\r
index 78eac76..3cfc871 100644 (file)
@@ -31,7 +31,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortConnectorTypeOther,  // PortInternalConnectorType\r
   EfiPortConnectorTypeOther,  // PortExternalConnectorType\r
   EfiPortTypeNone,            // PortType\r
-  {0, 0, 0}                         // PortPath\r
+  {{{{0, 0, {0, 0}}, 0, 0}, {{0, 0, {0, 0}}, 0, 0}, {0, 0, {0, 0}}}} // PortPath\r
 };\r
 \r
 //\r
@@ -45,7 +45,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortTypeKeyboard,      // PortType\r
   // mPs2KbyboardDevicePath                          // PortPath\r
   //\r
-  {0}\r
+  {{{{0, 0, {0, 0}}, 0, 0}, {{0, 0, {0, 0}}, 0, 0}, {0, 0, {0, 0}}}} // PortPath\r
 };\r
 \r
 MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscPortMouse) = {\r
@@ -56,7 +56,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortTypeMouse,         // PortType\r
   // mPs2MouseDevicePath                // PortPath\r
   //\r
-  {0}\r
+  {{{{0, 0, {0, 0}}, 0, 0}, {{0, 0, {0, 0}}, 0, 0}, {0, 0, {0, 0}}}} // PortPath\r
 };\r
 \r
 \r
@@ -66,7 +66,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortConnectorTypeNone,\r
   EfiPortConnectorTypeDB9Female,\r
   EfiPortTypeSerial16550ACompatible,\r
-  {0}\r
+  {{{{0, 0, {0, 0}}, 0, 0}, {{0, 0, {0, 0}}, 0, 0}, {0, 0, {0, 0}}}} // PortPath\r
 };\r
 \r
 MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscPortCom2) = {\r
@@ -75,7 +75,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortConnectorTypeNone,\r
   EfiPortConnectorTypeDB9Female,\r
   EfiPortTypeSerial16550ACompatible,\r
-  0\r
+  {{{{0, 0, {0, 0}}, 0, 0}, {{0, 0, {0, 0}}, 0, 0}, {0, 0, {0, 0}}}} // PortPath\r
 };\r
 \r
 MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscPortExtensionPower) = {\r
@@ -84,7 +84,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortConnectorTypeOther,\r
   EfiPortConnectorTypeNone,\r
   EfiPortTypeOther,\r
-  {0}\r
+  {{{{0, 0, {0, 0}}, 0, 0}, {{0, 0, {0, 0}}, 0, 0}, {0, 0, {0, 0}}}} // PortPath\r
 };\r
 \r
 MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscPortFloppy) = {\r
@@ -93,7 +93,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortConnectorTypeOnboardFloppy,\r
   EfiPortConnectorTypeNone,\r
   EfiPortTypeOther,\r
-  {0}\r
+  {{{{0, 0, {0, 0}}, 0, 0}, {{0, 0, {0, 0}}, 0, 0}, {0, 0, {0, 0}}}} // PortPath\r
 };\r
 \r
 /* eof - MiscPortInternalConnectorDesignatorData.c */\r
index be53e39..6d79531 100644 (file)
@@ -39,14 +39,16 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_SYSTEM_MANUFACTURER_DATA, MiscSystemManufactur
     0xbadfaced,\r
     0xdead,\r
     0xbeef,\r
-    0x13,\r
-    0x13,\r
-    0x13,\r
-    0x13,\r
-    0x13,\r
-    0x13,\r
-    0x13,\r
-    0x13\r
+    {\r
+      0x13,\r
+      0x13,\r
+      0x13,\r
+      0x13,\r
+      0x13,\r
+      0x13,\r
+      0x13,\r
+      0x13\r
+    }\r
   },\r
   // SystemUuid\r
   EfiSystemWakeupTypePowerSwitch  // SystemWakeupType\r
index 8c00350..8627f1c 100644 (file)
@@ -26,7 +26,7 @@ Abstract:
 // Static (possibly build generated) Bios Vendor data.\r
 //\r
 MISC_SUBCLASS_TABLE_DATA(EFI_MISC_SYSTEM_OPTION_STRING_DATA, SystemOptionString) = {\r
-  STRING_TOKEN(STR_MISC_SYSTEM_OPTION_STRING)\r
+  {STRING_TOKEN(STR_MISC_SYSTEM_OPTION_STRING)}\r
 };\r
 \r
 /* eof - MiscSystemOptionStringData.c */\r
index d5e1474..1ea2615 100644 (file)
@@ -46,7 +46,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_SYSTEM_SLOT_DESIGNATION_DATA, MiscSystemSlotDe
     0,                      // SmbusSignalSupported    :1;\r
     0                       // Reserved                :21;\r
   },\r
-  0                         // SlotDevicePath\r
+  {0, 0, {0, 0}}            // SlotDevicePath\r
 };\r
 \r
 /* eof - MiscSystemSlotsData.c */\r