sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some minor warning for unix package

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2230 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
klu2
2007-01-12 03:51:28 +00:00
parent 6c31fdb887
commit 8ef571dfb5
17 changed files with 77 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.c
View File

@@ -24,10 +24,14 @@ Abstract:
#include "BBSsupport.h"
EFI_DEVICE_PATH_PROTOCOL EndDevicePath[] = {
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
}
}
};
VOID
@@ -446,7 +450,7 @@ BdsDeleteAllInvalidLegacyBootOptions (
LocalBbsTable = NULL;
BbsEntry = NULL;
Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, &LegacyBios);
Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID**) &LegacyBios);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -680,7 +684,7 @@ Returns:
LocalHddInfo = NULL;
LocalBbsTable = NULL;
Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, &LegacyBios);
Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID**)&LegacyBios);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -985,7 +989,7 @@ Index# is a 16 bit integer, the low byte of it stands for the index in BBS table
BEVIndex = 0;
NewDevPtr = NULL;
Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, &LegacyBios);
Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID**) &LegacyBios);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -1497,7 +1501,7 @@ BdsRefreshBbsTableForBoot (
LocalBbsTable = NULL;
DevType = BBS_UNKNOWN;
Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, &LegacyBios);
Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID**) &LegacyBios);
if (EFI_ERROR (Status)) {
return Status;
}

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

