Revision: 14400
http://sourceforge.net/p/edk2/code/14400
Author: jcarsey
Date: 2013-06-11 22:07:03 +0000 (Tue, 11 Jun 2013)
Log Message:
-----------
ShellPkg: Fix ARM build errors.
submitted-by: Olivier Martin [email protected]>
reviewed-by: Jaben Carsey <[email protected]>
Modified Paths:
--------------
trunk/edk2/ShellPkg/Application/Shell/ConsoleLogger.c
trunk/edk2/ShellPkg/Include/Guid/ShellAliasGuid.h
trunk/edk2/ShellPkg/Include/Guid/ShellVariableGuid.h
trunk/edk2/ShellPkg/Include/ShellBase.h
trunk/edk2/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c
trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/EditStatusBar.c
trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c
trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEditorTypes.h
trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
trunk/edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
trunk/edk2/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
Modified: trunk/edk2/ShellPkg/Application/Shell/ConsoleLogger.c
===================================================================
--- trunk/edk2/ShellPkg/Application/Shell/ConsoleLogger.c 2013-06-08
05:26:39 UTC (rev 14399)
+++ trunk/edk2/ShellPkg/Application/Shell/ConsoleLogger.c 2013-06-11
22:07:03 UTC (rev 14400)
@@ -13,8 +13,6 @@
#include "Shell.h"
-STATIC CONST CHAR16 mCrLfString[3] = {
CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };
-
/**
Install our intermediate ConOut into the system table to
keep a log of all the info that is displayed to the user.
Modified: trunk/edk2/ShellPkg/Include/Guid/ShellAliasGuid.h
===================================================================
--- trunk/edk2/ShellPkg/Include/Guid/ShellAliasGuid.h 2013-06-08 05:26:39 UTC
(rev 14399)
+++ trunk/edk2/ShellPkg/Include/Guid/ShellAliasGuid.h 2013-06-11 22:07:03 UTC
(rev 14400)
@@ -22,4 +22,4 @@
extern EFI_GUID gShellAliasGuid;
-#endif
\ No newline at end of file
+#endif
Modified: trunk/edk2/ShellPkg/Include/Guid/ShellVariableGuid.h
===================================================================
--- trunk/edk2/ShellPkg/Include/Guid/ShellVariableGuid.h 2013-06-08
05:26:39 UTC (rev 14399)
+++ trunk/edk2/ShellPkg/Include/Guid/ShellVariableGuid.h 2013-06-11
22:07:03 UTC (rev 14400)
@@ -22,4 +22,4 @@
extern EFI_GUID gShellVariableGuid;
-#endif
\ No newline at end of file
+#endif
Modified: trunk/edk2/ShellPkg/Include/ShellBase.h
===================================================================
--- trunk/edk2/ShellPkg/Include/ShellBase.h 2013-06-08 05:26:39 UTC (rev
14399)
+++ trunk/edk2/ShellPkg/Include/ShellBase.h 2013-06-11 22:07:03 UTC (rev
14400)
@@ -154,4 +154,4 @@
SHELL_NOT_EQUAL = 27
}SHELL_STATUS;
-#endif //__SHELL_BASE__
\ No newline at end of file
+#endif //__SHELL_BASE_
Modified:
trunk/edk2/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
===================================================================
--- trunk/edk2/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
2013-06-08 05:26:39 UTC (rev 14399)
+++ trunk/edk2/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
2013-06-11 22:07:03 UTC (rev 14400)
@@ -349,8 +349,8 @@
Temp == NULL?L"":Temp,
Index == Dev->Mode->Mode ? L'*' : L' ',
Index,
- !EFI_ERROR(Status)?Col:-1,
- !EFI_ERROR(Status)?Row:-1
+ !EFI_ERROR(Status)?(INTN)Col:-1,
+ !EFI_ERROR(Status)?(INTN)Row:-1
);
}
FreePool(Temp);
Modified:
trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
===================================================================
--- trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
2013-06-08 05:26:39 UTC (rev 14399)
+++ trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
2013-06-11 22:07:03 UTC (rev 14400)
@@ -300,6 +300,7 @@
// backup the old screen attributes
//
Orig = MainEditor.ColorAttributes;
+ New.Data = 0;
New.Colors.Foreground = Orig.Colors.Background;
New.Colors.Background = Orig.Colors.Foreground;
Modified: trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c
===================================================================
--- trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c
2013-06-08 05:26:39 UTC (rev 14399)
+++ trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c
2013-06-11 22:07:03 UTC (rev 14400)
@@ -149,6 +149,7 @@
CursorCol = gST->ConOut->Mode->CursorColumn;
CursorRow = gST->ConOut->Mode->CursorRow;
Orig.Data = gST->ConOut->Mode->Attribute;
+ New.Data = 0;
New.Colors.Foreground = Orig.Colors.Background;
New.Colors.Background = Orig.Colors.Foreground;
Modified: trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/EditStatusBar.c
===================================================================
--- trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/EditStatusBar.c
2013-06-08 05:26:39 UTC (rev 14399)
+++ trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/EditStatusBar.c
2013-06-11 22:07:03 UTC (rev 14400)
@@ -111,6 +111,7 @@
// back up the screen attributes
//
Orig.Data = gST->ConOut->Mode->Attribute;
+ New.Data = 0;
New.Colors.Foreground = Orig.Colors.Background;
New.Colors.Background = Orig.Colors.Foreground;
Modified: trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c
===================================================================
--- trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c
2013-06-08 05:26:39 UTC (rev 14399)
+++ trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c
2013-06-11 22:07:03 UTC (rev 14400)
@@ -107,6 +107,7 @@
// backup the old screen attributes
//
Orig.Data = gST->ConOut->Mode->Attribute;
+ New.Data = 0;
New.Colors.Foreground = Orig.Colors.Background;
New.Colors.Background = Orig.Colors.Foreground;
Modified:
trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
===================================================================
---
trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
2013-06-08 05:26:39 UTC (rev 14399)
+++
trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
2013-06-11 22:07:03 UTC (rev 14400)
@@ -580,6 +580,7 @@
// backup the old screen attributes
//
Orig = HMainEditor.ColorAttributes;
+ New.Data = 0;
New.Colors.Foreground = Orig.Colors.Background;
New.Colors.Background = Orig.Colors.Foreground;
@@ -755,6 +756,7 @@
UINTN Tmp;
Orig = HMainEditor.ColorAttributes;
+ New.Data = 0;
New.Colors.Foreground = Orig.Colors.Background;
New.Colors.Background = Orig.Colors.Foreground;
Modified:
trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEditorTypes.h
===================================================================
---
trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEditorTypes.h
2013-06-08 05:26:39 UTC (rev 14399)
+++
trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEditorTypes.h
2013-06-11 22:07:03 UTC (rev 14400)
@@ -60,7 +60,7 @@
typedef union {
HEFI_EDITOR_COLOR_ATTRIBUTES Colors;
- UINT8 Data;
+ UINTN Data;
} HEFI_EDITOR_COLOR_UNION;
typedef struct {
Modified:
trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
===================================================================
---
trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
2013-06-08 05:26:39 UTC (rev 14399)
+++
trunk/edk2/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
2013-06-11 22:07:03 UTC (rev 14400)
@@ -290,7 +290,6 @@
// the file won't be saved
//
return EFI_SUCCESS;
- break;
case L'c':
case L'C':
Modified: trunk/edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
===================================================================
--- trunk/edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
2013-06-08 05:26:39 UTC (rev 14399)
+++ trunk/edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
2013-06-11 22:07:03 UTC (rev 14400)
@@ -514,7 +514,6 @@
default:
return (EFI_INVALID_PARAMETER);
- break;
}
return EFI_SUCCESS;
Modified: trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
===================================================================
--- trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c 2013-06-08
05:26:39 UTC (rev 14399)
+++ trunk/edk2/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c 2013-06-11
22:07:03 UTC (rev 14400)
@@ -166,7 +166,6 @@
}
}
return (FALSE);
- break;
case OperatorUnsignedLessThan:
case OperatorLessThan:
if (ForceStringCompare || !ShellIsHexOrDecimalNumber(Compare1, FALSE,
FALSE) || !ShellIsHexOrDecimalNumber(Compare2, FALSE, FALSE)) {
@@ -202,7 +201,6 @@
}
return (FALSE);
- break;
case OperatorEqual:
if (ForceStringCompare || !ShellIsHexOrDecimalNumber(Compare1, FALSE,
FALSE) || !ShellIsHexOrDecimalNumber(Compare2, FALSE, FALSE)) {
//
@@ -230,7 +228,6 @@
}
}
return (FALSE);
- break;
case OperatorNotEqual:
if (ForceStringCompare || !ShellIsHexOrDecimalNumber(Compare1, FALSE,
FALSE) || !ShellIsHexOrDecimalNumber(Compare2, FALSE, FALSE)) {
//
@@ -258,7 +255,6 @@
}
}
return (FALSE);
- break;
case OperatorUnsignedGreaterOrEqual:
case OperatorGreatorOrEqual:
if (ForceStringCompare || !ShellIsHexOrDecimalNumber(Compare1, FALSE,
FALSE) || !ShellIsHexOrDecimalNumber(Compare2, FALSE, FALSE)) {
@@ -293,7 +289,6 @@
}
}
return (FALSE);
- break;
case OperatorLessOrEqual:
case OperatorUnsignedLessOrEqual:
if (ForceStringCompare || !ShellIsHexOrDecimalNumber(Compare1, FALSE,
FALSE) || !ShellIsHexOrDecimalNumber(Compare2, FALSE, FALSE)) {
@@ -328,7 +323,6 @@
}
}
return (FALSE);
- break;
default:
ASSERT(FALSE);
return (FALSE);
Modified: trunk/edk2/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
===================================================================
--- trunk/edk2/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
2013-06-08 05:26:39 UTC (rev 14399)
+++ trunk/edk2/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
2013-06-11 22:07:03 UTC (rev 14400)
@@ -667,7 +667,7 @@
if (*Walker == L'-') {
TheTime.TimeZone = (INT16)((ShellStrToUintn (++Walker)) * 60);
} else {
- TheTime.TimeZone = (INT16)((ShellStrToUintn (Walker)) * -60);
+ TheTime.TimeZone = (INT16)((INT16)(ShellStrToUintn (Walker)) * -60);
}
if (Walker2 != NULL) {
Walker = Walker2 + 1;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
