tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
jcarsey 2013-06-11 22:07:03 +00:00 committed by jcarsey
parent fa1dad159c
commit 28981267c5
15 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ShellPkg/Application/Shell/ConsoleLogger.c
View File

@ -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.

2
ShellPkg/Include/Guid/ShellAliasGuid.h
View File

@ -22,4 +22,4 @@
extern EFI_GUID gShellAliasGuid;
#endif
#endif

2
ShellPkg/Include/Guid/ShellVariableGuid.h
View File

@ -22,4 +22,4 @@
extern EFI_GUID gShellVariableGuid;
#endif
#endif

2
ShellPkg/Include/ShellBase.h
View File

@ -154,4 +154,4 @@ SHELL_SECURITY_VIOLATION = 26,
SHELL_NOT_EQUAL = 27
}SHELL_STATUS;
#endif //__SHELL_BASE__
#endif //__SHELL_BASE_

4
ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
View File

@ -349,8 +349,8 @@ TxtOutProtocolDumpInformation(
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);

1
ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
View File

@ -300,6 +300,7 @@ FileBufferRestoreMousePosition (
// backup the old screen attributes
//
Orig = MainEditor.ColorAttributes;
New.Data = 0;
New.Colors.Foreground = Orig.Colors.Background;
New.Colors.Background = Orig.Colors.Foreground;

1
ShellPkg/Library/UefiShellDebug1CommandsLib/EditInputBar.c
View File

@ -149,6 +149,7 @@ InputBarRefresh (
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;

1
ShellPkg/Library/UefiShellDebug1CommandsLib/EditStatusBar.c
View File

@ -111,6 +111,7 @@ StatusBarRefresh (
// 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;

1
ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c
View File

@ -107,6 +107,7 @@ MainTitleBarRefresh (
// 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;

2
ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/BufferImage.c
View File

@ -580,6 +580,7 @@ HBufferImageRestoreMousePosition (
// 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 @@ HBufferImageRefresh (
UINTN Tmp;
Orig = HMainEditor.ColorAttributes;
New.Data = 0;
New.Colors.Foreground = Orig.Colors.Background;
New.Colors.Background = Orig.Colors.Foreground;

2
ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEditorTypes.h
View File

@ -60,7 +60,7 @@ typedef struct {
typedef union {
HEFI_EDITOR_COLOR_ATTRIBUTES Colors;
UINT8 Data;
UINTN Data;
} HEFI_EDITOR_COLOR_UNION;
typedef struct {

1
ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
View File

@ -290,7 +290,6 @@ HMainCommandSaveBuffer (
// the file won't be saved
//
return EFI_SUCCESS;
break;
case L'c':
case L'C':

1
ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
View File

@ -514,7 +514,6 @@ ShellCmdDriverConfigurationProcessActionRequired (
default:
return (EFI_INVALID_PARAMETER);
break;
}
return EFI_SUCCESS;

6
ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
View File

@ -166,7 +166,6 @@ TestOperation (
}
}
return (FALSE);
break;
case OperatorUnsignedLessThan:
case OperatorLessThan:
if (ForceStringCompare || !ShellIsHexOrDecimalNumber(Compare1, FALSE, FALSE) || !ShellIsHexOrDecimalNumber(Compare2, FALSE, FALSE)) {
@ -202,7 +201,6 @@ TestOperation (
}
return (FALSE);
break;
case OperatorEqual:
if (ForceStringCompare || !ShellIsHexOrDecimalNumber(Compare1, FALSE, FALSE) || !ShellIsHexOrDecimalNumber(Compare2, FALSE, FALSE)) {
//
@ -230,7 +228,6 @@ TestOperation (
}
}
return (FALSE);
break;
case OperatorNotEqual:
if (ForceStringCompare || !ShellIsHexOrDecimalNumber(Compare1, FALSE, FALSE) || !ShellIsHexOrDecimalNumber(Compare2, FALSE, FALSE)) {
//
@ -258,7 +255,6 @@ TestOperation (
}
}
return (FALSE);
break;
case OperatorUnsignedGreaterOrEqual:
case OperatorGreatorOrEqual:
if (ForceStringCompare || !ShellIsHexOrDecimalNumber(Compare1, FALSE, FALSE) || !ShellIsHexOrDecimalNumber(Compare2, FALSE, FALSE)) {
@ -293,7 +289,6 @@ TestOperation (
}
}
return (FALSE);
break;
case OperatorLessOrEqual:
case OperatorUnsignedLessOrEqual:
if (ForceStringCompare || !ShellIsHexOrDecimalNumber(Compare1, FALSE, FALSE) || !ShellIsHexOrDecimalNumber(Compare2, FALSE, FALSE)) {
@ -328,7 +323,6 @@ TestOperation (
}
}
return (FALSE);
break;
default:
ASSERT(FALSE);
return (FALSE);

2
ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
View File

@ -667,7 +667,7 @@ CheckAndSetTimeZone (
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;