@@ -757,7 +757,7 @@ Returns:
//
// There should be only one EFI_HII_PROTOCOL Image
//
Status = EfiLibLocateProtocol (&gEfiHiiProtocolGuid, &Hii);
Status = EfiLibLocateProtocol (&gEfiHiiProtocolGuid, (VOID**)&Hii);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -893,7 +893,7 @@ Returns:
}
Location = (UINT8 *) &UpdateData->Data;
Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, &LegacyBios);
Status = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID**) &LegacyBios);
if (!EFI_ERROR (Status)) {
//
// If LegacyBios Protocol is installed, add 3 tags about legacy boot option
@@ -1240,7 +1240,7 @@ Returns:
//
// There should only be one Form Configuration protocol
//
Status = EfiLibLocateProtocol (&gEfiFormBrowserProtocolGuid, &FormConfig);
Status = EfiLibLocateProtocol (&gEfiFormBrowserProtocolGuid, (VOID**) &FormConfig);
if (EFI_ERROR (Status)) {
return Status;
}

2
EdkUnixPkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c
View File

@@ -411,7 +411,7 @@ Returns:
ASSERT (FPCallbackInfo.Data.VideoBIOS <= 1);
Status = gBS->AllocatePool (EfiBootServicesData, 2 * sizeof (IFR_OPTION), &IfrOptionList);
Status = gBS->AllocatePool (EfiBootServicesData, 2 * sizeof (IFR_OPTION), (VOID**) &IfrOptionList);
if (IfrOptionList != NULL) {
IfrOptionList[0].Flags = EFI_IFR_FLAG_INTERACTIVE;
IfrOptionList[0].Key = SET_VIDEO_BIOS_TYPE_QUESTION_ID + 0x2000;

2
EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscBootInformationData.c
View File

@@ -27,7 +27,7 @@ Abstract:
//
MISC_SUBCLASS_TABLE_DATA(EFI_MISC_BOOT_INFORMATION_STATUS_DATA, BootInformationStatus) = {
EfiBootInformationStatusNoError, // BootInformationStatus
0 // BootInformationData
{0} // BootInformationData
};
/* eof - MiscBootInformationData.c */

2
EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscOemStringData.c
View File

@@ -26,7 +26,7 @@ Abstract:
// Static (possibly build generated) Bios Vendor data.
//
MISC_SUBCLASS_TABLE_DATA(EFI_MISC_OEM_STRING_DATA, OemString) = {
STRING_TOKEN(STR_MISC_OEM_STRING)
{ STRING_TOKEN(STR_MISC_OEM_STRING) }
};
/* eof - MiscOemStringData.c */

12
EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscPortInternalConnectorDesignatorData.c
View File

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

16
EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscPortInternalConnectorDesignatorFunction.c
View File

@@ -74,15 +74,15 @@ Returns:
STATIC PS2_CONN_DEVICE_PATH mPs2MouseDevicePath = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0303, 1), DP_END };
STATIC SERIAL_CONN_DEVICE_PATH mCom1DevicePath = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0501, 0), DP_END };
STATIC SERIAL_CONN_DEVICE_PATH mCom2DevicePath = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0501, 1), DP_END };
STATIC PARALLEL_CONN_DEVICE_PATH mLpt1DevicePath = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0401, 0), DP_END };
//STATIC PARALLEL_CONN_DEVICE_PATH mLpt1DevicePath = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0401, 0), DP_END };
STATIC FLOOPY_CONN_DEVICE_PATH mFloopyADevicePath = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0604, 0), DP_END };
STATIC FLOOPY_CONN_DEVICE_PATH mFloopyBDevicePath = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0604, 1), DP_END };
STATIC USB_PORT_DEVICE_PATH mUsb0DevicePath = { DP_ACPI, DP_PCI (0x1d, 0x00), DP_END };
STATIC USB_PORT_DEVICE_PATH mUsb1DevicePath = { DP_ACPI, DP_PCI (0x1d, 0x01), DP_END };
STATIC USB_PORT_DEVICE_PATH mUsb2DevicePath = { DP_ACPI, DP_PCI (0x1d, 0x02), DP_END };
STATIC USB_PORT_DEVICE_PATH mUsb3DevicePath = { DP_ACPI, DP_PCI (0x1d, 0x07), DP_END };
STATIC IDE_DEVICE_PATH mIdeDevicePath = { DP_ACPI, DP_PCI (0x1F, 0x01), DP_END };
STATIC GB_NIC_DEVICE_PATH mGbNicDevicePath = { DP_ACPI, DP_PCI( 0x03,0x00 ),DP_PCI( 0x1F,0x00 ),DP_PCI( 0x07,0x00 ), DP_END };
//STATIC FLOOPY_CONN_DEVICE_PATH mFloopyBDevicePath = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0604, 1), DP_END };
//STATIC USB_PORT_DEVICE_PATH mUsb0DevicePath = { DP_ACPI, DP_PCI (0x1d, 0x00), DP_END };
//STATIC USB_PORT_DEVICE_PATH mUsb1DevicePath = { DP_ACPI, DP_PCI (0x1d, 0x01), DP_END };
//STATIC USB_PORT_DEVICE_PATH mUsb2DevicePath = { DP_ACPI, DP_PCI (0x1d, 0x02), DP_END };
//STATIC USB_PORT_DEVICE_PATH mUsb3DevicePath = { DP_ACPI, DP_PCI (0x1d, 0x07), DP_END };
//STATIC IDE_DEVICE_PATH mIdeDevicePath = { DP_ACPI, DP_PCI (0x1F, 0x01), DP_END };
//STATIC GB_NIC_DEVICE_PATH mGbNicDevicePath = { DP_ACPI, DP_PCI( 0x03,0x00 ),DP_PCI( 0x1F,0x00 ),DP_PCI( 0x07,0x00 ), DP_END };
EFI_DEVICE_PATH_PROTOCOL EndDevicePath = DP_END;
//

8
EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSubclassDriverEntryPoint.c
View File

