MdeModulePkg/NvmExpressDxe: Fix MS toolchain /Od 32bit build failure

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / NvmExpressDxe / NvmExpressBlockIo.c

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
index 6cb2f92e8dded76b4f42f0687e4094f09b7b56c8..2af2df7549b9a98d98dfce774943c6266e393cdc 100644 (file)
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
@@ -2,7 +2,7 @@
   NvmExpressDxe driver is used to manage non-volatile memory subsystem which follows\r
   NVM Express specification.\r
 \r
-  Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR>\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
@@ -63,7 +63,7 @@ ReadSectors (
   CommandPacket.QueueType      = NVME_IO_QUEUE;\r
 \r
   CommandPacket.NvmeCmd->Cdw10 = (UINT32)Lba;\r
-  CommandPacket.NvmeCmd->Cdw11 = (UINT32)(Lba >> 32);\r
+  CommandPacket.NvmeCmd->Cdw11 = (UINT32)RShiftU64(Lba, 32);\r
   CommandPacket.NvmeCmd->Cdw12 = (Blocks - 1) & 0xFFFF;\r
 \r
   CommandPacket.NvmeCmd->Flags = CDW10_VALID | CDW11_VALID | CDW12_VALID;\r
@@ -126,7 +126,7 @@ WriteSectors (
   CommandPacket.QueueType      = NVME_IO_QUEUE;\r
 \r
   CommandPacket.NvmeCmd->Cdw10 = (UINT32)Lba;\r
-  CommandPacket.NvmeCmd->Cdw11 = (UINT32)(Lba >> 32);\r
+  CommandPacket.NvmeCmd->Cdw11 = (UINT32)RShiftU64(Lba, 32);\r
   CommandPacket.NvmeCmd->Cdw12 = (Blocks - 1) & 0xFFFF;\r
 \r
   CommandPacket.MetadataBuffer = NULL;\r