tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some minor warning 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2192 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
klu2 2007-01-08 08:56:27 +00:00
parent a89f26d82d
commit 997e26f615
17 changed files with 124 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.h
View File

@ -32,8 +32,10 @@ extern EFI_DEVICE_PATH_PROTOCOL *gPlatformDriverOption[];
{ \
END_DEVICE_PATH_TYPE,\
END_ENTIRE_DEVICE_PATH_SUBTYPE,\
{\
END_DEVICE_PATH_LENGTH,\
0\
}\
}
typedef struct {

2
EdkUnixPkg/Dxe/PlatformBds/Generic/Bds.h
View File

@ -74,7 +74,7 @@ BdsInitialize (
IN EFI_SYSTEM_TABLE *SystemTable
);
EFI_STATUS
VOID
EFIAPI
BdsEntry (
IN EFI_BDS_ARCH_PROTOCOL *This

11
EdkUnixPkg/Dxe/PlatformBds/Generic/BdsEntry.c
View File

@ -26,7 +26,9 @@ Abstract:
EFI_BDS_ARCH_PROTOCOL_INSTANCE gBdsInstanceTemplate = {
EFI_BDS_ARCH_PROTOCOL_INSTANCE_SIGNATURE,
NULL,
BdsEntry,
{
BdsEntry
},
0xFFFF,
TRUE,
EXTENSIVE
@ -267,7 +269,7 @@ Returns:
}
EFI_STATUS
VOID
EFIAPI
BdsEntry (
IN EFI_BDS_ARCH_PROTOCOL *This
@ -339,7 +341,7 @@ Returns:
// Setup some platform policy here
//
PlatformBdsPolicyBehavior (PrivateData, &DriverOptionList, &BootOptionList);
PERF_END (0, L"PlatformBds", L"BDS", 0);
PERF_END (0, "PlatformBds", "BDS", 0);
//
// BDS select the boot device to load OS
@ -351,6 +353,5 @@ Returns:
// return back to DxeCore.
//
ASSERT (FALSE);
return EFI_SUCCESS;
}

4
EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BmLib.c
View File

@ -469,7 +469,7 @@ Returns:
Status = gBS->LocateProtocol (
&gEfiHiiProtocolGuid,
NULL,
&Hii
(VOID**) &Hii
);
if (EFI_ERROR (Status)) {
*String = NULL;
@ -579,7 +579,7 @@ EfiLibStrFromDatahub (
Status = gBS->LocateProtocol (
&gEfiDataHubProtocolGuid,
NULL,
&Datahub
(VOID**) &Datahub
);
if (EFI_ERROR (Status)) {
return NULL;

14
EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.h
View File

@ -231,13 +231,13 @@ typedef enum {
//
// All of the signatures that will be used in list structure
//
#define BM_MENU_OPTION_SIGNATURE 'menu'
#define BM_LOAD_OPTION_SIGNATURE 'load'
#define BM_CONSOLE_OPTION_SIGNATURE 'cnsl'
#define BM_FILE_OPTION_SIGNATURE 'file'
#define BM_HANDLE_OPTION_SIGNATURE 'hndl'
#define BM_TERMINAL_OPTION_SIGNATURE 'trml'
#define BM_MENU_ENTRY_SIGNATURE 'entr'
#define BM_MENU_OPTION_SIGNATURE EFI_SIGNATURE_32 ('m', 'e', 'n', 'u')
#define BM_LOAD_OPTION_SIGNATURE EFI_SIGNATURE_32 ('l', 'o', 'a', 'd')
#define BM_CONSOLE_OPTION_SIGNATURE EFI_SIGNATURE_32 ('c', 'n', 's', 'l')
#define BM_FILE_OPTION_SIGNATURE EFI_SIGNATURE_32 ('f', 'i', 'l', 'e')
#define BM_HANDLE_OPTION_SIGNATURE EFI_SIGNATURE_32 ('h', 'n', 'd', 'l')
#define BM_TERMINAL_OPTION_SIGNATURE EFI_SIGNATURE_32 ('t', 'r', 'm', 'l')
#define BM_MENU_ENTRY_SIGNATURE EFI_SIGNATURE_32 ('e', 'n', 't', 'r')
#define BM_LOAD_CONTEXT_SELECT 0x0
#define BM_CONSOLE_CONTEXT_SELECT 0x1

14
EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootOption.c
View File

@ -292,7 +292,7 @@ Returns:
Status = gBS->HandleProtocol (
SimpleFsHandle[Index],
&gEfiBlockIoProtocolGuid,
&BlkIo
(VOID**) &BlkIo
);
if (EFI_ERROR (Status)) {
//
@ -426,7 +426,7 @@ Returns:
Status = gBS->LocateProtocol (
&gEfiLegacyBiosProtocolGuid,
NULL,
&LegacyBios
(VOID**) &LegacyBios
);
if (!EFI_ERROR (Status)) {
@ -719,7 +719,7 @@ Returns:
Status = gBS->LocateProtocol (
&gEfiLegacyBiosProtocolGuid,
NULL,
&LegacyBios
(VOID**) &LegacyBios
);
if (!EFI_ERROR (Status)) {
Status = LegacyBios->GetBbsInfo (
@ -1119,7 +1119,7 @@ Returns:
while (*Ptr != 0) {
if (*Ptr == '\\' && *(Ptr + 1) == '.' && *(Ptr + 2) == '.' && *(Ptr + 3) != 0) {
//
// Convert \Name\..\ to \
// Convert "\Name\..\" to "\"
// DO NOT convert the .. if it is at the end of the string. This will
// break the .. behavior in changing directories.
//
@ -1127,7 +1127,7 @@ Returns:
Ptr = LastSlash;
} else if (*Ptr == '\\' && *(Ptr + 1) == '.' && *(Ptr + 2) == '\\') {
//
// Convert a \.\ to a \
// Convert a "\.\" to a "\"
//
BdsStrCpy (Ptr, Ptr + 2);
Ptr = LastSlash;
@ -1321,7 +1321,7 @@ Returns:
Status = gBS->HandleProtocol (
CurHandle,
&gEfiSimpleFileSystemProtocolGuid,
&SimpleFs
(VOID**) &SimpleFs
);
if (Status == EFI_SUCCESS) {
continue;
@ -1330,7 +1330,7 @@ Returns:
Status = gBS->HandleProtocol (
CurHandle,
&gEfiLoadFileProtocolGuid,
&LoadFile
(VOID**) &LoadFile
);
if (Status == EFI_SUCCESS) {
continue;

4
EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
View File

@ -273,7 +273,7 @@ Returns:
gBS->HandleProtocol (
Handles[Index],
&gEfiDevicePathProtocolGuid,
&DevicePath
(VOID**) &DevicePath
);
Ptr = (UINT8 *) DevicePath;
while (*Ptr != END_DEVICE_PATH_TYPE) {
@ -309,7 +309,7 @@ Returns:
gBS->HandleProtocol (
Handles[Index],
&gEfiSerialIoProtocolGuid,
&SerialIo
(VOID**) &SerialIo
);
CopyMem (

28
EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/Data.c
View File

@ -47,7 +47,7 @@ UINT16 TerminalType[] = {
//
BM_MENU_OPTION FsOptionMenu = {
BM_MENU_OPTION_SIGNATURE,
NULL,
{ NULL, NULL},
0
};
@ -56,7 +56,7 @@ BM_MENU_OPTION FsOptionMenu = {
//
BM_MENU_OPTION ConsoleInpMenu = {
BM_MENU_OPTION_SIGNATURE,
NULL,
{ NULL, NULL},
0
};
@ -65,7 +65,7 @@ BM_MENU_OPTION ConsoleInpMenu = {
//
BM_MENU_OPTION ConsoleOutMenu = {
BM_MENU_OPTION_SIGNATURE,
NULL,
{ NULL, NULL},
0
};
@ -74,7 +74,7 @@ BM_MENU_OPTION ConsoleOutMenu = {
//
BM_MENU_OPTION ConsoleErrMenu = {
BM_MENU_OPTION_SIGNATURE,
NULL,
{ NULL, NULL},
0
};
@ -83,7 +83,7 @@ BM_MENU_OPTION ConsoleErrMenu = {
//
BM_MENU_OPTION BootOptionMenu = {
BM_MENU_OPTION_SIGNATURE,
NULL,
{ NULL, NULL},
0
};
@ -92,7 +92,7 @@ BM_MENU_OPTION BootOptionMenu = {
//
BM_MENU_OPTION DriverOptionMenu = {
BM_MENU_OPTION_SIGNATURE,
NULL,
{ NULL, NULL},
0
};
@ -101,7 +101,7 @@ BM_MENU_OPTION DriverOptionMenu = {
//
BM_MENU_OPTION LegacyFDMenu = {
BM_MENU_OPTION_SIGNATURE,
NULL,
{ NULL, NULL},
0
};
@ -110,7 +110,7 @@ BM_MENU_OPTION LegacyFDMenu = {
//
BM_MENU_OPTION LegacyHDMenu = {
BM_MENU_OPTION_SIGNATURE,
NULL,
{ NULL, NULL},
0
};
@ -119,7 +119,7 @@ BM_MENU_OPTION LegacyHDMenu = {
//
BM_MENU_OPTION LegacyCDMenu = {
BM_MENU_OPTION_SIGNATURE,
NULL,
{ NULL, NULL},
0
};
@ -128,7 +128,7 @@ BM_MENU_OPTION LegacyCDMenu = {
//
BM_MENU_OPTION LegacyNETMenu = {
BM_MENU_OPTION_SIGNATURE,
NULL,
{ NULL, NULL},
0
};
@ -137,7 +137,7 @@ BM_MENU_OPTION LegacyNETMenu = {
//
BM_MENU_OPTION LegacyBEVMenu = {
BM_MENU_OPTION_SIGNATURE,
NULL,
{ NULL, NULL},
0
};
@ -146,7 +146,7 @@ BM_MENU_OPTION LegacyBEVMenu = {
//
BM_MENU_OPTION DirectoryMenu = {
BM_MENU_OPTION_SIGNATURE,
NULL,
{ NULL, NULL},
0
};
@ -155,13 +155,13 @@ BM_MENU_OPTION DirectoryMenu = {
//
BM_MENU_OPTION DriverMenu = {
BM_MENU_OPTION_SIGNATURE,
NULL,
{ NULL, NULL},
0
};
BM_MENU_OPTION TerminalMenu = {
BM_MENU_OPTION_SIGNATURE,
NULL,
{ NULL, NULL},
0
};

4
EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/UpdatePage.c
View File

@ -24,7 +24,7 @@ AgBStract:
#include "BdsPlatform.h"
EFI_GUID gTerminalDriverGuid = {
0x10634d8e, 0x1c05, 0x46cb, 0xbb, 0xc, 0x5a, 0xfd, 0xc8, 0x29, 0xa8, 0xc8
0x10634d8e, 0x1c05, 0x46cb, {0xbb, 0xc, 0x5a, 0xfd, 0xc8, 0x29, 0xa8, 0xc8}
};
VOID
@ -179,7 +179,7 @@ BootThisFile (
CHAR16 *ExitData;
BDS_COMMON_OPTION *Option;
Status = gBS->AllocatePool (EfiBootServicesData, sizeof (BDS_COMMON_OPTION), &Option);
Status = gBS->AllocatePool (EfiBootServicesData, sizeof (BDS_COMMON_OPTION), (VOID**) &Option);
Option->Description = FileContext->FileName;
Option->DevicePath = FileContext->DevicePath;
Option->LoadOptionsSize = 0;

2
EdkUnixPkg/Dxe/PlatformBds/Generic/Capsules.c
View File

@ -80,7 +80,7 @@ BdsLockNonUpdatableFlash (
EFI_STATUS Status;
EFI_CPU_IO_PROTOCOL *CpuIo;
Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, &CpuIo);
Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID**)&CpuIo);
ASSERT_EFI_ERROR (Status);
GuidHob.Raw = GetHobList ();

6
EdkUnixPkg/Dxe/PlatformBds/Generic/FrontPage.c
View File

@ -264,7 +264,7 @@ Returns:
Status = gBS->LocateProtocol (
&gEfiFormBrowserProtocolGuid,
NULL,
&gBrowser
(VOID**)&gBrowser
);
//
@ -657,7 +657,7 @@ Returns:
Status = gBS->LocateProtocol (
&gEfiDataHubProtocolGuid,
NULL,
&DataHub
(VOID**)&DataHub
);
ASSERT_EFI_ERROR (Status);
@ -895,7 +895,7 @@ Returns:
// Note: The following lines of code only execute when Auto boot
// takes affect
//
Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, &ConsoleControl);
Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, (VOID**)&ConsoleControl);
ConsoleControl->SetMode (ConsoleControl, EfiConsoleControlScreenText);
}

8
EdkUnixPkg/Dxe/PlatformBds/Generic/Language.c
View File

@ -39,10 +39,14 @@ typedef struct {
} FONT_PACK;
FONT_PACK mFontPack = {
{
{
sizeof (EFI_HII_FONT_PACK) + (NARROW_GLYPH_NUMBER * sizeof (EFI_NARROW_GLYPH)) + (WIDE_GLYPH_NUMBER * sizeof (EFI_WIDE_GLYPH)),
EFI_HII_FONT,
EFI_HII_FONT
},
NARROW_GLYPH_NUMBER,
WIDE_GLYPH_NUMBER,
WIDE_GLYPH_NUMBER
},
{ // Narrow Glyphs
{
0x05d0,

6
EdkUnixPkg/Dxe/PlatformBds/Generic/MemoryTest.c
View File

@ -78,7 +78,7 @@ Returns:
Status = gBS->HandleProtocol (
gST->ConsoleOutHandle,
&gEfiGraphicsOutputProtocolGuid,
&GraphicsOutput
(VOID**)&GraphicsOutput
);
if (EFI_ERROR (Status)) {
GraphicsOutput = NULL;
@ -86,7 +86,7 @@ Returns:
Status = gBS->HandleProtocol (
gST->ConsoleOutHandle,
&gEfiUgaDrawProtocolGuid,
&UgaDraw
(VOID**)&UgaDraw
);
if (EFI_ERROR (Status)) {
return EFI_UNSUPPORTED;
@ -271,7 +271,7 @@ Returns:
Status = gBS->LocateProtocol (
&gEfiGenericMemTestProtocolGuid,
NULL,
&GenMemoryTest
(VOID**)&GenMemoryTest
);
if (EFI_ERROR (Status)) {
gBS->FreePool (Pos);

4
EdkUnixPkg/Dxe/PlatformBds/Generic/String.c
View File

@ -27,7 +27,7 @@ Revision History
extern UINT8 BdsStrings[];
EFI_GUID gBdsStringPackGuid = { 0x7bac95d3, 0xddf, 0x42f3, 0x9e, 0x24, 0x7c, 0x64, 0x49, 0x40, 0x37, 0x9a };
EFI_GUID gBdsStringPackGuid = { 0x7bac95d3, 0xddf, 0x42f3, {0x9e, 0x24, 0x7c, 0x64, 0x49, 0x40, 0x37, 0x9a} };
EFI_HII_HANDLE gStringPackHandle;
EFI_HII_PROTOCOL *Hii;
@ -58,7 +58,7 @@ Returns:
Status = gBS->LocateProtocol (
&gEfiHiiProtocolGuid,
NULL,
&Hii
(VOID**)&Hii
);
if (!EFI_ERROR (Status)) {
PackageList = PreparePackages (1, &gBdsStringPackGuid, BdsStrings);

70
EdkUnixPkg/Dxe/PlatformBds/PlatformData.c
View File

@ -31,20 +31,31 @@ UINT16 gPlatformBootTimeOutDefault = 10;
//
// Platform specific keyboard device path
//
UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath0 = {
UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath0 =
{
{
{
HARDWARE_DEVICE_PATH,
HW_VENDOR_DP,
{
(UINT8) (sizeof (VENDOR_DEVICE_PATH)),
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
}
},
EFI_UNIX_THUNK_PROTOCOL_GUID
},
{
{
{
HARDWARE_DEVICE_PATH,
HW_VENDOR_DP,
{
(UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),
(UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8),
EFI_UNIX_UGA_GUID,
(UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8)
}
},
EFI_UNIX_UGA_GUID
},
0
},
gEndEntire
@ -52,18 +63,28 @@ UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath0 = {
UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath1 = {
{
HARDWARE_DEVICE_PATH,
HW_VENDOR_DP,
(UINT8) (sizeof (VENDOR_DEVICE_PATH)),
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),
EFI_UNIX_THUNK_PROTOCOL_GUID
},
{
HARDWARE_DEVICE_PATH,
HW_VENDOR_DP,
{
(UINT8) (sizeof (VENDOR_DEVICE_PATH)),
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
}
},
EFI_UNIX_THUNK_PROTOCOL_GUID
},
{
{
{
HARDWARE_DEVICE_PATH,
HW_VENDOR_DP,
{
(UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),
(UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8),
EFI_UNIX_UGA_GUID,
(UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8)
}
},
EFI_UNIX_UGA_GUID
},
1
},
gEndEntire
@ -71,19 +92,30 @@ UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath1 = {
UNIX_CONSOLE_DEVICE_PATH gUnixConsoleDevicePath = {
{
HARDWARE_DEVICE_PATH,
HW_VENDOR_DP,
(UINT8) (sizeof (VENDOR_DEVICE_PATH)),
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),
EFI_UNIX_THUNK_PROTOCOL_GUID
},
{
HARDWARE_DEVICE_PATH,
HW_VENDOR_DP,
{
(UINT8) (sizeof (VENDOR_DEVICE_PATH)),
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
}
},
EFI_UNIX_THUNK_PROTOCOL_GUID
},
{
{
{
HARDWARE_DEVICE_PATH,
HW_VENDOR_DP,
{
(UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),
(UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8),
(UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8)
}
},
EFI_UNIX_CONSOLE_GUID
},
0
},
gEndEntire
};
//

2
EdkUnixPkg/Dxe/UnixThunk/Chipset/Timer/Timer.h
View File

@ -31,7 +31,7 @@ Abstract:
// Legal timer value range in 100 ns units
//
#define TIMER_MINIMUM_VALUE 0
#define TIMER_MAXIMUM_VALUE (0x100000000 - 1)
#define TIMER_MAXIMUM_VALUE (0x100000000ULL - 1)
//
// Default timer value in 100 ns units (10 ms)

2
EdkUnixPkg/Library/EdkGenericBdsLib/Performance.c
View File

@ -274,7 +274,7 @@ Returns:
return ;
}
Freq = DivU64x32 (1000000000000UL, (UINTN) TimerPeriod);
Freq = DivU64x32 (1000000000000ULL, (UINTN) TimerPeriod);
mPerfHeader.CpuFreq = Freq;