Update code to pass build on VS2008 with /Od compiler option.

Signed-off-by: lgao4
Reviewed-by: rsun3
Reviewed-by: ftian
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12792 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
index cfd2d807c31bd7e959817e65b756ceccf341ba4d..5a6a3d7d0f862d5f7bbdb4a87e8b5ef67afcacfb 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
@@ -503,12 +503,12 @@ AhciBuildCommand (
   IN     UINT8                      AtapiCommandLength,\r
   IN     UINT8                      CommandSlotNumber,\r
   IN OUT VOID                       *DataPhysicalAddr,\r
   IN     UINT8                      AtapiCommandLength,\r
   IN     UINT8                      CommandSlotNumber,\r
   IN OUT VOID                       *DataPhysicalAddr,\r

-  IN     UINT64                     DataLength\r
+  IN     UINT32                     DataLength\r

   )\r
 {\r
   UINT64     BaseAddr;\r
   )\r
 {\r
   UINT64     BaseAddr;\r

-  UINT64     PrdtNumber;\r
-  UINT64     PrdtIndex;\r
+  UINT32     PrdtNumber;\r
+  UINT32     PrdtIndex;\r

   UINTN      RemainedData;\r
   UINTN      MemAddr;\r
   DATA_64    Data64;\r
   UINTN      RemainedData;\r
   UINTN      MemAddr;\r
   DATA_64    Data64;\r


@@ -557,7 +557,7 @@ AhciBuildCommand (
 \r
   RemainedData = (UINTN) DataLength;\r
   MemAddr      = (UINTN) DataPhysicalAddr;\r
 \r
   RemainedData = (UINTN) DataLength;\r
   MemAddr      = (UINTN) DataPhysicalAddr;\r

-  CommandList->AhciCmdPrdtl = (UINT32)PrdtNumber;\r
+  CommandList->AhciCmdPrdtl = PrdtNumber;\r

 \r
   for (PrdtIndex = 0; PrdtIndex < PrdtNumber; PrdtIndex++) {\r
     if (RemainedData < EFI_AHCI_MAX_DATA_PER_PRDT) {\r
 \r
   for (PrdtIndex = 0; PrdtIndex < PrdtNumber; PrdtIndex++) {\r
     if (RemainedData < EFI_AHCI_MAX_DATA_PER_PRDT) {\r

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
index d0b616582ece11067fec3804fd6b5e624c4a52ed..6d4044a09b198eb04fd01c61bffdde14fc414c17 100644 (file)
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
@@ -781,7 +781,7 @@ XhcFreeEventRing (
   //\r
   for (Index = 0; Index < ERST_NUMBER; Index++) {\r
     EventRingPtr = TablePtr + Index;\r
   //\r
   for (Index = 0; Index < ERST_NUMBER; Index++) {\r
     EventRingPtr = TablePtr + Index;\r

-    RingBuf      = (VOID *)(UINTN)(EventRingPtr->PtrLo | ((UINT64)EventRingPtr->PtrHi << 32));\r
+    RingBuf      = (VOID *)(UINTN)(EventRingPtr->PtrLo | LShiftU64 ((UINT64)EventRingPtr->PtrHi, 32));\r

 \r
     if(RingBuf != NULL) {\r
       FreePages (RingBuf, EFI_SIZE_TO_PAGES (sizeof (TRB_TEMPLATE) * EVENT_RING_TRB_NUMBER));\r
 \r
     if(RingBuf != NULL) {\r
       FreePages (RingBuf, EFI_SIZE_TO_PAGES (sizeof (TRB_TEMPLATE) * EVENT_RING_TRB_NUMBER));\r


@@ -922,7 +922,7 @@ XhcCheckUrbResult (
       continue;\r
     }\r
 \r
       continue;\r
     }\r
 \r

-    TRBPtr = (TRB_TEMPLATE *)(UINTN)(EvtTrb->TRBPtrLo | (UINT64) EvtTrb->TRBPtrHi << 32);\r
+    TRBPtr = (TRB_TEMPLATE *)(UINTN)(EvtTrb->TRBPtrLo | LShiftU64 ((UINT64) EvtTrb->TRBPtrHi, 32));\r

     if (IsTransferRingTrb (Urb->Ring, TRBPtr)) {\r
       switch (EvtTrb->Completecode) {\r
         case TRB_COMPLETION_STALL_ERROR:\r
     if (IsTransferRingTrb (Urb->Ring, TRBPtr)) {\r
       switch (EvtTrb->Completecode) {\r
         case TRB_COMPLETION_STALL_ERROR:\r


@@ -1537,7 +1537,7 @@ XhcSyncTrsRing (
       // Toggle PCS maintained by software\r
       //\r
       TrsRing->RingPCS = (TrsRing->RingPCS & BIT0) ? 0 : 1;\r
       // Toggle PCS maintained by software\r
       //\r
       TrsRing->RingPCS = (TrsRing->RingPCS & BIT0) ? 0 : 1;\r

-      TrsTrb           = (TRB_TEMPLATE *)(UINTN)((TrsTrb->Parameter1 | ((UINT64)TrsTrb->Parameter2 << 32)) & ~0x0F);\r
+      TrsTrb           = (TRB_TEMPLATE *)(UINTN)((TrsTrb->Parameter1 | LShiftU64 ((UINT64)TrsTrb->Parameter2, 32)) & ~0x0F);\r

     }\r
   }\r
 \r
     }\r
   }\r
 \r

diff --git a/MdeModulePkg/Core/PiSmmCore/Dispatcher.c b/MdeModulePkg/Core/PiSmmCore/Dispatcher.c
index 53eedbbf61055ffad18e58f1a45629cc803e89ac..833df5b2979521c43bdb6ef356fe80e825f15053 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/Dispatcher.c
+++ b/MdeModulePkg/Core/PiSmmCore/Dispatcher.c
@@ -448,7 +448,7 @@ SmmLoadImage (
        //\r
        // allocate the memory to load the SMM driver\r
        //\r
        //\r
        // allocate the memory to load the SMM driver\r
        //\r

-       PageCount = (UINTN)EFI_SIZE_TO_PAGES(ImageContext.ImageSize + ImageContext.SectionAlignment);\r
+       PageCount = (UINTN)EFI_SIZE_TO_PAGES((UINTN)ImageContext.ImageSize + ImageContext.SectionAlignment);\r

        DstBuffer = (UINTN)(-1);\r
      \r
        Status = SmmAllocatePages (\r
        DstBuffer = (UINTN)(-1);\r
      \r
        Status = SmmAllocatePages (\r


@@ -466,7 +466,7 @@ SmmLoadImage (
       ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS)DstBuffer;\r
     }\r
   } else {\r
       ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS)DstBuffer;\r
     }\r
   } else {\r

-     PageCount = (UINTN)EFI_SIZE_TO_PAGES(ImageContext.ImageSize + ImageContext.SectionAlignment);\r
+     PageCount = (UINTN)EFI_SIZE_TO_PAGES((UINTN)ImageContext.ImageSize + ImageContext.SectionAlignment);\r

      DstBuffer = (UINTN)(-1);\r
      \r
      Status = SmmAllocatePages (\r
      DstBuffer = (UINTN)(-1);\r
      \r
      Status = SmmAllocatePages (\r

diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c b/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c
index b0c43f6f19cc3b8d9f11a7c40850230bf5f8be24..84b9f73ecbe1ba588601093646d801ae75e77e36 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c
@@ -913,7 +913,7 @@ ExecuteSmmCoreFromSmram (
       // Allocate memory for the image being loaded from the EFI_SRAM_DESCRIPTOR \r
       // specified by SmramRange\r
       //\r
       // Allocate memory for the image being loaded from the EFI_SRAM_DESCRIPTOR \r
       // specified by SmramRange\r
       //\r

-      PageCount = (UINTN)EFI_SIZE_TO_PAGES(ImageContext.ImageSize + ImageContext.SectionAlignment);\r
+      PageCount = (UINTN)EFI_SIZE_TO_PAGES((UINTN)ImageContext.ImageSize + ImageContext.SectionAlignment);\r

 \r
       ASSERT ((SmramRange->PhysicalSize & EFI_PAGE_MASK) == 0);\r
       ASSERT (SmramRange->PhysicalSize > EFI_PAGES_TO_SIZE (PageCount));\r
 \r
       ASSERT ((SmramRange->PhysicalSize & EFI_PAGE_MASK) == 0);\r
       ASSERT (SmramRange->PhysicalSize > EFI_PAGES_TO_SIZE (PageCount));\r


@@ -931,7 +931,7 @@ ExecuteSmmCoreFromSmram (
     // Allocate memory for the image being loaded from the EFI_SRAM_DESCRIPTOR \r
     // specified by SmramRange\r
     //\r
     // Allocate memory for the image being loaded from the EFI_SRAM_DESCRIPTOR \r
     // specified by SmramRange\r
     //\r

-    PageCount = (UINTN)EFI_SIZE_TO_PAGES(ImageContext.ImageSize + ImageContext.SectionAlignment);\r
+    PageCount = (UINTN)EFI_SIZE_TO_PAGES((UINTN)ImageContext.ImageSize + ImageContext.SectionAlignment);\r

 \r
     ASSERT ((SmramRange->PhysicalSize & EFI_PAGE_MASK) == 0);\r
     ASSERT (SmramRange->PhysicalSize > EFI_PAGES_TO_SIZE (PageCount));\r
 \r
     ASSERT ((SmramRange->PhysicalSize & EFI_PAGE_MASK) == 0);\r
     ASSERT (SmramRange->PhysicalSize > EFI_PAGES_TO_SIZE (PageCount));\r

diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/InternalBootScriptLib.h b/MdeModulePkg/Library/PiDxeS3BootScriptLib/InternalBootScriptLib.h
index babd12e43c76aabfb4df9b5a691f31042ea41ccb..3e2a0d2bacf5d451023a3ac984d8e9600fdb79fa 100644 (file)
--- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/InternalBootScriptLib.h
+++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/InternalBootScriptLib.h
@@ -42,8 +42,11 @@
 \r
 #define MAX_IO_ADDRESS 0xFFFF\r
 \r
 \r
 #define MAX_IO_ADDRESS 0xFFFF\r
 \r

+//\r
+// Macro to convert a UEFI PCI address to a PCI Library PCI address\r
+//\r

 #define PCI_ADDRESS_ENCODE(A) (UINTN)PCI_LIB_ADDRESS( \\r
 #define PCI_ADDRESS_ENCODE(A) (UINTN)PCI_LIB_ADDRESS( \\r

-        (((A)& 0xff000000) >> 24), (((A) &0x00ff0000) >> 16), (((A) & 0xff00) >> 8), ((RShiftU64 ((A), 32) & 0xfff) | ((A)& 0xff)) \\r
+        ((((UINTN)(A))& 0xff000000) >> 24), ((((UINTN)(A)) &0x00ff0000) >> 16), ((((UINTN)(A)) & 0xff00) >> 8), ((RShiftU64 ((A), 32) & 0xfff) | ((A)& 0xff)) \\r

         )\r
         \r
 \r
         )\r
         \r
 \r