ArmPkg: Fixed unsigned type to be architecture independent

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14181 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/Application/LinuxLoader/LinuxConfig.c b/ArmPkg/Application/LinuxLoader/LinuxConfig.c
index 10aadb7335f5e33f900ec855d77a0f5d61bf2559..c88dc65e9362ba7a91ddc6447d73617f0b0a175d 100644 (file)
--- a/ArmPkg/Application/LinuxLoader/LinuxConfig.c
+++ b/ArmPkg/Application/LinuxLoader/LinuxConfig.c
@@ -189,7 +189,7 @@ LinuxLoaderConfig (
     Print (L"[%d] Update Linux Boot Entry\n",LINUX_LOADER_UPDATE);\r
 \r
     Print (L"Option: ");\r
-    Status = GetHIInputInteger (&Choice);\r
+    Status = GetHIInputInteger ((UINTN*)&Choice);\r
     if (Status == EFI_INVALID_PARAMETER) {\r
       Print (L"\n");\r
       return Status;\r
@@ -268,7 +268,7 @@ LinuxLoaderConfig (
 \r
       do {\r
         Print (L"Update Boot Entry: ");\r
-        Status = GetHIInputInteger (&Choice);\r
+        Status = GetHIInputInteger ((UINTN*)&Choice);\r
         if (Status == EFI_INVALID_PARAMETER) {\r
           Print (L"\n");\r
           return Status;\r

diff --git a/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c b/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c
index 5c70e51ce7544f5ad6813806317dfd503bd90087..059845c04d95019158cd2358a703f4f0829edc93 100644 (file)
--- a/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c
+++ b/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c
@@ -2,7 +2,8 @@
   Support a Semi Host file system over a debuggers JTAG\r
 \r
   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
-  \r
+  Portions copyright (c) 2011, 2012, ARM Ltd. All rights reserved.<BR>\r
+\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -73,7 +74,7 @@ typedef struct {
   EFI_FILE    File;\r
   CHAR8       *FileName;\r
   UINT32      Position;\r
-  UINT32      SemihostHandle;\r
+  UINTN       SemihostHandle;\r
   BOOLEAN     IsRoot;\r
 } SEMIHOST_FCB;\r
 \r
@@ -152,7 +153,7 @@ FileOpen (
 {\r
   SEMIHOST_FCB  *FileFcb = NULL;\r
   EFI_STATUS    Status   = EFI_SUCCESS;\r
-  UINT32        SemihostHandle;\r
+  UINTN         SemihostHandle;\r
   CHAR8         *AsciiFileName;\r
   CHAR8         *AsciiPtr;\r
   UINTN         Length;\r
@@ -360,7 +361,7 @@ FileSetPosition (
   )\r
 {\r
   SEMIHOST_FCB *Fcb    = NULL;\r
-  UINT32       Length;\r
+  UINTN        Length;\r
   EFI_STATUS   Status;\r
 \r
   Fcb = SEMIHOST_FCB_FROM_THIS(File);\r
@@ -395,7 +396,7 @@ GetFileInfo (
   UINTN           NameSize = 0;\r
   UINTN           ResultSize;\r
   UINTN           Index;\r
-  UINT32          Length;\r
+  UINTN           Length;\r
   EFI_STATUS      Status;\r
 \r
   if (Fcb->IsRoot == TRUE) {\r

diff --git a/ArmPkg/Include/Library/SemihostLib.h b/ArmPkg/Include/Library/SemihostLib.h
index 2ced7f107cc5bab61b9b44852ec3bc4161d50c78..62565517712646271b99e6bee105b6cd1703caba 100644 (file)
--- a/ArmPkg/Include/Library/SemihostLib.h
+++ b/ArmPkg/Include/Library/SemihostLib.h
@@ -1,6 +1,7 @@
 /** @file\r
 \r
   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+  Portions copyright (c) 2011, 2012, ARM Ltd. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -38,38 +39,38 @@ RETURN_STATUS
 SemihostFileOpen (\r
   IN  CHAR8  *FileName,\r
   IN  UINT32 Mode,\r
-  OUT UINT32 *FileHandle\r
+  OUT UINTN  *FileHandle\r
   );\r
 \r
 RETURN_STATUS\r
 SemihostFileSeek (\r
-  IN UINT32 FileHandle,\r
-  IN UINT32 Offset\r
+  IN UINTN  FileHandle,\r
+  IN UINTN  Offset\r
   );\r
 \r
 RETURN_STATUS\r
 SemihostFileRead (\r
-  IN     UINT32 FileHandle,\r
-  IN OUT UINT32 *Length,\r
+  IN     UINTN  FileHandle,\r
+  IN OUT UINTN  *Length,\r
   OUT    VOID   *Buffer\r
   );\r
 \r
 RETURN_STATUS\r
 SemihostFileWrite (\r
-  IN     UINT32 FileHandle,\r
-  IN OUT UINT32 *Length,\r
+  IN     UINTN  FileHandle,\r
+  IN OUT UINTN  *Length,\r
   IN     VOID   *Buffer\r
   );\r
 \r
 RETURN_STATUS\r
 SemihostFileClose (\r
-  IN UINT32 FileHandle\r
+  IN UINTN  FileHandle\r
   );\r
 \r
 RETURN_STATUS\r
 SemihostFileLength (\r
-  IN  UINT32 FileHandle,\r
-  OUT UINT32 *Length\r
+  IN  UINTN  FileHandle,\r
+  OUT UINTN  *Length\r
   );\r
 \r
 RETURN_STATUS\r

diff --git a/ArmPkg/Library/BdsLib/BdsLinuxFdt.c b/ArmPkg/Library/BdsLib/BdsLinuxFdt.c
index fa06287b1967cf0e0982afe6aa18db0663c8dd2f..a098b1cda7790c5ced60e40ffbde45df5a4f2c74 100644 (file)
--- a/ArmPkg/Library/BdsLib/BdsLinuxFdt.c
+++ b/ArmPkg/Library/BdsLib/BdsLinuxFdt.c
@@ -170,7 +170,7 @@ PrepareFdt (
   IN     EFI_PHYSICAL_ADDRESS InitrdImage,\r
   IN     UINTN                InitrdImageSize,\r
   IN OUT EFI_PHYSICAL_ADDRESS *FdtBlobBase,\r
-  IN OUT UINT32               *FdtBlobSize\r
+  IN OUT UINTN                *FdtBlobSize\r
   )\r
 {\r
   EFI_STATUS            Status;\r

diff --git a/ArmPkg/Library/BdsLib/BdsLinuxLoader.h b/ArmPkg/Library/BdsLib/BdsLinuxLoader.h
index a3ecddc4f1e04c52b271186de328a570ae9a081d..09b212f364e27baf0601810d8330aa6278d6d1bb 100644 (file)
--- a/ArmPkg/Library/BdsLib/BdsLinuxLoader.h
+++ b/ArmPkg/Library/BdsLib/BdsLinuxLoader.h
@@ -150,7 +150,7 @@ PrepareFdt (
   IN     EFI_PHYSICAL_ADDRESS InitrdImage,\r
   IN     UINTN                InitrdImageSize,\r
   IN OUT EFI_PHYSICAL_ADDRESS *FdtBlobBase,\r
-  IN OUT UINT32               *FdtBlobSize\r
+  IN OUT UINTN                *FdtBlobSize\r
   );\r
 \r
 #endif\r

diff --git a/ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.c b/ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.c
index c27d8e7dd3462d3b8b850f9510117ee1282a58b4..25a904e3f215a1da140dbefe4622e1905da1ed6b 100644 (file)
--- a/ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.c
+++ b/ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.c
@@ -221,7 +221,7 @@ GetImageContext (
   ImageContext->ImageRead = PeCoffLoaderImageReadFromMemory;\r
 \r
   Status =  PeCoffLoaderGetImageInfo (ImageContext);\r
-  if (!EFI_ERROR(Status) && ((VOID*)ImageContext->DebugDirectoryEntryRva != NULL)) {\r
+  if (!EFI_ERROR(Status) && ((VOID*)(UINTN)ImageContext->DebugDirectoryEntryRva != NULL)) {\r
     ImageAddress = ImageContext->ImageAddress;\r
     if (ImageContext->IsTeImage) {\r
       ImageAddress += sizeof (EFI_TE_IMAGE_HEADER) - ((EFI_TE_IMAGE_HEADER*)EfiImage)->StrippedSize;\r
@@ -285,8 +285,8 @@ InitializeDebugAgent (
 \r
   // Now we've got UART, make the check:\r
   // - The Vector table must be 32-byte aligned\r
-  ASSERT(((UINT32)DebugAgentVectorTable & ARM_VECTOR_TABLE_ALIGNMENT) == 0);\r
-  ArmWriteVBar ((UINT32)DebugAgentVectorTable);\r
+  ASSERT(((UINTN)DebugAgentVectorTable & ARM_VECTOR_TABLE_ALIGNMENT) == 0);\r
+  ArmWriteVBar ((UINTN)DebugAgentVectorTable);\r
 \r
   // We use InitFlag to know if DebugAgent has been intialized from\r
   // Sec (DEBUG_AGENT_INIT_PREMEM_SEC) or PrePi (DEBUG_AGENT_INIT_POSTMEM_SEC)\r
@@ -295,7 +295,7 @@ InitializeDebugAgent (
     //\r
     // Get the Sec or PrePeiCore module (defined as SEC type module)\r
     //\r
-    Status = GetFfsFile ((EFI_FIRMWARE_VOLUME_HEADER*)PcdGet32(PcdSecureFvBaseAddress), EFI_FV_FILETYPE_SECURITY_CORE, &FfsHeader);\r
+    Status = GetFfsFile ((EFI_FIRMWARE_VOLUME_HEADER*)(UINTN)PcdGet32(PcdSecureFvBaseAddress), EFI_FV_FILETYPE_SECURITY_CORE, &FfsHeader);\r
     if (!EFI_ERROR(Status)) {\r
       Status = GetImageContext (FfsHeader,&ImageContext);\r
       if (!EFI_ERROR(Status)) {\r
@@ -306,7 +306,7 @@ InitializeDebugAgent (
     //\r
     // Get the PrePi or PrePeiCore module (defined as SEC type module)\r
     //\r
-    Status = GetFfsFile ((EFI_FIRMWARE_VOLUME_HEADER*)PcdGet32(PcdFvBaseAddress), EFI_FV_FILETYPE_SECURITY_CORE, &FfsHeader);\r
+    Status = GetFfsFile ((EFI_FIRMWARE_VOLUME_HEADER*)(UINTN)PcdGet32(PcdFvBaseAddress), EFI_FV_FILETYPE_SECURITY_CORE, &FfsHeader);\r
     if (!EFI_ERROR(Status)) {\r
       Status = GetImageContext (FfsHeader,&ImageContext);\r
       if (!EFI_ERROR(Status)) {\r
@@ -317,7 +317,7 @@ InitializeDebugAgent (
     //\r
     // Get the PeiCore module (defined as PEI_CORE type module)\r
     //\r
-    Status = GetFfsFile ((EFI_FIRMWARE_VOLUME_HEADER*)PcdGet32(PcdFvBaseAddress), EFI_FV_FILETYPE_PEI_CORE, &FfsHeader);\r
+    Status = GetFfsFile ((EFI_FIRMWARE_VOLUME_HEADER*)(UINTN)PcdGet32(PcdFvBaseAddress), EFI_FV_FILETYPE_PEI_CORE, &FfsHeader);\r
     if (!EFI_ERROR(Status)) {\r
       Status = GetImageContext (FfsHeader,&ImageContext);\r
       if (!EFI_ERROR(Status)) {\r

diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c b/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c
index bb29b95da2d1a076486f1821de657b5631611717..74e2a7602cd4838896413fbc5760c260c126dab0 100644 (file)
--- a/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c
+++ b/ArmPkg/Library/DefaultExceptionHandlerLib/Arm/DefaultExceptionHandler.c
@@ -36,9 +36,9 @@ typedef struct {
 \r
 CHAR8 *\r
 GetImageName (\r
-  IN  UINT32  FaultAddress,\r
-  OUT UINT32  *ImageBase,\r
-  OUT UINT32  *PeCoffSizeOfHeaders\r
+  IN  UINTN  FaultAddress,\r
+  OUT UINTN  *ImageBase,\r
+  OUT UINTN  *PeCoffSizeOfHeaders\r
   );\r
 \r
 /**\r

diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerBase.c b/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerBase.c
index e68617e1e77fa18fdd20821fab8894751a6938ca..4a54298b118962bd344a849940c435eb508ce5c4 100644 (file)
--- a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerBase.c
+++ b/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerBase.c
@@ -26,9 +26,9 @@
 **/\r
 CHAR8 *\r
 GetImageName (\r
-  IN  UINT32  FaultAddress,\r
-  OUT UINT32  *ImageBase,\r
-  OUT UINT32  *PeCoffSizeOfHeaders\r
+  IN  UINTN  FaultAddress,\r
+  OUT UINTN  *ImageBase,\r
+  OUT UINTN  *PeCoffSizeOfHeaders\r
   )\r
 {\r
   return NULL;\r

diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerUefi.c b/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerUefi.c
index 8543ade99c102531715b309e1d573876dd688338..b2d630cb33edb06d4249b1c2e38f1e118a4ffc1c 100644 (file)
--- a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerUefi.c
+++ b/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerUefi.c
@@ -62,9 +62,9 @@ DefaultExceptionHandlerConstructor (
 **/\r
 CHAR8 *\r
 GetImageName (\r
-  IN  UINT32  FaultAddress,\r
-  OUT UINT32  *ImageBase,\r
-  OUT UINT32  *PeCoffSizeOfHeaders\r
+  IN  UINTN  FaultAddress,\r
+  OUT UINTN  *ImageBase,\r
+  OUT UINTN  *PeCoffSizeOfHeaders\r
   )\r
 {\r
   EFI_DEBUG_IMAGE_INFO  *DebugTable;\r
@@ -83,7 +83,7 @@ GetImageName (
           (DebugTable->NormalImage->LoadedImageProtocolInstance != NULL)) {\r
         if ((Address >= (CHAR8 *)DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase) &&\r
             (Address <= ((CHAR8 *)DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase + DebugTable->NormalImage->LoadedImageProtocolInstance->ImageSize))) {\r
-          *ImageBase = (UINT32)DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase;\r
+          *ImageBase = (UINTN)DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase;\r
           *PeCoffSizeOfHeaders = PeCoffGetSizeOfHeaders ((VOID *)(UINTN)*ImageBase);\r
           return PeCoffLoaderGetPdbPointer (DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase);\r
         }\r
@@ -93,3 +93,4 @@ GetImageName (
 \r
   return NULL;\r
 }\r
+\r

diff --git a/ArmPkg/Library/SemihostLib/SemihostLib.c b/ArmPkg/Library/SemihostLib/SemihostLib.c
index 01b6dc334d4997258d2df400ea41241407ee738e..5a36515b7727199da7ad4303baa09e31a93155a0 100644 (file)
--- a/ArmPkg/Library/SemihostLib/SemihostLib.c
+++ b/ArmPkg/Library/SemihostLib/SemihostLib.c
@@ -30,7 +30,7 @@ RETURN_STATUS
 SemihostFileOpen (\r
   IN  CHAR8  *FileName,\r
   IN  UINT32 Mode,\r
-  OUT UINT32 *FileHandle\r
+  OUT UINTN  *FileHandle\r
   )\r
 {\r
   SEMIHOST_FILE_OPEN_BLOCK  OpenBlock;\r
@@ -56,8 +56,8 @@ SemihostFileOpen (
 \r
 RETURN_STATUS\r
 SemihostFileSeek (\r
-  IN UINT32 FileHandle,\r
-  IN UINT32 Offset\r
+  IN UINTN  FileHandle,\r
+  IN UINTN  Offset\r
   )\r
 {\r
   SEMIHOST_FILE_SEEK_BLOCK  SeekBlock;\r
@@ -77,8 +77,8 @@ SemihostFileSeek (
 \r
 RETURN_STATUS\r
 SemihostFileRead (\r
-  IN     UINT32 FileHandle,\r
-  IN OUT UINT32 *Length,\r
+  IN     UINTN  FileHandle,\r
+  IN OUT UINTN  *Length,\r
   OUT    VOID   *Buffer\r
   )\r
 {\r
@@ -105,8 +105,8 @@ SemihostFileRead (
 \r
 RETURN_STATUS\r
 SemihostFileWrite (\r
-  IN     UINT32 FileHandle,\r
-  IN OUT UINT32 *Length,\r
+  IN     UINTN  FileHandle,\r
+  IN OUT UINTN  *Length,\r
   IN     VOID   *Buffer\r
   )\r
 {\r
@@ -127,7 +127,7 @@ SemihostFileWrite (
 \r
 RETURN_STATUS\r
 SemihostFileClose (\r
-  IN UINT32 FileHandle\r
+  IN UINTN  FileHandle\r
   )\r
 {\r
   INT32 Result = Semihost_SYS_CLOSE(&FileHandle);\r
@@ -141,8 +141,8 @@ SemihostFileClose (
 \r
 RETURN_STATUS\r
 SemihostFileLength (\r
-  IN  UINT32 FileHandle,\r
-  OUT UINT32 *Length\r
+  IN  UINTN  FileHandle,\r
+  OUT UINTN  *Length\r
   )\r
 {\r
   INT32       Result;\r