From: eric Dong <eric.dong@intel.com>
Date: Wed, 26 Aug 2015 08:31:27 +0000 (+0000)
Subject: IntelFrameworkModulePkg/BiosThunk: Fix 32 bits arch build failure when disable optimi... 
X-Git-Tag: edk2-stable201903~8973
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=1f70d7478699bdbcc8e54f844f55e08e904d80d6

IntelFrameworkModulePkg/BiosThunk: Fix 32 bits arch build failure when disable optimization.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: eric Dong <eric.dong@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18319 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosInt13.c b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosInt13.c
index 63aa1a22c1..698bb620e8 100644
--- a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosInt13.c
+++ b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosInt13.c
@@ -1,7 +1,7 @@
 /** @file
   Routines that use BIOS to support INT 13 devices.
 
-Copyright (c) 1999 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 1999 - 2015, Intel Corporation. All rights reserved.<BR>
 
 This program and the accompanying materials
 are licensed and made available under the terms and conditions
@@ -870,7 +870,7 @@ Edd11BiosReadBlocks (
     // Otherwise when offset adding data size exceeds 0xFFFF, if OpROM does not normalize TransferBuffer,
     // INT13 function 42H will return data boundary error 09H.
     //
-    AddressPacket->SegOffset = (UINT32) ((TransferBuffer >> 4) << 16);
+    AddressPacket->SegOffset = (UINT32) LShiftU64 (RShiftU64(TransferBuffer, 4), 16);
     AddressPacket->Lba  = (UINT64) Lba;
 
     Regs.H.AH           = 0x42;
@@ -1023,7 +1023,7 @@ Edd11BiosWriteBlocks (
     // Otherwise when offset adding data size exceeds 0xFFFF, if OpROM does not normalize TransferBuffer,
     // INT13 function 42H will return data boundary error 09H.
     //
-    AddressPacket->SegOffset = (UINT32) ((TransferBuffer >> 4) << 16);
+    AddressPacket->SegOffset = (UINT32) LShiftU64 (RShiftU64(TransferBuffer, 4), 16);
     AddressPacket->Lba  = (UINT64) Lba;
 
     Regs.H.AH           = 0x43;