X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ShellPkg%2FLibrary%2FUefiShellDebug1CommandsLib%2FUefiShellDebug1CommandsLib.uni;h=f733a67f0b78360c8e1fbbf77212fd268119e9c9;hb=1557f05b37f89d1f3cd41a5543a22533fc68ede6;hp=c6c7ba9e2f690de5519fddb2d1260e55d0338ec3;hpb=231ad7d8660d674d95fc4e03361338ac573c1f9f;p=mirror_edk2.git
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
index c6c7ba9e2f..f733a67f0b 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
@@ -1,6 +1,6 @@
// /**
//
-// Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+// Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.
// (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.
// (C) Copyright 2016 Hewlett Packard Enterprise Development LP
// This program and the accompanying materials
@@ -32,6 +32,7 @@
#string STR_GEN_PROBLEM #language en-US "%H%s%N: Unknown flag - '%H%s%N'\r\n"
#string STR_GEN_PROBLEM_VAL #language en-US "%H%s%N: Bad value - '%H%s%N' for flag - '%H%s%N'\r\n"
+#string STR_GEN_DUPLICATE #language en-US "%H%s%N: Duplicate flag - '%H%s%N'\r\n"
#string STR_GEN_NO_VALUE #language en-US "%H%s%N: Missing argument for flag - '%H%s%N'\r\n"
#string STR_GEN_TOO_FEW #language en-US "%H%s%N: Too few arguments.\r\n"
#string STR_GEN_TOO_MANY #language en-US "%H%s%N: Too many arguments.\r\n"
@@ -39,7 +40,7 @@
#string STR_GEN_PCIRBIO_NF #language en-US "%H%s%N: Protocol - PciRootBridgeIo not found.\r\n"
#string STR_GEN_PCIRBIO_ER #language en-US "%H%s%N: Problem accessing the data using Protocol - PciRootBridgeIo\r\n"
#string STR_GEN_PARAM_INV #language en-US "%H%s%N: Invalid argument - '%H%s%N'\r\n"
-#string STR_GEN_PARAM_INV_HEX #language en-US "%H%s%N: Invalid parameter - '%H%s%N:'. Must be hexadecimal.\r\n"
+#string STR_GEN_PARAM_INV_HEX #language en-US "%H%s%N: Invalid parameter - '%H%s%N'. Must be hexadecimal.\r\n"
#string STR_GEN_PARAM_CONFLICT #language en-US "%H%s%N: Flags conflict with - '%H%s%N' and '%H%s%N'\r\n"
#string STR_GEN_OUT_MEM #language en-US "%H%s%N: Memory allocation was not successful.\r\n"
#string STR_GEN_MAP_PROTOCOL #language en-US "%H%s%N: Mapped device '%B%s%N' does not have protocol %B%s%N\r\n"
@@ -65,31 +66,8 @@
#string STR_DBLK_HEADER #language en-US "LBA %016LX Size %08x bytes BlkIo %0x\r\n"
#string STR_COMP_HEADER #language en-US "Compare %s to %s.\r\n"
-#string STR_COMP_SIZE_FAIL #language en-US "Difference # 1: File size mismatch.\r\n"
-#string STR_COMP_SPOT_FAIL1 #language en-US ""
- "Difference #% 2d:\r\n"
- "File1: %s\r\n"
- " %08x: %02x *%c*\r\n"
- "File2: %s\r\n"
- " %08x: %02x *%c*\r\n"
-#string STR_COMP_SPOT_FAIL2 #language en-US ""
- "Difference #% 2d:\r\n"
- "File1: %s\r\n"
- " %08x: %02x %02x *%c%c*\r\n"
- "File2: %s\r\n"
- " %08x: %02x %02x *%c%c*\r\n"
-#string STR_COMP_SPOT_FAIL3 #language en-US ""
- "Difference #% 2d:\r\n"
- "File1: %s\r\n"
- " %08x: %02x %02x %02x *%c%c%c*\r\n"
- "File2: %s\r\n"
- " %08x: %02x %02x %02x *%c%c%c*\r\n"
-#string STR_COMP_SPOT_FAIL4 #language en-US ""
- "Difference #% 2d:\r\n"
- "File1: %s\r\n"
- " %08x: %02x %02x %02x %02x *%c%c%c%c*\r\n"
- "File2: %s\r\n"
- " %08x: %02x %02x %02x %02x *%c%c%c%c*\r\n"
+#string STR_COMP_DIFFERENCE_POINT #language en-US "Difference #% 2u:\r\n"
+#string STR_COMP_END_OF_FILE #language en-US " "
#string STR_COMP_FOOTER_FAIL #language en-US "[difference(s) encountered] \r\n"
#string STR_COMP_FOOTER_PASS #language en-US "[no differences encountered]\r\n"
@@ -102,6 +80,7 @@
#string STR_MEMMAP_GET_FAILED #language en-US "%H%s%N: Unable to get memory map\r\n"
#string STR_MEMMAP_LIST_HEAD #language en-US "Type Start End # Pages Attributes\r\n"
#string STR_MEMMAP_LIST_ITEM #language en-US "% -10s %016LX-%016LX %016LX %016LX\r\n"
+#string STR_MEMMAP_LIST_ITEM_OTHER #language en-US "%08x %016LX-%016LX %016LX %016LX\r\n"
#string STR_MEMMAP_LIST_SUMM #language en-US " \r\n"
" Reserved : %,14ld Pages (%,ld Bytes)\r\n"
" LoaderCode: %,14ld Pages (%,ld Bytes)\r\n"
@@ -116,10 +95,12 @@
" MMIO_Port : %,14ld Pages (%,ld Bytes)\r\n"
" PalCode : %,14ld Pages (%,ld Bytes)\r\n"
" Available : %,14ld Pages (%,ld Bytes)\r\n"
- " -------------- \r\n"
+ " Persistent: %,14ld Pages (%,ld Bytes)\r\n"
+#string STR_MEMMAP_LIST_SUMM_OTHER #language en-US " %08x : %,14ld Pages (%,ld Bytes)\r\n"
+#string STR_MEMMAP_LIST_SUMM2 #language en-US " -------------- \r\n"
"Total Memory: %,14ld MB (%,ld Bytes)\r\n"
#string STR_MEMMAP_LIST_ITEM_SFO #language en-US "MemoryMap,"%s","%LX","%LX","%LX","%LX"\r\n"
-#string STR_MEMMAP_LIST_SUMM_SFO #language en-US "MemoryMapSummary,"%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld"\r\n"
+#string STR_MEMMAP_LIST_SUMM_SFO #language en-US "MemoryMapSummary,"%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld"\r\n"
#string STR_EFI_COMPRESS_FAIL #language en-US "Unable to compress: %r.\r\n"
#string STR_EFI_DECOMPRESS_FAIL #language en-US "Unable to decompress: %r.\r\n"
@@ -406,9 +387,14 @@
#string STR_DMPSTORE_HEADER_LINE #language en-US "Variable %H%s%N '%H%g%N:%H%s%N' DataSize = 0x%02x\r\n"
#string STR_DMPSTORE_DELETE_LINE #language en-US "Delete variable '%H%g%N:%H%s%N': %r\r\n"
#string STR_DMPSTORE_NO_VAR_FOUND #language en-US "%H%s%N: No matching variables found.\r\n"
+#string STR_DMPSTORE_NO_VAR_FOUND_SFO #language en-US "VariableInfo,\"\",\"\",\"\",\"\",\"\"\r\n"
#string STR_DMPSTORE_NO_VAR_FOUND_GN #language en-US "%H%s%N: No matching variables found. Guid %g, Name %s\r\n"
+#string STR_DMPSTORE_NO_VAR_FOUND_NG_SFO #language en-US "VariableInfo,\"%s\",\"%g\",\"\",\"\",\"\"\r\n"
#string STR_DMPSTORE_NO_VAR_FOUND_N #language en-US "%H%s%N: No matching variables found. Name %s\r\n"
+#string STR_DMPSTORE_NO_VAR_FOUND_N_SFO #language en-US #language en-US "VariableInfo,\"%s\",\"\",\"\",\"\",\"\"\r\n"
#string STR_DMPSTORE_NO_VAR_FOUND_G #language en-US "%H%s%N: No matching variables found. Guid %g\r\n"
+#string STR_DMPSTORE_NO_VAR_FOUND_G_SFO #language en-US "VariableInfo,\"\",\"%g\",\"\",\"\",\"\"\r\n"
+#string STR_DMPSTORE_VAR_SFO #language en-US "VariableInfo,\"%s\",\"%g\",\"0x%x\",\"0x%x\",\"%s\"\r\n"
#string STR_GET_HELP_COMP #language en-US ""
".TH comp 0 "Compare 2 files"\r\n"
@@ -631,21 +617,21 @@
"MM Address [Value] [-w 1|2|4|8] [-MEM | -MMIO | -IO | -PCI | -PCIE] [-n]\r\n"
".SH OPTIONS\r\n"
" \r\n"
-" Address - Specifies a starting address.\r\n"
-" Value - Specifies the value to write.\r\n"
+" Address - Starting address in hexadecimal format.\r\n"
+" Value - The value to write in hexadecimal format.\r\n"
" -MEM - Memory Address type\r\n"
" -MMIO - Memory Mapped IO Address type\r\n"
" -IO - IO Address type\r\n"
" -PCI - PCI Configuration Space Address type:\r\n"
-" Address format: 0x000000ssbbddffrr\r\n"
-" ss - Segment\r\n"
+" Address format: ssssbbddffrr\r\n"
+" ssss - Segment\r\n"
" bb - Bus\r\n"
" dd - Device\r\n"
" ff - Function\r\n"
" rr - Register\r\n"
" -PCIE - PCIE Configuration Space Address type:\r\n"
-" Address format: 0x00000ssbbddffrrr\r\n"
-" ss - Segment\r\n"
+" Address format: ssssbbddffrrr\r\n"
+" ssss - Segment\r\n"
" bb - Bus\r\n"
" dd - Device\r\n"
" ff - Function\r\n"
@@ -670,7 +656,7 @@
" follow the PCI Configuration Space Address format above. The 'PCI'\r\n"
" command can be used to determine the address for a specified device.\r\n"
" It is listed in the PCI configuration space dump information in the\r\n"
-" following format: "[EFI 0x000000ssbbddffxx]".\r\n"
+" following format: "[EFI ssbbddffxx]".\r\n"
" 5. If the PCIE address type is specified, the 'Address' parameter must\r\n"
" follow the PCIE Configuration Space Address format above.\r\n"
" 6. In interactive mode, type a hex value to modify, 'q' or '.' to exit.\r\n"
@@ -726,8 +712,8 @@
" IO 0x0000000000000086 : 0xFF >\r\n"
" IO 0x0000000000000087 : 0x00 > q\r\n"
" \r\n"
-" * To display PCI configuration space, ss=00, bb=00, dd=00, ff=00, rr=00:\r\n"
-" Shell> mm 0000000000 -PCI\r\n"
+" * To display PCI configuration space, ss=0000, bb=00, dd=00, ff=00, rr=00:\r\n"
+" Shell> mm 000000000000 -PCI\r\n"
" PCI 0x0000000000000000 : 0x86 >\r\n"
" PCI 0x0000000000000001 : 0x80 >\r\n"
" PCI 0x0000000000000002 : 0x30 >\r\n"
@@ -736,8 +722,8 @@
" PCI 0x0000000000000005 : 0x00 > q\r\n"
" These contents can also be displayed by 'PCI 00 00 00'.\r\n"
" \r\n"
-" * To display PCIE configuration space, ss=00, bb=06, dd=00, ff=00, rrr=000:\r\n"
-" Shell> mm 00060000000 -PCIE\r\n"
+" * To display PCIE configuration space, ss=0000, bb=06, dd=00, ff=00, rrr=000:\r\n"
+" Shell> mm 0000060000000 -PCIE\r\n"
" PCIE 0x0000000060000000 : 0xAB >\r\n"
" PCIE 0x0000000060000001 : 0x11 >\r\n"
" PCIE 0x0000000060000002 : 0x61 >\r\n"
@@ -807,9 +793,9 @@
" 3. If = is not specified, then the current variable contents are displayed.\r\n"
" 4. If =data is specified, then the variable's value is changed to the value\r\n"
" specified by data.\r\n"
-" 5. -bs, -rt and -nv are only useful if the variable already exists.\r\n"
-" 6. If the variable already exists and the attributes cannot be changed,\r\n"
-" then -1 is returned. \r\n"
+" 5. -bs, -rt and -nv are only useful if the variable does not exist.\r\n"
+" 6. If the variable already exists, the attributes cannot be changed, and the"
+" flags will be ignored.\r\n"
".SH RETURNVALUES\r\n"
" \r\n"
"RETURN VALUES:\r\n"
@@ -889,17 +875,20 @@
#string STR_GET_HELP_PCI #language en-US ""
".TH pci 0 "Displays PCI device information."\r\n"
".SH NAME\r\n"
-"Displays a PCI device list or PCI function configuration space of a device.\r\n"
+"Displays PCI device list or PCI function configuration space and PCIe extended\r\n"
+"configuration space.\r\n"
".SH SYNOPSIS\r\n"
" \r\n"
-"PCI [Bus Dev [Func] [-s Seg] [-i]]\r\n"
+"PCI [Bus Dev [Func] [-s Seg] [-i [-ec ID]]]\r\n"
".SH OPTIONS\r\n"
" \r\n"
-" -s - Specifies optional segment number.\r\n"
+" -s - Specifies optional segment number (hexadecimal number).\r\n"
" -i - Displays interpreted information.\r\n"
-" Bus - Specifies a bus number.\r\n"
-" Dev - Specifies a device number.\r\n"
-" Func - Specifies a function number.\r\n"
+" -ec - Displays detailed interpretation of specified PCIe extended capability\r\n"
+" ID (hexadecimal number).\r\n"
+" Bus - Specifies a bus number (hexadecimal number).\r\n"
+" Dev - Specifies a device number (hexadecimal number).\r\n"
+" Func - Specifies a function number (hexadecimal number).\r\n"
".SH DESCRIPTION\r\n"
" \r\n"
"NOTES:\r\n"
@@ -993,6 +982,7 @@
" 40 - Additional Information\r\n"
" 41 - Onboard Devices Extended Information\r\n"
" 42 - Management Controller Host Interface\r\n"
+" 43 - TPM Device\r\n"
" 2. Enter the SmbiosHandle parameter in hexadecimal format.\r\n"
" Do not use the '0x' prefix format for hexadecimal values.\r\n"
" 3. Internal commands:\r\n"
@@ -1014,7 +1004,7 @@
"Manages all UEFI variables.\r\n"
".SH SYNOPSIS\r\n"
" \r\n"
-"DMPSTORE [-b] [-d] [-all | ([variable] [-guid guid])]\r\n"
+"DMPSTORE [-b] [-d] [-all | ([variable] [-guid guid])] [-sfo]\r\n"
"DMPSTORE [-all | ([variable] [-guid guid])] [-s file]\r\n"
"DMPSTORE [-all | ([variable] [-guid guid])] [-l file]\r\n"
".SH OPTIONS\r\n"
@@ -1023,6 +1013,7 @@
" -guid - Specifies the GUID of the variables to be displayed in\r\n"
" standard text format. If not specified and -all is not\r\n"
" specified, the EFI_GLOBAL_VARIABLE GUID is assumed.\r\n"
+" -sfo - Displays information as described in Standard-Format Output.\r\n"
" -all - Dumps all variables, including those\r\n"
" with a different GUID than EFI_GLOBAL_VARIABLE.\r\n"
" -d - Delete variables.\r\n"