ShellPkg: Fix ARM build errors.

submitted-by: Olivier Martin olivier.martin@arm.com>
reviewed-by: Jaben Carsey <Jaben.Carsey@intel.com>

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

diff --git a/ShellPkg/Application/Shell/ConsoleLogger.c b/ShellPkg/Application/Shell/ConsoleLogger.c
index 9fd971a655fab89c05e81191f44b9672ed19fd2f..0a2b1fa5e56fbf88db658e92d0bae88e33203831 100644 (file)
--- a/ShellPkg/Application/Shell/ConsoleLogger.c
+++ b/ShellPkg/Application/Shell/ConsoleLogger.c
@@ -13,8 +13,6 @@
 \r
 #include "Shell.h"\r
 \r
-STATIC CONST CHAR16                     mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };\r
-\r
 /**\r
   Install our intermediate ConOut into the system table to\r
   keep a log of all the info that is displayed to the user.\r

diff --git a/ShellPkg/Include/Guid/ShellAliasGuid.h b/ShellPkg/Include/Guid/ShellAliasGuid.h
index 200e3586889917c5ca4a2c74069d81078fe305c9..346eef4209cb19abe5d05432bb8ecb9031f82c46 100644 (file)
--- a/ShellPkg/Include/Guid/ShellAliasGuid.h
+++ b/ShellPkg/Include/Guid/ShellAliasGuid.h
@@ -22,4 +22,4 @@
 \r
 extern EFI_GUID gShellAliasGuid;\r
 \r
-#endif
\ No newline at end of file
+#endif\r

diff --git a/ShellPkg/Include/Guid/ShellVariableGuid.h b/ShellPkg/Include/Guid/ShellVariableGuid.h
index b93c94774b5d35580ae9c2b1c1f3dec9b7dbbfd5..46c9211deff2ee19780245a1c87a8088b8eafc40 100644 (file)
--- a/ShellPkg/Include/Guid/ShellVariableGuid.h
+++ b/ShellPkg/Include/Guid/ShellVariableGuid.h
@@ -22,4 +22,4 @@
 \r
 extern EFI_GUID gShellVariableGuid;\r
 \r
-#endif
\ No newline at end of file
+#endif\r

diff --git a/ShellPkg/Include/ShellBase.h b/ShellPkg/Include/ShellBase.h
index 576cd7b1a48551bfc19467419ffcf218c801e5d8..09f87b4cc0942e1ea200980639e8269df4d54e2a 100644 (file)
--- a/ShellPkg/Include/ShellBase.h
+++ b/ShellPkg/Include/ShellBase.h
@@ -154,4 +154,4 @@ SHELL_SECURITY_VIOLATION    = 26,
 SHELL_NOT_EQUAL             = 27\r
 }SHELL_STATUS;\r
 \r
-#endif //__SHELL_BASE__
\ No newline at end of file
+#endif //__SHELL_BASE_\r

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
index 37ac6e42890c78c5b1ffaa4fd4942d4e7afcfb37..45ee9bd5d00164ff7f7cfbcf19a0b1fed062ce65 100644 (file)
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
@@ -349,8 +349,8 @@ TxtOutProtocolDumpInformation(
       Temp == NULL?L"":Temp,\r
       Index == Dev->Mode->Mode ? L'*' : L' ',\r
       Index,\r
-      !EFI_ERROR(Status)?Col:-1,\r
-      !EFI_ERROR(Status)?Row:-1\r
+      !EFI_ERROR(Status)?(INTN)Col:-1,\r
+      !EFI_ERROR(Status)?(INTN)Row:-1\r
      );\r
   }\r
   FreePool(Temp);\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
index ff1d000aeb62384de31a13d4c41f513503fa250a..179559833eec5d17bc52ee0926f3409cc7e51854 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
@@ -300,6 +300,7 @@ FileBufferRestoreMousePosition (
       // backup the old screen attributes\r
       //\r
       Orig                  = MainEditor.ColorAttributes;\r
+      New.Data              = 0;\r
       New.Colors.Foreground = Orig.Colors.Background;\r
       New.Colors.Background = Orig.Colors.Foreground;\r
 \r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c
index 649ed579558e1d7a72bd38c840a02be70a3fedc4..58d3477f5fdac052c4c8467e14154cb76ae348f2 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c
@@ -149,6 +149,7 @@ InputBarRefresh (
   CursorCol             = gST->ConOut->Mode->CursorColumn;\r
   CursorRow             = gST->ConOut->Mode->CursorRow;\r
   Orig.Data             = gST->ConOut->Mode->Attribute;\r
+  New.Data              = 0;\r
   New.Colors.Foreground = Orig.Colors.Background;\r
   New.Colors.Background = Orig.Colors.Foreground;\r
 \r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditStatusBar.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditStatusBar.c
index 6722b7ae8168dc00145ce3d2f0feff8ace368bab..cf885c25491568bfafc802b63ca2ead3776c8023 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditStatusBar.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditStatusBar.c
@@ -111,6 +111,7 @@ StatusBarRefresh (
   // back up the screen attributes\r
   //\r
   Orig.Data             = gST->ConOut->Mode->Attribute;\r
+  New.Data              = 0;\r
   New.Colors.Foreground = Orig.Colors.Background;\r
   New.Colors.Background = Orig.Colors.Foreground;\r
 \r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c
index c29ecc00fd4b12ab96ce1bb0153638c18fd0cbb6..ad504561bb95a3e0b909be310184c1a85e12a81f 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c
@@ -107,6 +107,7 @@ MainTitleBarRefresh (
   // backup the old screen attributes\r
   //\r
   Orig.Data             = gST->ConOut->Mode->Attribute;\r
+  New.Data              = 0;\r
   New.Colors.Foreground = Orig.Colors.Background;\r
   New.Colors.Background = Orig.Colors.Foreground;\r
 \r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
index bfedf58d78a2dabe202138f960980c57b3a9cfd0..ba15a49ce101d338f1d3f66ae27619531b5145e2 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
@@ -580,6 +580,7 @@ HBufferImageRestoreMousePosition (
       // backup the old screen attributes\r
       //\r
       Orig                  = HMainEditor.ColorAttributes;\r
+      New.Data              = 0;\r
       New.Colors.Foreground = Orig.Colors.Background;\r
       New.Colors.Background = Orig.Colors.Foreground;\r
 \r
@@ -755,6 +756,7 @@ HBufferImageRefresh (
   UINTN                   Tmp;\r
 \r
   Orig                  = HMainEditor.ColorAttributes;\r
+  New.Data              = 0;\r
   New.Colors.Foreground = Orig.Colors.Background;\r
   New.Colors.Background = Orig.Colors.Foreground;\r
 \r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEditorTypes.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEditorTypes.h
index 22f5c055666b0cd426a3b85b86e5ec5a1c79db2c..ddd6070c94846e85a51f034310c5258ae35b1403 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEditorTypes.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEditorTypes.h
@@ -60,7 +60,7 @@ typedef struct {
 \r
 typedef union {\r
   HEFI_EDITOR_COLOR_ATTRIBUTES  Colors;\r
-  UINT8                         Data;\r
+  UINTN                         Data;\r
 } HEFI_EDITOR_COLOR_UNION;\r
 \r
 typedef struct {\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
index a40388ff4097d4cb44fbd62ab687b0a29e018d02..4c346cc24ebbc5ee3ed1164f66c2cb2c3fef0879 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
@@ -290,7 +290,6 @@ HMainCommandSaveBuffer (
         // the file won't be saved\r
         //\r
         return EFI_SUCCESS;\r
-        break;\r
 \r
       case L'c':\r
       case L'C':\r

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
index a2b520e1d18823a78507ce0e5471abff81e122bf..b82bdf8f36c99e74701f55c43fef3d8f8a344847 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
@@ -514,7 +514,6 @@ ShellCmdDriverConfigurationProcessActionRequired (
 \r
   default:\r
     return (EFI_INVALID_PARAMETER);\r
-    break;\r
   }\r
 \r
   return EFI_SUCCESS;\r

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
index 54ed23b59b87614e9e39d5cd489193743d9ff7f0..f5bc12638bac3ac52007adab60e078e4a653a0d7 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
@@ -166,7 +166,6 @@ TestOperation (
       }\r
     }\r
     return (FALSE);\r
-    break;\r
   case OperatorUnsignedLessThan:\r
   case OperatorLessThan:\r
     if (ForceStringCompare || !ShellIsHexOrDecimalNumber(Compare1, FALSE, FALSE) || !ShellIsHexOrDecimalNumber(Compare2, FALSE, FALSE)) {\r
@@ -202,7 +201,6 @@ TestOperation (
 \r
     }\r
     return (FALSE);\r
-    break;\r
   case OperatorEqual:\r
     if (ForceStringCompare || !ShellIsHexOrDecimalNumber(Compare1, FALSE, FALSE) || !ShellIsHexOrDecimalNumber(Compare2, FALSE, FALSE)) {\r
       //\r
@@ -230,7 +228,6 @@ TestOperation (
       }\r
     }\r
     return (FALSE);\r
-    break;\r
   case OperatorNotEqual:\r
     if (ForceStringCompare || !ShellIsHexOrDecimalNumber(Compare1, FALSE, FALSE) || !ShellIsHexOrDecimalNumber(Compare2, FALSE, FALSE)) {\r
       //\r
@@ -258,7 +255,6 @@ TestOperation (
       }\r
     }\r
     return (FALSE);\r
-    break;\r
   case OperatorUnsignedGreaterOrEqual:\r
   case OperatorGreatorOrEqual:\r
     if (ForceStringCompare || !ShellIsHexOrDecimalNumber(Compare1, FALSE, FALSE) || !ShellIsHexOrDecimalNumber(Compare2, FALSE, FALSE)) {\r
@@ -293,7 +289,6 @@ TestOperation (
       }\r
     }\r
     return (FALSE);\r
-    break;\r
   case OperatorLessOrEqual:\r
   case OperatorUnsignedLessOrEqual:\r
     if (ForceStringCompare || !ShellIsHexOrDecimalNumber(Compare1, FALSE, FALSE) || !ShellIsHexOrDecimalNumber(Compare2, FALSE, FALSE)) {\r
@@ -328,7 +323,6 @@ TestOperation (
       }\r
     }\r
     return (FALSE);\r
-    break;\r
   default:\r
     ASSERT(FALSE);\r
     return (FALSE);\r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
index 6fbb3e59a9738050efc957b3c9275ee118867414..b8535139dbd4b03d8da5b49c89ee0128732c226c 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
@@ -667,7 +667,7 @@ CheckAndSetTimeZone (
   if (*Walker == L'-') {\r
     TheTime.TimeZone = (INT16)((ShellStrToUintn (++Walker)) * 60);\r
   } else {\r
-    TheTime.TimeZone = (INT16)((ShellStrToUintn (Walker)) * -60);\r
+    TheTime.TimeZone = (INT16)((INT16)(ShellStrToUintn (Walker)) * -60);\r
   }\r
   if (Walker2 != NULL) {\r
     Walker = Walker2 + 1;\r