From e0e7f80cc31b625fe45be1ec48d48fd60b613c77 Mon Sep 17 00:00:00 2001
From: lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 28 Nov 2011 06:19:36 +0000
Subject: 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
---
 MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c | 8 ++++----
 MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c         | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'MdeModulePkg/Bus')

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
index cfd2d807c3..5a6a3d7d0f 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
@@ -503,12 +503,12 @@ AhciBuildCommand (
   IN     UINT8                      AtapiCommandLength,
   IN     UINT8                      CommandSlotNumber,
   IN OUT VOID                       *DataPhysicalAddr,
-  IN     UINT64                     DataLength
+  IN     UINT32                     DataLength
   )
 {
   UINT64     BaseAddr;
-  UINT64     PrdtNumber;
-  UINT64     PrdtIndex;
+  UINT32     PrdtNumber;
+  UINT32     PrdtIndex;
   UINTN      RemainedData;
   UINTN      MemAddr;
   DATA_64    Data64;
@@ -557,7 +557,7 @@ AhciBuildCommand (
 
   RemainedData = (UINTN) DataLength;
   MemAddr      = (UINTN) DataPhysicalAddr;
-  CommandList->AhciCmdPrdtl = (UINT32)PrdtNumber;
+  CommandList->AhciCmdPrdtl = PrdtNumber;
 
   for (PrdtIndex = 0; PrdtIndex < PrdtNumber; PrdtIndex++) {
     if (RemainedData < EFI_AHCI_MAX_DATA_PER_PRDT) {
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
index d0b616582e..6d4044a09b 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
@@ -781,7 +781,7 @@ XhcFreeEventRing (
   //
   for (Index = 0; Index < ERST_NUMBER; Index++) {
     EventRingPtr = TablePtr + Index;
-    RingBuf      = (VOID *)(UINTN)(EventRingPtr->PtrLo | ((UINT64)EventRingPtr->PtrHi << 32));
+    RingBuf      = (VOID *)(UINTN)(EventRingPtr->PtrLo | LShiftU64 ((UINT64)EventRingPtr->PtrHi, 32));
 
     if(RingBuf != NULL) {
       FreePages (RingBuf, EFI_SIZE_TO_PAGES (sizeof (TRB_TEMPLATE) * EVENT_RING_TRB_NUMBER));
@@ -922,7 +922,7 @@ XhcCheckUrbResult (
       continue;
     }
 
-    TRBPtr = (TRB_TEMPLATE *)(UINTN)(EvtTrb->TRBPtrLo | (UINT64) EvtTrb->TRBPtrHi << 32);
+    TRBPtr = (TRB_TEMPLATE *)(UINTN)(EvtTrb->TRBPtrLo | LShiftU64 ((UINT64) EvtTrb->TRBPtrHi, 32));
     if (IsTransferRingTrb (Urb->Ring, TRBPtr)) {
       switch (EvtTrb->Completecode) {
         case TRB_COMPLETION_STALL_ERROR:
@@ -1537,7 +1537,7 @@ XhcSyncTrsRing (
       // Toggle PCS maintained by software
       //
       TrsRing->RingPCS = (TrsRing->RingPCS & BIT0) ? 0 : 1;
-      TrsTrb           = (TRB_TEMPLATE *)(UINTN)((TrsTrb->Parameter1 | ((UINT64)TrsTrb->Parameter2 << 32)) & ~0x0F);
+      TrsTrb           = (TRB_TEMPLATE *)(UINTN)((TrsTrb->Parameter1 | LShiftU64 ((UINT64)TrsTrb->Parameter2, 32)) & ~0x0F);
     }
   }
 
-- 
cgit v1.2.3