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

Clarify an error in Map command. 

Revert a change in Map command that affected some consistent map names being printed correctly.
Fix a library instance mapping in DSC.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11675 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jcarsey 2011-05-17 20:32:47 +00:00
parent deff65a4fd
commit 77dd0c814e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
View File

@ -347,7 +347,7 @@ MappingListHasType(
if ( Consist if ( Consist
&& (SearchList(MapList, L"HD*", NULL, TRUE, TRUE, L";") && (SearchList(MapList, L"HD*", NULL, TRUE, TRUE, L";")
||SearchList(MapList, L"CD*", NULL, TRUE, TRUE, L";") ||SearchList(MapList, L"CD*", NULL, TRUE, TRUE, L";")
||SearchList(MapList, L"AnyF*", NULL, TRUE, TRUE, L";") ||SearchList(MapList, L"F*", NULL, TRUE, TRUE, L";")
||SearchList(MapList, L"FP*", NULL, TRUE, TRUE, L";"))){ ||SearchList(MapList, L"FP*", NULL, TRUE, TRUE, L";"))){
return (TRUE); return (TRUE);
} }
@ -686,7 +686,11 @@ PerformMappingDisplay(
FreePool(HandleBuffer); FreePool(HandleBuffer);
} }
if (!Found) { if (!Found) {
ShellPrintHiiEx(gST->ConOut->Mode->CursorColumn, gST->ConOut->Mode->CursorRow-1, NULL, STRING_TOKEN (STR_MAP_NF), gShellLevel2HiiHandle, Specific); if (Specific != NULL) {
ShellPrintHiiEx(gST->ConOut->Mode->CursorColumn, gST->ConOut->Mode->CursorRow-1, NULL, STRING_TOKEN (STR_MAP_NF), gShellLevel2HiiHandle, Specific);
} else {
ShellPrintHiiEx(gST->ConOut->Mode->CursorColumn, gST->ConOut->Mode->CursorRow-1, NULL, STRING_TOKEN (STR_CD_NF), gShellLevel2HiiHandle);
}
} }
return (SHELL_SUCCESS); return (SHELL_SUCCESS);
} }

2
ShellPkg/ShellPkg.dsc
View File

@ -44,7 +44,7 @@
ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
SortLib|ShellPkg/Library/BaseSortLib/BaseSortLib.inf SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf
HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf