Revision: 14181
http://edk2.svn.sourceforge.net/edk2/?rev=14181&view=rev
Author: oliviermartin
Date: 2013-03-12 00:50:46 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
ArmPkg: Fixed unsigned type to be architecture independent
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <[email protected]>
Modified Paths:
--------------
trunk/edk2/ArmPkg/Application/LinuxLoader/LinuxConfig.c
trunk/edk2/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c
trunk/edk2/ArmPkg/Include/Library/SemihostLib.h
trunk/edk2/ArmPkg/Library/BdsLib/BdsLinuxFdt.c
trunk/edk2/ArmPkg/Library/BdsLib/BdsLinuxLoader.h
trunk/edk2/ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.c
trunk/edk2/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c
trunk/edk2/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerBase.c
trunk/edk2/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerUefi.c
trunk/edk2/ArmPkg/Library/SemihostLib/SemihostLib.c
Modified: trunk/edk2/ArmPkg/Application/LinuxLoader/LinuxConfig.c
===================================================================
--- trunk/edk2/ArmPkg/Application/LinuxLoader/LinuxConfig.c 2013-03-12
00:49:42 UTC (rev 14180)
+++ trunk/edk2/ArmPkg/Application/LinuxLoader/LinuxConfig.c 2013-03-12
00:50:46 UTC (rev 14181)
@@ -189,7 +189,7 @@
Print (L"[%d] Update Linux Boot Entry\n",LINUX_LOADER_UPDATE);
Print (L"Option: ");
- Status = GetHIInputInteger (&Choice);
+ Status = GetHIInputInteger ((UINTN*)&Choice);
if (Status == EFI_INVALID_PARAMETER) {
Print (L"\n");
return Status;
@@ -268,7 +268,7 @@
do {
Print (L"Update Boot Entry: ");
- Status = GetHIInputInteger (&Choice);
+ Status = GetHIInputInteger ((UINTN*)&Choice);
if (Status == EFI_INVALID_PARAMETER) {
Print (L"\n");
return Status;
Modified: trunk/edk2/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c
===================================================================
--- trunk/edk2/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c 2013-03-12
00:49:42 UTC (rev 14180)
+++ trunk/edk2/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c 2013-03-12
00:50:46 UTC (rev 14181)
@@ -2,7 +2,8 @@
Support a Semi Host file system over a debuggers JTAG
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
-
+ Portions copyright (c) 2011, 2012, ARM Ltd. All rights reserved.<BR>
+
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
which accompanies this distribution. The full text of the license may be
found at
@@ -73,7 +74,7 @@
EFI_FILE File;
CHAR8 *FileName;
UINT32 Position;
- UINT32 SemihostHandle;
+ UINTN SemihostHandle;
BOOLEAN IsRoot;
} SEMIHOST_FCB;
@@ -152,7 +153,7 @@
{
SEMIHOST_FCB *FileFcb = NULL;
EFI_STATUS Status = EFI_SUCCESS;
- UINT32 SemihostHandle;
+ UINTN SemihostHandle;
CHAR8 *AsciiFileName;
CHAR8 *AsciiPtr;
UINTN Length;
@@ -360,7 +361,7 @@
)
{
SEMIHOST_FCB *Fcb = NULL;
- UINT32 Length;
+ UINTN Length;
EFI_STATUS Status;
Fcb = SEMIHOST_FCB_FROM_THIS(File);
@@ -395,7 +396,7 @@
UINTN NameSize = 0;
UINTN ResultSize;
UINTN Index;
- UINT32 Length;
+ UINTN Length;
EFI_STATUS Status;
if (Fcb->IsRoot == TRUE) {
Modified: trunk/edk2/ArmPkg/Include/Library/SemihostLib.h
===================================================================
--- trunk/edk2/ArmPkg/Include/Library/SemihostLib.h 2013-03-12 00:49:42 UTC
(rev 14180)
+++ trunk/edk2/ArmPkg/Include/Library/SemihostLib.h 2013-03-12 00:50:46 UTC
(rev 14181)
@@ -1,6 +1,7 @@
/** @file
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
+ Portions copyright (c) 2011, 2012, ARM Ltd. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -38,38 +39,38 @@
SemihostFileOpen (
IN CHAR8 *FileName,
IN UINT32 Mode,
- OUT UINT32 *FileHandle
+ OUT UINTN *FileHandle
);
RETURN_STATUS
SemihostFileSeek (
- IN UINT32 FileHandle,
- IN UINT32 Offset
+ IN UINTN FileHandle,
+ IN UINTN Offset
);
RETURN_STATUS
SemihostFileRead (
- IN UINT32 FileHandle,
- IN OUT UINT32 *Length,
+ IN UINTN FileHandle,
+ IN OUT UINTN *Length,
OUT VOID *Buffer
);
RETURN_STATUS
SemihostFileWrite (
- IN UINT32 FileHandle,
- IN OUT UINT32 *Length,
+ IN UINTN FileHandle,
+ IN OUT UINTN *Length,
IN VOID *Buffer
);
RETURN_STATUS
SemihostFileClose (
- IN UINT32 FileHandle
+ IN UINTN FileHandle
);
RETURN_STATUS
SemihostFileLength (
- IN UINT32 FileHandle,
- OUT UINT32 *Length
+ IN UINTN FileHandle,
+ OUT UINTN *Length
);
RETURN_STATUS
Modified: trunk/edk2/ArmPkg/Library/BdsLib/BdsLinuxFdt.c
===================================================================
--- trunk/edk2/ArmPkg/Library/BdsLib/BdsLinuxFdt.c 2013-03-12 00:49:42 UTC
(rev 14180)
+++ trunk/edk2/ArmPkg/Library/BdsLib/BdsLinuxFdt.c 2013-03-12 00:50:46 UTC
(rev 14181)
@@ -170,7 +170,7 @@
IN EFI_PHYSICAL_ADDRESS InitrdImage,
IN UINTN InitrdImageSize,
IN OUT EFI_PHYSICAL_ADDRESS *FdtBlobBase,
- IN OUT UINT32 *FdtBlobSize
+ IN OUT UINTN *FdtBlobSize
)
{
EFI_STATUS Status;
Modified: trunk/edk2/ArmPkg/Library/BdsLib/BdsLinuxLoader.h
===================================================================
--- trunk/edk2/ArmPkg/Library/BdsLib/BdsLinuxLoader.h 2013-03-12 00:49:42 UTC
(rev 14180)
+++ trunk/edk2/ArmPkg/Library/BdsLib/BdsLinuxLoader.h 2013-03-12 00:50:46 UTC
(rev 14181)
@@ -150,7 +150,7 @@
IN EFI_PHYSICAL_ADDRESS InitrdImage,
IN UINTN InitrdImageSize,
IN OUT EFI_PHYSICAL_ADDRESS *FdtBlobBase,
- IN OUT UINT32 *FdtBlobSize
+ IN OUT UINTN *FdtBlobSize
);
#endif
Modified:
trunk/edk2/ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.c
===================================================================
---
trunk/edk2/ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.c
2013-03-12 00:49:42 UTC (rev 14180)
+++
trunk/edk2/ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.c
2013-03-12 00:50:46 UTC (rev 14181)
@@ -221,7 +221,7 @@
ImageContext->ImageRead = PeCoffLoaderImageReadFromMemory;
Status = PeCoffLoaderGetImageInfo (ImageContext);
- if (!EFI_ERROR(Status) && ((VOID*)ImageContext->DebugDirectoryEntryRva !=
NULL)) {
+ if (!EFI_ERROR(Status) &&
((VOID*)(UINTN)ImageContext->DebugDirectoryEntryRva != NULL)) {
ImageAddress = ImageContext->ImageAddress;
if (ImageContext->IsTeImage) {
ImageAddress += sizeof (EFI_TE_IMAGE_HEADER) -
((EFI_TE_IMAGE_HEADER*)EfiImage)->StrippedSize;
@@ -285,8 +285,8 @@
// Now we've got UART, make the check:
// - The Vector table must be 32-byte aligned
- ASSERT(((UINT32)DebugAgentVectorTable & ARM_VECTOR_TABLE_ALIGNMENT) == 0);
- ArmWriteVBar ((UINT32)DebugAgentVectorTable);
+ ASSERT(((UINTN)DebugAgentVectorTable & ARM_VECTOR_TABLE_ALIGNMENT) == 0);
+ ArmWriteVBar ((UINTN)DebugAgentVectorTable);
// We use InitFlag to know if DebugAgent has been intialized from
// Sec (DEBUG_AGENT_INIT_PREMEM_SEC) or PrePi (DEBUG_AGENT_INIT_POSTMEM_SEC)
@@ -295,7 +295,7 @@
//
// Get the Sec or PrePeiCore module (defined as SEC type module)
//
- Status = GetFfsFile
((EFI_FIRMWARE_VOLUME_HEADER*)PcdGet32(PcdSecureFvBaseAddress),
EFI_FV_FILETYPE_SECURITY_CORE, &FfsHeader);
+ Status = GetFfsFile
((EFI_FIRMWARE_VOLUME_HEADER*)(UINTN)PcdGet32(PcdSecureFvBaseAddress),
EFI_FV_FILETYPE_SECURITY_CORE, &FfsHeader);
if (!EFI_ERROR(Status)) {
Status = GetImageContext (FfsHeader,&ImageContext);
if (!EFI_ERROR(Status)) {
@@ -306,7 +306,7 @@
//
// Get the PrePi or PrePeiCore module (defined as SEC type module)
//
- Status = GetFfsFile
((EFI_FIRMWARE_VOLUME_HEADER*)PcdGet32(PcdFvBaseAddress),
EFI_FV_FILETYPE_SECURITY_CORE, &FfsHeader);
+ Status = GetFfsFile
((EFI_FIRMWARE_VOLUME_HEADER*)(UINTN)PcdGet32(PcdFvBaseAddress),
EFI_FV_FILETYPE_SECURITY_CORE, &FfsHeader);
if (!EFI_ERROR(Status)) {
Status = GetImageContext (FfsHeader,&ImageContext);
if (!EFI_ERROR(Status)) {
@@ -317,7 +317,7 @@
//
// Get the PeiCore module (defined as PEI_CORE type module)
//
- Status = GetFfsFile
((EFI_FIRMWARE_VOLUME_HEADER*)PcdGet32(PcdFvBaseAddress),
EFI_FV_FILETYPE_PEI_CORE, &FfsHeader);
+ Status = GetFfsFile
((EFI_FIRMWARE_VOLUME_HEADER*)(UINTN)PcdGet32(PcdFvBaseAddress),
EFI_FV_FILETYPE_PEI_CORE, &FfsHeader);
if (!EFI_ERROR(Status)) {
Status = GetImageContext (FfsHeader,&ImageContext);
if (!EFI_ERROR(Status)) {
Modified:
trunk/edk2/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c
===================================================================
---
trunk/edk2/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c
2013-03-12 00:49:42 UTC (rev 14180)
+++
trunk/edk2/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c
2013-03-12 00:50:46 UTC (rev 14181)
@@ -36,9 +36,9 @@
CHAR8 *
GetImageName (
- IN UINT32 FaultAddress,
- OUT UINT32 *ImageBase,
- OUT UINT32 *PeCoffSizeOfHeaders
+ IN UINTN FaultAddress,
+ OUT UINTN *ImageBase,
+ OUT UINTN *PeCoffSizeOfHeaders
);
/**
Modified:
trunk/edk2/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerBase.c
===================================================================
---
trunk/edk2/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerBase.c
2013-03-12 00:49:42 UTC (rev 14180)
+++
trunk/edk2/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerBase.c
2013-03-12 00:50:46 UTC (rev 14181)
@@ -26,9 +26,9 @@
**/
CHAR8 *
GetImageName (
- IN UINT32 FaultAddress,
- OUT UINT32 *ImageBase,
- OUT UINT32 *PeCoffSizeOfHeaders
+ IN UINTN FaultAddress,
+ OUT UINTN *ImageBase,
+ OUT UINTN *PeCoffSizeOfHeaders
)
{
return NULL;
Modified:
trunk/edk2/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerUefi.c
===================================================================
---
trunk/edk2/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerUefi.c
2013-03-12 00:49:42 UTC (rev 14180)
+++
trunk/edk2/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerUefi.c
2013-03-12 00:50:46 UTC (rev 14181)
@@ -62,9 +62,9 @@
**/
CHAR8 *
GetImageName (
- IN UINT32 FaultAddress,
- OUT UINT32 *ImageBase,
- OUT UINT32 *PeCoffSizeOfHeaders
+ IN UINTN FaultAddress,
+ OUT UINTN *ImageBase,
+ OUT UINTN *PeCoffSizeOfHeaders
)
{
EFI_DEBUG_IMAGE_INFO *DebugTable;
@@ -83,7 +83,7 @@
(DebugTable->NormalImage->LoadedImageProtocolInstance != NULL)) {
if ((Address >= (CHAR8
*)DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase) &&
(Address <= ((CHAR8
*)DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase +
DebugTable->NormalImage->LoadedImageProtocolInstance->ImageSize))) {
- *ImageBase =
(UINT32)DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase;
+ *ImageBase =
(UINTN)DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase;
*PeCoffSizeOfHeaders = PeCoffGetSizeOfHeaders ((VOID
*)(UINTN)*ImageBase);
return PeCoffLoaderGetPdbPointer
(DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase);
}
@@ -93,3 +93,4 @@
return NULL;
}
+
Modified: trunk/edk2/ArmPkg/Library/SemihostLib/SemihostLib.c
===================================================================
--- trunk/edk2/ArmPkg/Library/SemihostLib/SemihostLib.c 2013-03-12 00:49:42 UTC
(rev 14180)
+++ trunk/edk2/ArmPkg/Library/SemihostLib/SemihostLib.c 2013-03-12 00:50:46 UTC
(rev 14181)
@@ -30,7 +30,7 @@
SemihostFileOpen (
IN CHAR8 *FileName,
IN UINT32 Mode,
- OUT UINT32 *FileHandle
+ OUT UINTN *FileHandle
)
{
SEMIHOST_FILE_OPEN_BLOCK OpenBlock;
@@ -56,8 +56,8 @@
RETURN_STATUS
SemihostFileSeek (
- IN UINT32 FileHandle,
- IN UINT32 Offset
+ IN UINTN FileHandle,
+ IN UINTN Offset
)
{
SEMIHOST_FILE_SEEK_BLOCK SeekBlock;
@@ -77,8 +77,8 @@
RETURN_STATUS
SemihostFileRead (
- IN UINT32 FileHandle,
- IN OUT UINT32 *Length,
+ IN UINTN FileHandle,
+ IN OUT UINTN *Length,
OUT VOID *Buffer
)
{
@@ -105,8 +105,8 @@
RETURN_STATUS
SemihostFileWrite (
- IN UINT32 FileHandle,
- IN OUT UINT32 *Length,
+ IN UINTN FileHandle,
+ IN OUT UINTN *Length,
IN VOID *Buffer
)
{
@@ -127,7 +127,7 @@
RETURN_STATUS
SemihostFileClose (
- IN UINT32 FileHandle
+ IN UINTN FileHandle
)
{
INT32 Result = Semihost_SYS_CLOSE(&FileHandle);
@@ -141,8 +141,8 @@
RETURN_STATUS
SemihostFileLength (
- IN UINT32 FileHandle,
- OUT UINT32 *Length
+ IN UINTN FileHandle,
+ OUT UINTN *Length
)
{
INT32 Result;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
