ShellPkg: Fixed build error 'variable set but not used'

[mirror_edk2.git] / ShellPkg / Library / UefiShellDebug1CommandsLib / Mm.c

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c
index 28b62d05e70aacc4d3927e44184160a9891aa98c..5bb3cff2d1a5aaa111490c331f9c84335622667d 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c
@@ -36,7 +36,7 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
   {NULL, TypeMax}\r
   };\r
 \r
-STATIC CONST UINT64 MaxNum[9]      = { 0xff, 0xffff, 0xffffffff, 0xffffffffffffffff };\r
+STATIC CONST UINT64 MaxNum[9]      = { 0xff, 0xffff, 0xffffffff, 0xffffffffffffffffULL };\r
 \r
 /**\r
   Read some data into a buffer from memory.\r
@@ -217,7 +217,6 @@ ShellCommandRunMm (
   UINT64                          Buffer;\r
   UINTN                           Index;\r
   UINTN                           Size;\r
-  CHAR16                          *AddressStr;\r
 //  CHAR16                          *ValueStr;\r
   BOOLEAN                         Complete;\r
   CHAR16                          *InputStr;\r
@@ -245,7 +244,6 @@ ShellCommandRunMm (
   Width       = EfiPciWidthUint8;\r
   Size        = 1;\r
   AccessType  = EfiMemory;\r
-  AddressStr  = NULL;\r
 //  ValueStr    = NULL;\r
   Interactive = TRUE;\r
   Package     = NULL;\r
@@ -424,7 +422,7 @@ ShellCommandRunMm (
       //\r
       if (AccessType == EfiPciEConfig) {\r
         SegmentNumber = (UINT32) RShiftU64 (Address, 36) & 0xff;\r
-        Address      &= 0xfffffffff;\r
+        Address      &= 0xfffffffffULL;\r
       } else {\r
         if (AccessType == EfiPciConfig) {\r
           SegmentNumber = (UINT32) RShiftU64 (Address, 32) & 0xff;\r
@@ -464,25 +462,25 @@ ShellCommandRunMm (
       GetPciEAddressFromInputAddress (Address, &PciEAddress);\r
     }\r
 \r
-//    //\r
-//    // Set value\r
-//    //\r
-//    if (ValueStr != NULL) {\r
-//      if (AccessType == EFIMemoryMappedIo) {\r
-//        IoDev->Mem.Write (IoDev, Width, Address, 1, &Value);\r
-//      } else if (AccessType == EfiIo) {\r
-//        IoDev->Io.Write (IoDev, Width, Address, 1, &Value);\r
-//      } else if (AccessType == EfiPciConfig) {\r
-//        IoDev->Pci.Write (IoDev, Width, Address, 1, &Value);\r
-//      } else if (AccessType == EfiPciEConfig) {\r
-//        IoDev->Pci.Write (IoDev, Width, PciEAddress, 1, &Buffer);\r
-//      } else {\r
-//        WriteMem (Width, Address, 1, &Value);\r
-//      }\r
-//\r
-//      ASSERT(ShellStatus == SHELL_SUCCESS);\r
-//      goto Done;\r
-//    }\r
+    //\r
+    // Set value\r
+    //\r
+    if (ShellCommandLineGetRawValue(Package, 2) != NULL) {\r
+      if (AccessType == EFIMemoryMappedIo) {\r
+        IoDev->Mem.Write (IoDev, Width, Address, 1, &Value);\r
+      } else if (AccessType == EfiIo) {\r
+        IoDev->Io.Write (IoDev, Width, Address, 1, &Value);\r
+      } else if (AccessType == EfiPciConfig) {\r
+        IoDev->Pci.Write (IoDev, Width, Address, 1, &Value);\r
+      } else if (AccessType == EfiPciEConfig) {\r
+        IoDev->Pci.Write (IoDev, Width, PciEAddress, 1, &Value);\r
+      } else {\r
+        WriteMem (Width, Address, 1, &Value);\r
+      }\r
+\r
+      ASSERT(ShellStatus == SHELL_SUCCESS);\r
+      goto Done;\r
+    }\r
 \r
 \r
     //\r
@@ -509,11 +507,11 @@ ShellCommandRunMm (
 \r
       ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_ADDRESS), gShellDebug1HiiHandle, Address);\r
       if (Size == 1) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF2), gShellDebug1HiiHandle, Buffer);\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF2), gShellDebug1HiiHandle, (UINTN)Buffer);\r
       } else if (Size == 2) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF4), gShellDebug1HiiHandle, Buffer);\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF4), gShellDebug1HiiHandle, (UINTN)Buffer);\r
       } else if (Size == 4) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF8), gShellDebug1HiiHandle, Buffer);\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF8), gShellDebug1HiiHandle, (UINTN)Buffer);\r
       } else if (Size == 8) {\r
         ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF16), gShellDebug1HiiHandle, Buffer);\r
       }\r
@@ -554,11 +552,11 @@ ShellCommandRunMm (
       ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_ADDRESS), gShellDebug1HiiHandle, Address);\r
 \r
       if (Size == 1) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF2), gShellDebug1HiiHandle, Buffer);\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF2), gShellDebug1HiiHandle, (UINTN)Buffer);\r
       } else if (Size == 2) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF4), gShellDebug1HiiHandle, Buffer);\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF4), gShellDebug1HiiHandle, (UINTN)Buffer);\r
       } else if (Size == 4) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF8), gShellDebug1HiiHandle, Buffer);\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF8), gShellDebug1HiiHandle, (UINTN)Buffer);\r
       } else if (Size == 8) {\r
         ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF16), gShellDebug1HiiHandle, Buffer);\r
       }\r