ArmPlatformPkg: Fixed unsigned type to be architecture independent

Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14106 6f19259b-4bc3-4df7-8a09-765794883524

6 files changed, 14 insertions, 13 deletions

diff --git a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c
index e998a195ff..ef85e71250 100644
--- a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c
+++ b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c
@@ -1,6 +1,6 @@
 /** @file

 

- Copyright (c) 2011, ARM Ltd. All rights reserved.<BR>

+ Copyright (c) 2011-2013, 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

@@ -301,7 +301,7 @@ BltVideoFill (
       DestinationAddr = (VOID *)((UINT32 *)FrameBufferBase + DestinationLine * HorizontalResolution  + DestinationX);

 

       // Fill the entire line

-      SetMemN( DestinationAddr, WidthInBytes, *((UINTN *)EfiSourcePixel));

+      SetMemN( DestinationAddr, WidthInBytes, *((UINT32 *)EfiSourcePixel));

     }

     break;

 

diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c
index 0c138a5ab2..ab6304ba1d 100644
--- a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c
+++ b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c
@@ -1,6 +1,6 @@
 /*++ @file  NorFlashFvbDxe.c

 

- Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>

+ Copyright (c) 2011-201333, 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

@@ -107,7 +107,7 @@ InitializeFvAndVariableStoreHeaders (
   //

   // VARIABLE_STORE_HEADER

   //

-  VariableStoreHeader = (VARIABLE_STORE_HEADER*)((UINT32)Headers + FirmwareVolumeHeader->HeaderLength);

+  VariableStoreHeader = (VARIABLE_STORE_HEADER*)((UINTN)Headers + FirmwareVolumeHeader->HeaderLength);

   CopyGuid (&VariableStoreHeader->Signature, &gEfiVariableGuid);

   VariableStoreHeader->Size = PcdGet32(PcdFlashNvStorageVariableSize) - FirmwareVolumeHeader->HeaderLength;

   VariableStoreHeader->Format            = VARIABLE_STORE_FORMATTED;

@@ -172,7 +172,7 @@ ValidateFvHeader (
     return EFI_NOT_FOUND;

   }

 

-  VariableStoreHeader = (VARIABLE_STORE_HEADER*)((UINT32)FwVolHeader + FwVolHeader->HeaderLength);

+  VariableStoreHeader = (VARIABLE_STORE_HEADER*)((UINTN)FwVolHeader + FwVolHeader->HeaderLength);

 

   // Check the Variable Store Guid

   if( CompareGuid (&VariableStoreHeader->Signature, &gEfiVariableGuid) == FALSE ) {

diff --git a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/ArmTrustedMonitorLibNull.c b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/ArmTrustedMonitorLibNull.c
index 6d3250e3a5..e82584e6dc 100644
--- a/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/ArmTrustedMonitorLibNull.c
+++ b/ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/ArmTrustedMonitorLibNull.c
@@ -1,7 +1,7 @@
 /** @file

 *  Main file supporting the Monitor World on ARM PLatforms

 *

-*  Copyright (c) 2011-2012, ARM Limited. All rights reserved.

+*  Copyright (c) 2011-2013, ARM Limited. All rights reserved.

 *

 *  This program and the accompanying materials

 *  are licensed and made available under the terms and conditions of the BSD License

@@ -33,5 +33,5 @@ ArmSecureMonitorWorldInitialize (
   ASSERT (IS_ALIGNED(MonitorVectorTable, BIT5));

 

   // Write the Monitor Mode Vector Table Address

-  ArmWriteMVBar ((UINT32) &MonitorVectorTable);

+  ArmWriteMVBar ((UINTN) &MonitorVectorTable);

 }

diff --git a/ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.c b/ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.c
index 8f7ea65e7b..b45e85d9af 100644
--- a/ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.c
+++ b/ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.c
@@ -1,6 +1,6 @@
 /** @file

 *

-*  Copyright (c) 2011-2012, ARM Limited. All rights reserved.

+*  Copyright (c) 2011-2013, ARM Limited. All rights reserved.

 *  

 *  This program and the accompanying materials                          

 *  are licensed and made available under the terms and conditions of the BSD License         

@@ -101,7 +101,7 @@ EblSymbolTable (
   for (Entry = 0; Entry < DebugImageTableHeader->TableSize; Entry++, DebugTable++) {

     if (DebugTable->NormalImage != NULL) {

       if ((DebugTable->NormalImage->ImageInfoType == EFI_DEBUG_IMAGE_INFO_TYPE_NORMAL) && (DebugTable->NormalImage->LoadedImageProtocolInstance != NULL)) {

-        ImageBase = (UINT32)DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase;

+        ImageBase = (UINTN)DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase;

         PeCoffSizeOfHeaders = PeCoffGetSizeOfHeaders ((VOID *)(UINTN)ImageBase);

         Pdb = PeCoffLoaderGetPdbPointer (DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase);

         if (Pdb != NULL) {

@@ -389,7 +389,7 @@ EblDevicePaths (
   for (Index = 0; Index < HandleCount; Index++) {

     Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiDevicePathProtocolGuid, (VOID **)&DevicePathProtocol);

     String = DevicePathToTextProtocol->ConvertDevicePathToText(DevicePathProtocol,TRUE,TRUE);

-    Print (L"[0x%X] %s\n",(UINT32)HandleBuffer[Index], String);

+    Print (L"[0x%X] %s\n",(UINTN)HandleBuffer[Index], String);

   }

 

   return EFI_SUCCESS;

diff --git a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c
index ec3091b9e7..44a1eee7a4 100644
--- a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c
+++ b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c
@@ -4,6 +4,7 @@
   Currently this driver does not support runtime virtual calling.

 

   Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>

+  Copyright (c) 2011-2013, 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

@@ -250,7 +251,7 @@ LibGetTime (
   )

 {

   EFI_STATUS  Status = EFI_SUCCESS;

-  UINTN       EpochSeconds;

+  UINT32      EpochSeconds;

   INT16       *TimeZone = 0;

   UINTN       *Daylight = 0;

 

diff --git a/ArmPlatformPkg/Sec/SecInternal.h b/ArmPlatformPkg/Sec/SecInternal.h
index 8bc21389e7..eeaf40c0c8 100644
--- a/ArmPlatformPkg/Sec/SecInternal.h
+++ b/ArmPlatformPkg/Sec/SecInternal.h
@@ -1,7 +1,7 @@
 /** @file

 *  Main file supporting the SEC Phase on ARM PLatforms

 *

-*  Copyright (c) 2011-2012, ARM Limited. All rights reserved.

+*  Copyright (c) 2011-2013, ARM Limited. All rights reserved.

 *

 *  This program and the accompanying materials

 *  are licensed and made available under the terms and conditions of the BSD License

@@ -70,7 +70,7 @@ set_non_secure_mode (
 VOID

 SecCommonExceptionEntry (

   IN UINT32 Entry,

-  IN UINT32 LR

+  IN UINTN  LR

   );

 

 #endif