@@ -175,7 +175,7 @@ Returns:
//
// Locate data hub protocol.
//
EfiStatus = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, &DataHub);
EfiStatus = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, (VOID**) &DataHub);
if (EFI_ERROR (EfiStatus)) {
DEBUG ((EFI_D_ERROR, "Could not locate DataHub protocol. %r\n", EfiStatus));
@@ -187,7 +187,7 @@ Returns:
//
// Locate hii protocol.
//
EfiStatus = gBS->LocateProtocol (&gEfiHiiProtocolGuid, NULL, &Hii);
EfiStatus = gBS->LocateProtocol (&gEfiHiiProtocolGuid, NULL, (VOID**)&Hii);
if (EFI_ERROR (EfiStatus)) {
DEBUG ((EFI_D_ERROR, "Could not locate Hii protocol. %r\n", EfiStatus));
@@ -436,7 +436,7 @@ Returns:
//
// Locate DataHub protocol.
//
Status = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, &DataHub);
Status = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, (VOID**)&DataHub);
if (EFI_ERROR (Status)) {
return ;
}
@@ -447,7 +447,7 @@ Returns:
Status = gBS->OpenProtocol (
HandleBuffer[HandleIndex],
&gEfiUnixIoProtocolGuid,
&UnixIo,
(VOID**)&UnixIo,
Context,
NULL,
EFI_OPEN_PROTOCOL_GET_PROTOCOL

2
EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/ComponentName.c
View File

@@ -173,7 +173,7 @@ UnixSimpleFileSystemComponentNameGetControllerName (
Status = gBS->OpenProtocol (
ControllerHandle,
&gEfiSimpleFileSystemProtocolGuid,
&SimpleFileSystem,
(VOID**)&SimpleFileSystem,
gUnixSimpleFileSystemDriverBinding.DriverBindingHandle,
ControllerHandle,
EFI_OPEN_PROTOCOL_GET_PROTOCOL

4
EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/UnixSimpleFileSystem.c
View File

@@ -632,7 +632,7 @@ Returns:
CHAR16 *Src;
char *Dst;
CHAR8 *RealFileName;
CHAR16 *TempFileName;
//CHAR16 *TempFileName;
char *ParseFileName;
char *GuardPointer;
CHAR8 TempChar;
@@ -863,7 +863,7 @@ OpenRoot:
LastError = PrivateFile->UnixThunk->GetErrno ();
if (LastError != EEXIST) {
gBS->FreePool (TempFileName);
//gBS->FreePool (TempFileName);
Status = EFI_ACCESS_DENIED;
goto Done;
}

2
EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/ComponentName.c
View File

@@ -167,7 +167,7 @@ UnixBusDriverComponentNameGetControllerName (
Status = gBS->OpenProtocol (
ChildHandle,
&gEfiUnixIoProtocolGuid,
&UnixIo,
(VOID**)&UnixIo,
gUnixBusDriverBinding.DriverBindingHandle,
ChildHandle,
EFI_OPEN_PROTOCOL_GET_PROTOCOL

2
EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.c
View File

@@ -97,7 +97,7 @@ EFI_UNIX_UGA - Builds UGA Windows of Width and Height
// Define GUID for the Unix Bus Driver
//
static EFI_GUID gUnixBusDriverGuid = {
0x419f582, 0x625, 0x4531, 0x8a, 0x33, 0x85, 0xa9, 0x96, 0x5c, 0x95, 0xbc
0x419f582, 0x625, 0x4531, {0x8a, 0x33, 0x85, 0xa9, 0x96, 0x5c, 0x95, 0xbc}
};
//

18
EdkUnixPkg/Dxe/UnixThunk/UnixThunk/UnixThunk.c
View File

@@ -33,17 +33,23 @@ Abstract:
//
static UNIX_THUNK_DEVICE_PATH mUnixThunkDevicePath = {
{
HARDWARE_DEVICE_PATH,
HW_VENDOR_DP,
(UINT8) (sizeof (VENDOR_DEVICE_PATH)),
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),
{
HARDWARE_DEVICE_PATH,
HW_VENDOR_DP,
{
(UINT8) (sizeof (VENDOR_DEVICE_PATH)),
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
}
},
EFI_UNIX_THUNK_PROTOCOL_GUID,
},
{
END_DEVICE_PATH_TYPE,
END_ENTIRE_DEVICE_PATH_SUBTYPE,
END_DEVICE_PATH_LENGTH,
0
{
END_DEVICE_PATH_LENGTH,
0
}
}
};