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

ShellPkg/dh: display all the protocol names in a single line 

Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Huajing Li <huajing.li@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
This commit is contained in:
Huajing Li 2017-09-21 11:14:17 +08:00 committed by Ruiyu Ni
parent 5b7c224505
commit 590351cf1e
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
View File

@ -319,7 +319,7 @@ GetProtocolInfoString(
if (!Verbose) { if (!Verbose) {
StrnCatGrow(&RetVal, &Size, L"(", 0); StrnCatGrow(&RetVal, &Size, L"(", 0);
StrnCatGrow(&RetVal, &Size, Temp, 0); StrnCatGrow(&RetVal, &Size, Temp, 0);
StrnCatGrow(&RetVal, &Size, L")\r\n", 0); StrnCatGrow(&RetVal, &Size, L")", 0);
} else { } else {
StrnCatGrow(&RetVal, &Size, Separator, 0); StrnCatGrow(&RetVal, &Size, Separator, 0);
StrnCatGrow(&RetVal, &Size, Temp, 0); StrnCatGrow(&RetVal, &Size, Temp, 0);
@ -802,17 +802,29 @@ DoDhByHandle(
ProtocolInfoString==NULL?L"":ProtocolInfoString ProtocolInfoString==NULL?L"":ProtocolInfoString
); );
} else { } else {
ProtocolInfoString = GetProtocolInfoString(TheHandle, Language, L"\r\n", Verbose, TRUE); ProtocolInfoString = GetProtocolInfoString(TheHandle, Language, Verbose ? L"\r\n" : L" ", Verbose, TRUE);
ShellPrintHiiEx( if (Verbose) {
-1, ShellPrintHiiEx(
-1, -1,
NULL, -1,
STRING_TOKEN (STR_DH_OUTPUT_SINGLE), NULL,
gShellDriver1HiiHandle, STRING_TOKEN (STR_DH_OUTPUT_SINGLE),
ConvertHandleToHandleIndex(TheHandle), gShellDriver1HiiHandle,
TheHandle, ConvertHandleToHandleIndex(TheHandle),
ProtocolInfoString==NULL?L"":ProtocolInfoString TheHandle,
); ProtocolInfoString==NULL?L"":ProtocolInfoString
);
} else {
ShellPrintHiiEx(
-1,
-1,
NULL,
STRING_TOKEN (STR_DH_OUTPUT_SINGLE_D),
gShellDriver1HiiHandle,
ConvertHandleToHandleIndex(TheHandle),
ProtocolInfoString==NULL?L"":ProtocolInfoString
);
}
} }
if (DriverInfo) { if (DriverInfo) {

1
ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni
View File

@ -106,6 +106,7 @@
#string STR_DH_OUTPUT_ALL_HEADER #language en-US "Handle dump\r\n" #string STR_DH_OUTPUT_ALL_HEADER #language en-US "Handle dump\r\n"
#string STR_DH_OUTPUT_GUID_HEADER #language en-US "Handle dump by protocol '%g'\r\n" #string STR_DH_OUTPUT_GUID_HEADER #language en-US "Handle dump by protocol '%g'\r\n"
#string STR_DH_OUTPUT_NAME_HEADER #language en-US "Handle dump by protocol '%s'\r\n" #string STR_DH_OUTPUT_NAME_HEADER #language en-US "Handle dump by protocol '%s'\r\n"
#string STR_DH_OUTPUT_SINGLE_D #language en-US "%H%02x%N: %s\r\n"
#string STR_DH_OUTPUT_SINGLE #language en-US "%H%02x%N: %x\r\n%s" #string STR_DH_OUTPUT_SINGLE #language en-US "%H%02x%N: %x\r\n%s"
#string STR_DH_OUTPUT_SFO #language en-US "%s, %s, %s, %H%02x%N, %s, %s\r\n" #string STR_DH_OUTPUT_SFO #language en-US "%s, %s, %s, %H%02x%N, %s, %s\r\n"
#string STR_DH_OUTPUT_DRIVER1 #language en-US " Controller Name : %B%s%N\r\n" #string STR_DH_OUTPUT_DRIVER1 #language en-US " Controller Name : %B%s%N\r\n"