EmbeddedPkg: Fix build error for MmcDxe

[mirror_edk2.git] / EmbeddedPkg / Universal / MmcDxe / Diagnostics.c

diff --git a/EmbeddedPkg/Universal/MmcDxe/Diagnostics.c b/EmbeddedPkg/Universal/MmcDxe/Diagnostics.c
index 20defeb8745a2eb243f316ba9d4e0d03016e260b..49b069043093544a3cbadc46fda4de483803d638 100644 (file)
--- a/EmbeddedPkg/Universal/MmcDxe/Diagnostics.c
+++ b/EmbeddedPkg/Universal/MmcDxe/Diagnostics.c
@@ -1,7 +1,7 @@
 /** @file\r
   Diagnostics Protocol implementation for the MMC DXE driver\r
 \r
-  Copyright (c) 2011-2014, ARM Limited. All rights reserved.\r
+  Copyright (c) 2011-2020, ARM Limited. All rights reserved.\r
 \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
@@ -56,7 +56,7 @@ GenerateRandomBuffer (
   UINT64* Buffer64 = (UINT64*)Buffer;\r
 \r
   for (i = 0; i < (BufferSize >> 3); i++) {\r
-    *Buffer64 = i | (~i << 32);\r
+    *Buffer64 = i | LShiftU64 (~i, 32);\r
     Buffer64++;\r
   }\r
 }\r
@@ -227,7 +227,11 @@ MmcDriverDiagnosticsRunDiagnostics (
 \r
   // LBA=10 Size=BlockSize\r
   DiagnosticLog (L"MMC Driver Diagnostics - Test: Any Block\n");\r
-  Status = MmcReadWriteDataTest (MmcHostInstance, MmcHostInstance->BlockIo.Media->LastBlock >> 1, MmcHostInstance->BlockIo.Media->BlockSize);\r
+  Status = MmcReadWriteDataTest (\r
+             MmcHostInstance,\r
+             RShiftU64 (MmcHostInstance->BlockIo.Media->LastBlock, 1),\r
+             MmcHostInstance->BlockIo.Media->BlockSize\r
+             );\r
 \r
   // LBA=LastBlock Size=BlockSize\r
   DiagnosticLog (L"MMC Driver Diagnostics - Test: Last Block\n");\r