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
This commit is contained in:
tgingold 2007-02-12 07:21:12 +00:00
parent 7b7f863bfa
commit 2419bd23d2
5 changed files with 26 additions and 24 deletions

View File

@ -43,23 +43,23 @@ Abstract:
// //
#define DP_ACPI \ #define DP_ACPI \
{ \ { \
ACPI_DEVICE_PATH, ACPI_DP, (UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), (UINT8) \ {ACPI_DEVICE_PATH, ACPI_DP, {(UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), (UINT8) \
((sizeof (ACPI_HID_DEVICE_PATH)) >> 8), EISA_PNP_ID (0x0A03), 0 \ ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8)}}, EISA_PNP_ID (0x0A03), 0 \
} }
#define DP_PCI(device, function) \ #define DP_PCI(device, function) \
{ \ { \
HARDWARE_DEVICE_PATH, HW_PCI_DP, (UINT8) (sizeof (PCI_DEVICE_PATH)), (UINT8) \ {HARDWARE_DEVICE_PATH, HW_PCI_DP, {(UINT8) (sizeof (PCI_DEVICE_PATH)), (UINT8) \
((sizeof (PCI_DEVICE_PATH)) >> 8), function, device \ ((sizeof (PCI_DEVICE_PATH)) >> 8)}}, function, device \
} }
#define DP_END \ #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) \ #define DP_LPC(eisaid, function) \
{ \ { \
ACPI_DEVICE_PATH, ACPI_DP, (UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), (UINT8) \ {ACPI_DEVICE_PATH, ACPI_DP, {(UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), (UINT8) \
((sizeof (ACPI_HID_DEVICE_PATH)) >> 8), EISA_PNP_ID (eisaid), function \ ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8)}}, EISA_PNP_ID (eisaid), function \
} }
// //

View File

@ -31,7 +31,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
EfiPortConnectorTypeOther, // PortInternalConnectorType EfiPortConnectorTypeOther, // PortInternalConnectorType
EfiPortConnectorTypeOther, // PortExternalConnectorType EfiPortConnectorTypeOther, // PortExternalConnectorType
EfiPortTypeNone, // PortType 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 EfiPortTypeKeyboard, // PortType
// mPs2KbyboardDevicePath // PortPath // 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) = { 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 EfiPortTypeMouse, // PortType
// mPs2MouseDevicePath // PortPath // 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, EfiPortConnectorTypeNone,
EfiPortConnectorTypeDB9Female, EfiPortConnectorTypeDB9Female,
EfiPortTypeSerial16550ACompatible, 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) = { 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, EfiPortConnectorTypeNone,
EfiPortConnectorTypeDB9Female, EfiPortConnectorTypeDB9Female,
EfiPortTypeSerial16550ACompatible, 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) = { 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, EfiPortConnectorTypeOther,
EfiPortConnectorTypeNone, EfiPortConnectorTypeNone,
EfiPortTypeOther, 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) = { 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, EfiPortConnectorTypeOnboardFloppy,
EfiPortConnectorTypeNone, EfiPortConnectorTypeNone,
EfiPortTypeOther, EfiPortTypeOther,
{0} {{{{0, 0, {0, 0}}, 0, 0}, {{0, 0, {0, 0}}, 0, 0}, {0, 0, {0, 0}}}} // PortPath
}; };
/* eof - MiscPortInternalConnectorDesignatorData.c */ /* eof - MiscPortInternalConnectorDesignatorData.c */

View File

@ -39,6 +39,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_SYSTEM_MANUFACTURER_DATA, MiscSystemManufactur
0xbadfaced, 0xbadfaced,
0xdead, 0xdead,
0xbeef, 0xbeef,
{
0x13, 0x13,
0x13, 0x13,
0x13, 0x13,
@ -47,6 +48,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_SYSTEM_MANUFACTURER_DATA, MiscSystemManufactur
0x13, 0x13,
0x13, 0x13,
0x13 0x13
}
}, },
// SystemUuid // SystemUuid
EfiSystemWakeupTypePowerSwitch // SystemWakeupType EfiSystemWakeupTypePowerSwitch // SystemWakeupType

View File

@ -26,7 +26,7 @@ Abstract:
// Static (possibly build generated) Bios Vendor data. // Static (possibly build generated) Bios Vendor data.
// //
MISC_SUBCLASS_TABLE_DATA(EFI_MISC_SYSTEM_OPTION_STRING_DATA, SystemOptionString) = { 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 */ /* eof - MiscSystemOptionStringData.c */

View File

@ -46,7 +46,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_SYSTEM_SLOT_DESIGNATION_DATA, MiscSystemSlotDe
0, // SmbusSignalSupported :1; 0, // SmbusSignalSupported :1;
0 // Reserved :21; 0 // Reserved :21;
}, },
0 // SlotDevicePath {0, 0, {0, 0}} // SlotDevicePath
}; };
/* eof - MiscSystemSlotsData.c */ /* eof - MiscSystemSlotsData.c */