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

ArmPkg: Fix warnings raised by ARMGCC 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11829 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
oliviermartin 2011-06-15 19:53:15 +00:00
parent 2b59fcd5b3
commit e862cd50c6
12 changed files with 36 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ArmPkg/Drivers/PL180MciDxe/PL180Mci.c
View File

@ -60,6 +60,11 @@ MciIsReadOnly (
return (MmioRead32(FixedPcdGet32(PcdPL180SysMciRegAddress)) & 2);
}
#if 0
//Note: This function has been commented out because it is not used yet.
// This function could be used to remove the hardcoded BlockLen used
// in MciPrepareDataPath
// Convert block size to 2^n
STATIC
UINT32
@ -79,6 +84,7 @@ GetPow2BlockLen (
return Pow2BlockLen;
}
#endif
VOID
MciPrepareDataPath (

79
ArmPkg/Library/BdsLib/BdsAppLoader.c
View File

@ -14,82 +14,7 @@
#include "BdsInternal.h"
//#include <Library/PeCoffLib.h>
#include <Library/DxeServicesLib.h>
//TODO: RemoveMe
#include <Protocol/DevicePathToText.h>
/**
Retrieves the magic value from the PE/COFF header.
@param Hdr The buffer in which to return the PE32, PE32+, or TE header.
@return EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC - Image is PE32
@return EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC - Image is PE32+
**/
UINT16
PeCoffLoaderGetPeHeaderMagicValue (
IN EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION Hdr
)
{
//
// NOTE: Some versions of Linux ELILO for Itanium have an incorrect magic value
// in the PE/COFF Header. If the MachineType is Itanium(IA64) and the
// Magic value in the OptionalHeader is EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC
// then override the returned value to EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC
//
if (Hdr.Pe32->FileHeader.Machine == IMAGE_FILE_MACHINE_IA64 && Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
return EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;
}
//
// Return the magic value from the PC/COFF Optional Header
//
return Hdr.Pe32->OptionalHeader.Magic;
}
STATIC
BOOLEAN
IsLoadableImage (
VOID* Image
)
{
UINT16 Magic;
EFI_IMAGE_DOS_HEADER *DosHeader;
EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION Header;
if (Image == NULL) {
return FALSE;
}
DosHeader = (EFI_IMAGE_DOS_HEADER*)Image;
if (DosHeader->e_magic == EFI_IMAGE_DOS_SIGNATURE) {
Header.Pe32 = (EFI_IMAGE_NT_HEADERS32*)((UINT8*)Image + DosHeader->e_lfanew);
} else {
Header.Pe32 = (EFI_IMAGE_NT_HEADERS32*)(Image);
}
if (Header.Te->Signature == EFI_TE_IMAGE_HEADER_SIGNATURE) {
// It is a TE Image
return TRUE;
} else if (Header.Pe32->Signature == EFI_IMAGE_NT_SIGNATURE) {
Magic = PeCoffLoaderGetPeHeaderMagicValue (Header);
if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
// It is a PE32 Image
return TRUE;
} else if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) {
// It is a PE32+ Image
return TRUE;
} else {
DEBUG ((EFI_D_ERROR,"BdsLoadBinaryFromPath(): Fail unrecognized PE Image\n"));
}
} else {
DEBUG ((EFI_D_ERROR,"BdsLoadBinaryFromPath(): Fail unrecognize image\n"));
}
return FALSE;
}
//#include <Library/DxeServicesLib.h>
STATIC
EFI_STATUS
@ -186,7 +111,6 @@ BdsLoadApplication (
EFI_STATUS Status;
UINTN NoHandles, HandleIndex;
EFI_HANDLE *Handles;
EFI_DEVICE_PATH *FvDevicePath;
EFI_DEVICE_PATH *EfiAppDevicePath;
// Need to connect every drivers to ensure no dependencies are missing for the application
@ -205,6 +129,7 @@ BdsLoadApplication (
// Search in all Firmware Volume for the EFI Application
for (HandleIndex = 0; HandleIndex < NoHandles; HandleIndex++) {
EfiAppDevicePath = NULL;
Status = BdsLoadFileFromFirmwareVolume (Handles[HandleIndex], EfiApp, EFI_FV_FILETYPE_APPLICATION, &EfiAppDevicePath);
if (!EFI_ERROR (Status)) {
// Start the application

3
ArmPkg/Library/BdsLib/BdsFilePath.c
View File

@ -264,8 +264,11 @@ TryRemovableDevice (
EFI_DEVICE_PATH* RemovableDevicePath;
BOOLEAN RemovableFound;
RemovableDevice = NULL;
RemovableDevicePath = NULL;
RemovableFound = FALSE;
TmpDevicePath = DevicePath;
while (!IsDevicePathEnd (TmpDevicePath) && !RemovableFound) {
for (Index = 0; Index < sizeof(RemovableDeviceSupport) / sizeof(BDS_REMOVABLE_DEVICE_SUPPORT); Index++) {
RemovableDevice = &RemovableDeviceSupport[Index];

4
ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.c
View File

@ -77,7 +77,9 @@ PeCoffLoaderRelocateImageExtraAction (
IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext
)
{
#if !defined(MDEPKG_NDEBUG)
CHAR8 Temp[512];
#endif
#ifdef __CC_ARM
// Print out the command for the RVD debugger to load symbols for this image
@ -108,7 +110,9 @@ PeCoffLoaderUnloadImageExtraAction (
IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext
)
{
#if !defined(MDEPKG_NDEBUG)
CHAR8 Temp[512];
#endif
#ifdef __CC_ARM
{

2
ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4.c
View File

@ -23,7 +23,7 @@
#include <Drivers/PL301Axi.h>
#include <Drivers/SP804Timer.h>
#define SerialPrint(txt) SerialPortWrite (txt, AsciiStrLen(txt)+1);
#define SerialPrint(txt) SerialPortWrite ((UINT8*)(txt), AsciiStrLen(txt)+1);
// DDR2 timings
PL341_DMC_CONFIG DDRTimings = {

5
ArmPlatformPkg/Bds/Bds.c
View File

@ -117,14 +117,17 @@ InitializeConsolePipe (
// We convert back to the text representation of the device Path
EFI_DEVICE_PATH_TO_TEXT_PROTOCOL* DevicePathToTextProtocol;
CHAR16* DevicePathTxt;
EFI_STATUS Status;
ASSERT_EFI_ERROR(gBS->LocateProtocol(&gEfiDevicePathToTextProtocolGuid, NULL, (VOID **)&DevicePathToTextProtocol));
Status = gBS->LocateProtocol(&gEfiDevicePathToTextProtocolGuid, NULL, (VOID **)&DevicePathToTextProtocol);
if (!EFI_ERROR(Status)) {
DevicePathTxt = DevicePathToTextProtocol->ConvertDevicePathToText (DevicePath, TRUE, TRUE);
DEBUG((EFI_D_ERROR,"Fail to start the console with the Device Path '%s'. (Error '%r')\n", DevicePathTxt, Status));
FreePool (DevicePathTxt);
}
}
DEBUG_CODE_END();
// If the console splitter driver is not supported by the platform then use the first Device Path

2
ArmPlatformPkg/Bds/BootMenu.c
View File

@ -39,6 +39,7 @@ BootMenuAddBootOption (
EFI_DEVICE_PATH_PROTOCOL *DevicePathNode;
Attributes = 0;
SupportedBootDevice = NULL;
//
// List the Boot Devices supported
@ -402,6 +403,7 @@ BootMenuMain (
UINTN Index;
UINTN BootMainEntryCount;
BootOption = NULL;
BootMainEntryCount = sizeof(BootMainEntries) / sizeof(struct BOOT_MAIN_ENTRY);
// Get Boot#### list

2
ArmPlatformPkg/MemoryInitPei/MemoryInit.c
View File

@ -122,7 +122,7 @@ InitializeMemory (
// Ensure PcdSystemMemorySize has been set
ASSERT (FixedPcdGet32 (PcdSystemMemorySize) != 0);
SystemMemoryTop = FixedPcdGet32 (PcdSystemMemoryBase) + FixedPcdGet32 (PcdSystemMemorySize);
SystemMemoryTop = (UINTN)FixedPcdGet32 (PcdSystemMemoryBase) + (UINTN)FixedPcdGet32 (PcdSystemMemorySize);
//
// Initialize the System Memory (DRAM)

1
ArmPlatformPkg/PlatformPei/PlatformPei.c
View File

@ -24,6 +24,7 @@
//
// The Library classes this module consumes
//
#include <Library/ArmPlatformLib.h>
#include <Library/DebugLib.h>
#include <Library/PeimEntryPoint.h>
#include <Library/PcdLib.h>

1
ArmPlatformPkg/PlatformPei/PlatformPei.inf
View File

@ -32,6 +32,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
EmbeddedPkg/EmbeddedPkg.dec
ArmPkg/ArmPkg.dec
ArmPlatformPkg/ArmPlatformPkg.dec

2
ArmPlatformPkg/Sec/Sec.c
View File

@ -27,7 +27,7 @@
#define ARM_PRIMARY_CORE 0
#define SerialPrint(txt) SerialPortWrite (txt, AsciiStrLen(txt)+1);
#define SerialPrint(txt) SerialPortWrite ((UINT8*)txt, AsciiStrLen(txt)+1);
extern VOID *monitor_vector_table;

2
EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c
View File

@ -89,8 +89,10 @@ PrintCSD (
)
{
UINTN Value;
#if !defined(MDEPKG_NDEBUG)
CONST CHAR8* str_unit[] = { "100kbit/s","1Mbit/s","10Mbit/s","100MBit/s","Unkbown","Unkbown","Unkbown","Unkbown" };
CONST CHAR8* str_value[] = { "1.0","1.2","1.3","1.5","2.0","2.5","3.0","3.5","4.0","4.5","5.0","Unknown","Unknown","Unknown","Unknown" };
#endif
if (((Csd[2] >> 30) & 0x3) == 0) {
DEBUG((EFI_D_ERROR, "- PrintCSD Version 1.01-1.10/Version 2.00/Standard Capacity\n"));