#include "BBSsupport.h"\r
\r
EFI_DEVICE_PATH_PROTOCOL EndDevicePath[] = {\r
- END_DEVICE_PATH_TYPE,\r
- END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
- END_DEVICE_PATH_LENGTH,\r
- 0\r
+ {\r
+ END_DEVICE_PATH_TYPE,\r
+ END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
+ {\r
+ END_DEVICE_PATH_LENGTH,\r
+ 0\r
+ }\r
+ }\r
};\r
\r
VOID\r
LocalBbsTable = NULL;\r
BbsEntry = NULL;\r
\r
- Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, &LegacyBios);\r
+ Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID**) &LegacyBios);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
LocalHddInfo = NULL;\r
LocalBbsTable = NULL;\r
\r
- Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, &LegacyBios);\r
+ Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID**)&LegacyBios);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
BEVIndex = 0;\r
NewDevPtr = NULL;\r
\r
- Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, &LegacyBios);\r
+ Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID**) &LegacyBios);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
LocalBbsTable = NULL;\r
DevType = BBS_UNKNOWN;\r
\r
- Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, &LegacyBios);\r
+ Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID**) &LegacyBios);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
//\r
// There should be only one EFI_HII_PROTOCOL Image\r
//\r
- Status = EfiLibLocateProtocol (&gEfiHiiProtocolGuid, &Hii);\r
+ Status = EfiLibLocateProtocol (&gEfiHiiProtocolGuid, (VOID**)&Hii);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
}\r
\r
Location = (UINT8 *) &UpdateData->Data;\r
- Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, &LegacyBios);\r
+ Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID**) &LegacyBios);\r
if (!EFI_ERROR (Status)) {\r
//\r
// If LegacyBios Protocol is installed, add 3 tags about legacy boot option\r
//\r
// There should only be one Form Configuration protocol\r
//\r
- Status = EfiLibLocateProtocol (&gEfiFormBrowserProtocolGuid, &FormConfig);\r
+ Status = EfiLibLocateProtocol (&gEfiFormBrowserProtocolGuid, (VOID**) &FormConfig);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
ASSERT (FPCallbackInfo.Data.VideoBIOS <= 1);\r
\r
- Status = gBS->AllocatePool (EfiBootServicesData, 2 * sizeof (IFR_OPTION), &IfrOptionList);\r
+ Status = gBS->AllocatePool (EfiBootServicesData, 2 * sizeof (IFR_OPTION), (VOID**) &IfrOptionList);\r
if (IfrOptionList != NULL) {\r
IfrOptionList[0].Flags = EFI_IFR_FLAG_INTERACTIVE;\r
IfrOptionList[0].Key = SET_VIDEO_BIOS_TYPE_QUESTION_ID + 0x2000;\r
//\r
MISC_SUBCLASS_TABLE_DATA(EFI_MISC_BOOT_INFORMATION_STATUS_DATA, BootInformationStatus) = {\r
EfiBootInformationStatusNoError, // BootInformationStatus\r
- 0 // BootInformationData\r
+ {0} // BootInformationData\r
};\r
\r
/* eof - MiscBootInformationData.c */\r
// Static (possibly build generated) Bios Vendor data.\r
//\r
MISC_SUBCLASS_TABLE_DATA(EFI_MISC_OEM_STRING_DATA, OemString) = {\r
- STRING_TOKEN(STR_MISC_OEM_STRING)\r
+ { STRING_TOKEN(STR_MISC_OEM_STRING) }\r
};\r
\r
/* eof - MiscOemStringData.c */\r
EfiPortConnectorTypeOther, // PortInternalConnectorType\r
EfiPortConnectorTypeOther, // PortExternalConnectorType\r
EfiPortTypeNone, // PortType\r
- 0 // PortPath\r
+ {0, 0, 0} // PortPath\r
};\r
\r
//\r
EfiPortTypeKeyboard, // PortType\r
// mPs2KbyboardDevicePath // PortPath\r
//\r
- 0\r
+ {0}\r
};\r
\r
MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscPortMouse) = {\r
EfiPortTypeMouse, // PortType\r
// mPs2MouseDevicePath // PortPath\r
//\r
- 0\r
+ {0}\r
};\r
\r
\r
EfiPortConnectorTypeNone,\r
EfiPortConnectorTypeDB9Female,\r
EfiPortTypeSerial16550ACompatible,\r
- 0\r
+ {0}\r
};\r
\r
MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscPortCom2) = {\r
EfiPortConnectorTypeOther,\r
EfiPortConnectorTypeNone,\r
EfiPortTypeOther,\r
- 0\r
+ {0}\r
};\r
\r
MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscPortFloppy) = {\r
EfiPortConnectorTypeOnboardFloppy,\r
EfiPortConnectorTypeNone,\r
EfiPortTypeOther,\r
- 0\r
+ {0}\r
};\r
\r
/* eof - MiscPortInternalConnectorDesignatorData.c */\r
STATIC PS2_CONN_DEVICE_PATH mPs2MouseDevicePath = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0303, 1), DP_END };\r
STATIC SERIAL_CONN_DEVICE_PATH mCom1DevicePath = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0501, 0), DP_END };\r
STATIC SERIAL_CONN_DEVICE_PATH mCom2DevicePath = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0501, 1), DP_END };\r
- STATIC PARALLEL_CONN_DEVICE_PATH mLpt1DevicePath = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0401, 0), DP_END };\r
+ //STATIC PARALLEL_CONN_DEVICE_PATH mLpt1DevicePath = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0401, 0), DP_END };\r
STATIC FLOOPY_CONN_DEVICE_PATH mFloopyADevicePath = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0604, 0), DP_END };\r
- STATIC FLOOPY_CONN_DEVICE_PATH mFloopyBDevicePath = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0604, 1), DP_END };\r
- STATIC USB_PORT_DEVICE_PATH mUsb0DevicePath = { DP_ACPI, DP_PCI (0x1d, 0x00), DP_END };\r
- STATIC USB_PORT_DEVICE_PATH mUsb1DevicePath = { DP_ACPI, DP_PCI (0x1d, 0x01), DP_END };\r
- STATIC USB_PORT_DEVICE_PATH mUsb2DevicePath = { DP_ACPI, DP_PCI (0x1d, 0x02), DP_END };\r
- STATIC USB_PORT_DEVICE_PATH mUsb3DevicePath = { DP_ACPI, DP_PCI (0x1d, 0x07), DP_END };\r
- STATIC IDE_DEVICE_PATH mIdeDevicePath = { DP_ACPI, DP_PCI (0x1F, 0x01), DP_END };\r
- STATIC GB_NIC_DEVICE_PATH mGbNicDevicePath = { DP_ACPI, DP_PCI( 0x03,0x00 ),DP_PCI( 0x1F,0x00 ),DP_PCI( 0x07,0x00 ), DP_END };\r
+ //STATIC FLOOPY_CONN_DEVICE_PATH mFloopyBDevicePath = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0604, 1), DP_END };\r
+ //STATIC USB_PORT_DEVICE_PATH mUsb0DevicePath = { DP_ACPI, DP_PCI (0x1d, 0x00), DP_END };\r
+ //STATIC USB_PORT_DEVICE_PATH mUsb1DevicePath = { DP_ACPI, DP_PCI (0x1d, 0x01), DP_END };\r
+ //STATIC USB_PORT_DEVICE_PATH mUsb2DevicePath = { DP_ACPI, DP_PCI (0x1d, 0x02), DP_END };\r
+ //STATIC USB_PORT_DEVICE_PATH mUsb3DevicePath = { DP_ACPI, DP_PCI (0x1d, 0x07), DP_END };\r
+ //STATIC IDE_DEVICE_PATH mIdeDevicePath = { DP_ACPI, DP_PCI (0x1F, 0x01), DP_END };\r
+ //STATIC GB_NIC_DEVICE_PATH mGbNicDevicePath = { DP_ACPI, DP_PCI( 0x03,0x00 ),DP_PCI( 0x1F,0x00 ),DP_PCI( 0x07,0x00 ), DP_END };\r
EFI_DEVICE_PATH_PROTOCOL EndDevicePath = DP_END;\r
\r
//\r
//\r
// Locate data hub protocol.\r
//\r
- EfiStatus = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, &DataHub);\r
+ EfiStatus = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, (VOID**) &DataHub);\r
\r
if (EFI_ERROR (EfiStatus)) {\r
DEBUG ((EFI_D_ERROR, "Could not locate DataHub protocol. %r\n", EfiStatus));\r
//\r
// Locate hii protocol.\r
//\r
- EfiStatus = gBS->LocateProtocol (&gEfiHiiProtocolGuid, NULL, &Hii);\r
+ EfiStatus = gBS->LocateProtocol (&gEfiHiiProtocolGuid, NULL, (VOID**)&Hii);\r
\r
if (EFI_ERROR (EfiStatus)) {\r
DEBUG ((EFI_D_ERROR, "Could not locate Hii protocol. %r\n", EfiStatus));\r
//\r
// Locate DataHub protocol.\r
//\r
- Status = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, &DataHub);\r
+ Status = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, (VOID**)&DataHub);\r
if (EFI_ERROR (Status)) {\r
return ;\r
}\r
Status = gBS->OpenProtocol (\r
HandleBuffer[HandleIndex],\r
&gEfiUnixIoProtocolGuid,\r
- &UnixIo,\r
+ (VOID**)&UnixIo,\r
Context,\r
NULL,\r
EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
Status = gBS->OpenProtocol (\r
ControllerHandle,\r
&gEfiSimpleFileSystemProtocolGuid,\r
- &SimpleFileSystem,\r
+ (VOID**)&SimpleFileSystem,\r
gUnixSimpleFileSystemDriverBinding.DriverBindingHandle,\r
ControllerHandle,\r
EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
CHAR16 *Src;
char *Dst;
CHAR8 *RealFileName;\r
- CHAR16 *TempFileName;\r
+ //CHAR16 *TempFileName;\r
char *ParseFileName;\r
char *GuardPointer;\r
CHAR8 TempChar;\r
\r
LastError = PrivateFile->UnixThunk->GetErrno ();\r
if (LastError != EEXIST) {
- gBS->FreePool (TempFileName);\r
+ //gBS->FreePool (TempFileName);\r
Status = EFI_ACCESS_DENIED;\r
goto Done;\r
}\r
Status = gBS->OpenProtocol (\r
ChildHandle,\r
&gEfiUnixIoProtocolGuid,\r
- &UnixIo,\r
+ (VOID**)&UnixIo,\r
gUnixBusDriverBinding.DriverBindingHandle,\r
ChildHandle,\r
EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
// Define GUID for the Unix Bus Driver\r
//\r
static EFI_GUID gUnixBusDriverGuid = {\r
- 0x419f582, 0x625, 0x4531, 0x8a, 0x33, 0x85, 0xa9, 0x96, 0x5c, 0x95, 0xbc\r
+ 0x419f582, 0x625, 0x4531, {0x8a, 0x33, 0x85, 0xa9, 0x96, 0x5c, 0x95, 0xbc}\r
};\r
\r
//\r
//\r
static UNIX_THUNK_DEVICE_PATH mUnixThunkDevicePath = {\r
{\r
- HARDWARE_DEVICE_PATH,\r
- HW_VENDOR_DP,\r
- (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
- (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),\r
+ {\r
+ HARDWARE_DEVICE_PATH,\r
+ HW_VENDOR_DP,\r
+ {\r
+ (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
+ (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+ }\r
+ },\r
EFI_UNIX_THUNK_PROTOCOL_GUID,\r
},\r
{\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
Status = gBS->AllocatePool (\r
EfiRuntimeServicesData,\r
sizeof (ESAL_FWB_GLOBAL),\r
- &mFvbModuleGlobal\r
+ (VOID**) &mFvbModuleGlobal\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
Status = gBS->AllocatePool (\r
EfiRuntimeServicesData,\r
BufferSize,\r
- &mFvbModuleGlobal->FvInstance[FVB_PHYSICAL]\r
+ (VOID**) &mFvbModuleGlobal->FvInstance[FVB_PHYSICAL]\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
Status = gBS->AllocatePool (\r
EfiRuntimeServicesData,\r
sizeof (EFI_FW_VOL_BLOCK_DEVICE),\r
- &FvbDevice\r
+ (VOID**) &FvbDevice\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
Status = gBS->HandleProtocol (\r
FwbHandle,\r
&gEfiFirmwareVolumeBlockProtocolGuid,\r
- &OldFwbInterface\r
+ (VOID**)&OldFwbInterface\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
Status = gBS->AllocatePool (\r
EfiRuntimeServicesData,\r
MaxLbaSize,\r
- &mFvbModuleGlobal->FvbScratchSpace[FVB_PHYSICAL]\r
+ (VOID**)&mFvbModuleGlobal->FvbScratchSpace[FVB_PHYSICAL]\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
}, // Reserved[3]\r
1, // Revision\r
{\r
- RECOVERY_BOIS_BLOCK_NUM,\r
- FVB_MEDIA_BLOCK_SIZE,\r
+ {\r
+ RECOVERY_BOIS_BLOCK_NUM,\r
+ FVB_MEDIA_BLOCK_SIZE\r
+ }\r
}\r
},\r
{\r
- 0,\r
- 0\r
+ {\r
+ 0,\r
+ 0\r
+ }\r
}\r
},\r
//\r
}, // Reserved[3]\r
1, // Revision\r
{\r
- SYSTEM_NV_BLOCK_NUM,\r
- FVB_MEDIA_BLOCK_SIZE,\r
+ {\r
+ SYSTEM_NV_BLOCK_NUM,\r
+ FVB_MEDIA_BLOCK_SIZE\r
+ }\r
}\r
},\r
{\r
- 0,\r
- 0\r
+ {\r
+ 0,\r
+ 0\r
+ }\r
}\r
}\r
};\r
}
extern EFI_STATUS
-UgaCreate(struct _EFI_UNIX_UGA_IO_PROTOCOL *UgaIo, CONST CHAR16 *Title);
+UgaCreate(struct _EFI_UNIX_UGA_IO_PROTOCOL **UgaIo, CONST CHAR16 *Title);
EFI_UNIX_THUNK_PROTOCOL mUnixThunkTable = {\r
EFI_UNIX_THUNK_PROTOCOL_SIGNATURE,\r
*_UNIXGCC_X64_PP_NAME = gcc\r
*_UNIXGCC_X64_VFRPP_NAME = gcc\r
\r
-*_UNIXGCC_IA32_CC_FLAGS = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h\r
-*_UNIXGCC_X64_CC_FLAGS = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h -D_EFI_P64\r
+*_UNIXGCC_IA32_CC_FLAGS = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include ${DEST_DIR_DEBUG}/AutoGen.h\r
+*_UNIXGCC_X64_CC_FLAGS = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include ${DEST_DIR_DEBUG}/AutoGen.h -D_EFI_P64\r
*_UNIXGCC_*_DLINK_FLAGS = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _${ENTRYPOINT}\r
*_UNIXGCC_*_ASM_FLAGS = -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h -DASM_PFX(name)=_##name\r
*_UNIXGCC_*_PP_FLAGS = -E -x assembler-with-cpp -include ${DEST_DIR_DEBUG}/AutoGen.h\r