{ \\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
typedef struct {\r
IN EFI_SYSTEM_TABLE *SystemTable\r
);\r
\r
-EFI_STATUS\r
+VOID\r
EFIAPI\r
BdsEntry (\r
IN EFI_BDS_ARCH_PROTOCOL *This\r
EFI_BDS_ARCH_PROTOCOL_INSTANCE gBdsInstanceTemplate = {\r
EFI_BDS_ARCH_PROTOCOL_INSTANCE_SIGNATURE,\r
NULL,\r
- BdsEntry,\r
+ {\r
+ BdsEntry\r
+ },\r
0xFFFF,\r
TRUE,\r
EXTENSIVE\r
\r
}\r
\r
-EFI_STATUS\r
+VOID\r
EFIAPI\r
BdsEntry (\r
IN EFI_BDS_ARCH_PROTOCOL *This\r
// Setup some platform policy here\r
//\r
PlatformBdsPolicyBehavior (PrivateData, &DriverOptionList, &BootOptionList);\r
- PERF_END (0, L"PlatformBds", L"BDS", 0);\r
+ PERF_END (0, "PlatformBds", "BDS", 0);\r
\r
//\r
// BDS select the boot device to load OS\r
// return back to DxeCore.\r
//\r
ASSERT (FALSE);\r
-\r
- return EFI_SUCCESS;\r
}\r
+\r
Status = gBS->LocateProtocol (\r
&gEfiHiiProtocolGuid,\r
NULL,\r
- &Hii\r
+ (VOID**) &Hii\r
);\r
if (EFI_ERROR (Status)) {\r
*String = NULL;\r
Status = gBS->LocateProtocol (\r
&gEfiDataHubProtocolGuid,\r
NULL,\r
- &Datahub\r
+ (VOID**) &Datahub\r
);\r
if (EFI_ERROR (Status)) {\r
return NULL;\r
//\r
// All of the signatures that will be used in list structure\r
//\r
-#define BM_MENU_OPTION_SIGNATURE 'menu'\r
-#define BM_LOAD_OPTION_SIGNATURE 'load'\r
-#define BM_CONSOLE_OPTION_SIGNATURE 'cnsl'\r
-#define BM_FILE_OPTION_SIGNATURE 'file'\r
-#define BM_HANDLE_OPTION_SIGNATURE 'hndl'\r
-#define BM_TERMINAL_OPTION_SIGNATURE 'trml'\r
-#define BM_MENU_ENTRY_SIGNATURE 'entr'\r
+#define BM_MENU_OPTION_SIGNATURE EFI_SIGNATURE_32 ('m', 'e', 'n', 'u')\r
+#define BM_LOAD_OPTION_SIGNATURE EFI_SIGNATURE_32 ('l', 'o', 'a', 'd')\r
+#define BM_CONSOLE_OPTION_SIGNATURE EFI_SIGNATURE_32 ('c', 'n', 's', 'l')\r
+#define BM_FILE_OPTION_SIGNATURE EFI_SIGNATURE_32 ('f', 'i', 'l', 'e')\r
+#define BM_HANDLE_OPTION_SIGNATURE EFI_SIGNATURE_32 ('h', 'n', 'd', 'l')\r
+#define BM_TERMINAL_OPTION_SIGNATURE EFI_SIGNATURE_32 ('t', 'r', 'm', 'l')\r
+#define BM_MENU_ENTRY_SIGNATURE EFI_SIGNATURE_32 ('e', 'n', 't', 'r')\r
\r
#define BM_LOAD_CONTEXT_SELECT 0x0\r
#define BM_CONSOLE_CONTEXT_SELECT 0x1\r
Status = gBS->HandleProtocol (\r
SimpleFsHandle[Index],\r
&gEfiBlockIoProtocolGuid,\r
- &BlkIo\r
+ (VOID**) &BlkIo\r
);\r
if (EFI_ERROR (Status)) {\r
//\r
Status = gBS->LocateProtocol (\r
&gEfiLegacyBiosProtocolGuid,\r
NULL,\r
- &LegacyBios\r
+ (VOID**) &LegacyBios\r
);\r
if (!EFI_ERROR (Status)) {\r
\r
Status = gBS->LocateProtocol (\r
&gEfiLegacyBiosProtocolGuid,\r
NULL,\r
- &LegacyBios\r
+ (VOID**) &LegacyBios\r
);\r
if (!EFI_ERROR (Status)) {\r
Status = LegacyBios->GetBbsInfo (\r
while (*Ptr != 0) {\r
if (*Ptr == '\\' && *(Ptr + 1) == '.' && *(Ptr + 2) == '.' && *(Ptr + 3) != 0) {\r
//\r
- // Convert \Name\..\ to \\r
+ // Convert "\Name\..\" to "\"\r
// DO NOT convert the .. if it is at the end of the string. This will\r
// break the .. behavior in changing directories.\r
//\r
Ptr = LastSlash;\r
} else if (*Ptr == '\\' && *(Ptr + 1) == '.' && *(Ptr + 2) == '\\') {\r
//\r
- // Convert a \.\ to a \\r
+ // Convert a "\.\" to a "\"\r
//\r
BdsStrCpy (Ptr, Ptr + 2);\r
Ptr = LastSlash;\r
Status = gBS->HandleProtocol (\r
CurHandle,\r
&gEfiSimpleFileSystemProtocolGuid,\r
- &SimpleFs\r
+ (VOID**) &SimpleFs\r
);\r
if (Status == EFI_SUCCESS) {\r
continue;\r
Status = gBS->HandleProtocol (\r
CurHandle,\r
&gEfiLoadFileProtocolGuid,\r
- &LoadFile\r
+ (VOID**) &LoadFile\r
);\r
if (Status == EFI_SUCCESS) {\r
continue;\r
gBS->HandleProtocol (\r
Handles[Index],\r
&gEfiDevicePathProtocolGuid,\r
- &DevicePath\r
+ (VOID**) &DevicePath\r
);\r
Ptr = (UINT8 *) DevicePath;\r
while (*Ptr != END_DEVICE_PATH_TYPE) {\r
gBS->HandleProtocol (\r
Handles[Index],\r
&gEfiSerialIoProtocolGuid,\r
- &SerialIo\r
+ (VOID**) &SerialIo\r
);\r
\r
CopyMem (\r
//\r
BM_MENU_OPTION FsOptionMenu = {\r
BM_MENU_OPTION_SIGNATURE,\r
- NULL,\r
+ { NULL, NULL},\r
0\r
};\r
\r
//\r
BM_MENU_OPTION ConsoleInpMenu = {\r
BM_MENU_OPTION_SIGNATURE,\r
- NULL,\r
+ { NULL, NULL},\r
0\r
};\r
\r
//\r
BM_MENU_OPTION ConsoleOutMenu = {\r
BM_MENU_OPTION_SIGNATURE,\r
- NULL,\r
+ { NULL, NULL},\r
0\r
};\r
\r
//\r
BM_MENU_OPTION ConsoleErrMenu = {\r
BM_MENU_OPTION_SIGNATURE,\r
- NULL,\r
+ { NULL, NULL},\r
0\r
};\r
\r
//\r
BM_MENU_OPTION BootOptionMenu = {\r
BM_MENU_OPTION_SIGNATURE,\r
- NULL,\r
+ { NULL, NULL},\r
0\r
};\r
\r
//\r
BM_MENU_OPTION DriverOptionMenu = {\r
BM_MENU_OPTION_SIGNATURE,\r
- NULL,\r
+ { NULL, NULL},\r
0\r
};\r
\r
//\r
BM_MENU_OPTION LegacyFDMenu = {\r
BM_MENU_OPTION_SIGNATURE,\r
- NULL,\r
+ { NULL, NULL},\r
0\r
};\r
\r
//\r
BM_MENU_OPTION LegacyHDMenu = {\r
BM_MENU_OPTION_SIGNATURE,\r
- NULL,\r
+ { NULL, NULL},\r
0\r
};\r
\r
//\r
BM_MENU_OPTION LegacyCDMenu = {\r
BM_MENU_OPTION_SIGNATURE,\r
- NULL,\r
+ { NULL, NULL},\r
0\r
};\r
\r
//\r
BM_MENU_OPTION LegacyNETMenu = {\r
BM_MENU_OPTION_SIGNATURE,\r
- NULL,\r
+ { NULL, NULL},\r
0\r
};\r
\r
//\r
BM_MENU_OPTION LegacyBEVMenu = {\r
BM_MENU_OPTION_SIGNATURE,\r
- NULL,\r
+ { NULL, NULL},\r
0\r
};\r
\r
//\r
BM_MENU_OPTION DirectoryMenu = {\r
BM_MENU_OPTION_SIGNATURE,\r
- NULL,\r
+ { NULL, NULL},\r
0\r
};\r
\r
//\r
BM_MENU_OPTION DriverMenu = {\r
BM_MENU_OPTION_SIGNATURE,\r
- NULL,\r
+ { NULL, NULL},\r
0\r
};\r
\r
BM_MENU_OPTION TerminalMenu = {\r
BM_MENU_OPTION_SIGNATURE,\r
- NULL,\r
+ { NULL, NULL},\r
0\r
};\r
\r
#include "BdsPlatform.h"\r
\r
EFI_GUID gTerminalDriverGuid = {\r
- 0x10634d8e, 0x1c05, 0x46cb, 0xbb, 0xc, 0x5a, 0xfd, 0xc8, 0x29, 0xa8, 0xc8\r
+ 0x10634d8e, 0x1c05, 0x46cb, {0xbb, 0xc, 0x5a, 0xfd, 0xc8, 0x29, 0xa8, 0xc8}\r
};\r
\r
VOID\r
CHAR16 *ExitData;\r
BDS_COMMON_OPTION *Option;\r
\r
- Status = gBS->AllocatePool (EfiBootServicesData, sizeof (BDS_COMMON_OPTION), &Option);\r
+ Status = gBS->AllocatePool (EfiBootServicesData, sizeof (BDS_COMMON_OPTION), (VOID**) &Option);\r
Option->Description = FileContext->FileName;\r
Option->DevicePath = FileContext->DevicePath;\r
Option->LoadOptionsSize = 0;\r
EFI_STATUS Status;\r
EFI_CPU_IO_PROTOCOL *CpuIo;\r
\r
- Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, &CpuIo);\r
+ Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID**)&CpuIo);\r
ASSERT_EFI_ERROR (Status);\r
\r
GuidHob.Raw = GetHobList ();\r
Status = gBS->LocateProtocol (\r
&gEfiFormBrowserProtocolGuid,\r
NULL,\r
- &gBrowser\r
+ (VOID**)&gBrowser\r
);\r
\r
//\r
Status = gBS->LocateProtocol (\r
&gEfiDataHubProtocolGuid,\r
NULL,\r
- &DataHub\r
+ (VOID**)&DataHub\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
// Note: The following lines of code only execute when Auto boot\r
// takes affect\r
//\r
- Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, &ConsoleControl);\r
+ Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, (VOID**)&ConsoleControl);\r
ConsoleControl->SetMode (ConsoleControl, EfiConsoleControlScreenText);\r
\r
}\r
} FONT_PACK;\r
\r
FONT_PACK mFontPack = {\r
- sizeof (EFI_HII_FONT_PACK) + (NARROW_GLYPH_NUMBER * sizeof (EFI_NARROW_GLYPH)) + (WIDE_GLYPH_NUMBER * sizeof (EFI_WIDE_GLYPH)),\r
- EFI_HII_FONT,\r
- NARROW_GLYPH_NUMBER,\r
- WIDE_GLYPH_NUMBER,\r
+ {\r
+ {\r
+ sizeof (EFI_HII_FONT_PACK) + (NARROW_GLYPH_NUMBER * sizeof (EFI_NARROW_GLYPH)) + (WIDE_GLYPH_NUMBER * sizeof (EFI_WIDE_GLYPH)),\r
+ EFI_HII_FONT\r
+ },\r
+ NARROW_GLYPH_NUMBER,\r
+ WIDE_GLYPH_NUMBER\r
+ },\r
{ // Narrow Glyphs\r
{\r
0x05d0,\r
Status = gBS->HandleProtocol (\r
gST->ConsoleOutHandle,\r
&gEfiGraphicsOutputProtocolGuid,\r
- &GraphicsOutput\r
+ (VOID**)&GraphicsOutput\r
);\r
if (EFI_ERROR (Status)) {\r
GraphicsOutput = NULL;\r
Status = gBS->HandleProtocol (\r
gST->ConsoleOutHandle,\r
&gEfiUgaDrawProtocolGuid,\r
- &UgaDraw\r
+ (VOID**)&UgaDraw\r
);\r
if (EFI_ERROR (Status)) {\r
return EFI_UNSUPPORTED;\r
Status = gBS->LocateProtocol (\r
&gEfiGenericMemTestProtocolGuid,\r
NULL,\r
- &GenMemoryTest\r
+ (VOID**)&GenMemoryTest\r
);\r
if (EFI_ERROR (Status)) {\r
gBS->FreePool (Pos);\r
\r
extern UINT8 BdsStrings[];\r
\r
-EFI_GUID gBdsStringPackGuid = { 0x7bac95d3, 0xddf, 0x42f3, 0x9e, 0x24, 0x7c, 0x64, 0x49, 0x40, 0x37, 0x9a };\r
+EFI_GUID gBdsStringPackGuid = { 0x7bac95d3, 0xddf, 0x42f3, {0x9e, 0x24, 0x7c, 0x64, 0x49, 0x40, 0x37, 0x9a} };\r
\r
EFI_HII_HANDLE gStringPackHandle;\r
EFI_HII_PROTOCOL *Hii;\r
Status = gBS->LocateProtocol (\r
&gEfiHiiProtocolGuid,\r
NULL,\r
- &Hii\r
+ (VOID**)&Hii\r
);\r
if (!EFI_ERROR (Status)) {\r
PackageList = PreparePackages (1, &gBdsStringPackGuid, BdsStrings);\r
//\r
// Platform specific keyboard device path\r
//\r
-UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath0 = {\r
+UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath0 = \r
+{\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
- HARDWARE_DEVICE_PATH,\r
- HW_VENDOR_DP,\r
- (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),\r
- (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8),\r
- EFI_UNIX_UGA_GUID,\r
+ {\r
+ {\r
+ HARDWARE_DEVICE_PATH,\r
+ HW_VENDOR_DP,\r
+ {\r
+ (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),\r
+ (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8)\r
+ }\r
+ },\r
+ EFI_UNIX_UGA_GUID\r
+ },\r
0\r
},\r
gEndEntire\r
\r
UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath1 = {\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
- HARDWARE_DEVICE_PATH,\r
- HW_VENDOR_DP,\r
- (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),\r
- (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8),\r
- EFI_UNIX_UGA_GUID,\r
+ {\r
+ {\r
+ HARDWARE_DEVICE_PATH,\r
+ HW_VENDOR_DP,\r
+ {\r
+ (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),\r
+ (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8)\r
+ }\r
+ },\r
+ EFI_UNIX_UGA_GUID\r
+ },\r
1\r
},\r
gEndEntire\r
\r
UNIX_CONSOLE_DEVICE_PATH gUnixConsoleDevicePath = {\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
- HARDWARE_DEVICE_PATH,\r
- HW_VENDOR_DP,\r
- (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),\r
- (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8),\r
- EFI_UNIX_CONSOLE_GUID\r
+ {\r
+ {\r
+ HARDWARE_DEVICE_PATH,\r
+ HW_VENDOR_DP,\r
+ {\r
+ (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),\r
+ (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8)\r
+ }\r
+ },\r
+ EFI_UNIX_CONSOLE_GUID\r
+ },\r
+ 0\r
},\r
gEndEntire\r
};\r
// Legal timer value range in 100 ns units\r
//\r
#define TIMER_MINIMUM_VALUE 0\r
-#define TIMER_MAXIMUM_VALUE (0x100000000 - 1)\r
+#define TIMER_MAXIMUM_VALUE (0x100000000ULL - 1)\r
\r
//\r
// Default timer value in 100 ns units (10 ms)\r
return ;\r
}\r
\r
- Freq = DivU64x32 (1000000000000UL, (UINTN) TimerPeriod);\r
+ Freq = DivU64x32 (1000000000000ULL, (UINTN) TimerPeriod);\r
\r
mPerfHeader.CpuFreq = Freq;\r
\r