X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ShellPkg%2FLibrary%2FUefiShellDebug1CommandsLib%2FUefiShellDebug1CommandsLib.uni;h=609e1a80772ee33e30e7095db4fb0707f197b488;hb=44175ee77f0c4492e26718212cee90dd4d0f511d;hp=197406033f373c0a1423c8ce48ac3d473f2b1a62;hpb=e329f98b8620d4fd44f87c51fc4e8dba2fbbfa32;p=mirror_edk2.git

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
index 197406033f..609e1a8077 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
@@ -1,7 +1,8 @@
 // /**
 //
+// Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
 // (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
-// Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
+// (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
 // This program and the accompanying materials
 // are licensed and made available under the terms and conditions of the BSD License
 // which accompanies this distribution. The full text of the license may be found at
@@ -115,10 +116,11 @@
                                                   "  MMIO_Port : %,14ld Pages (%,ld Bytes)\r\n"
                                                   "  PalCode   : %,14ld Pages (%,ld Bytes)\r\n"
                                                   "  Available : %,14ld Pages (%,ld Bytes)\r\n"
+                                                  "  Persistent: %,14ld Pages (%,ld Bytes)\r\n"
                                                   "              -------------- \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"
@@ -145,21 +147,17 @@
 #string STR_LOADPCIROM_START_FAIL #language en-US "%H%s%N: File '%B%s%N' Image %d unable to start.\r\n"
 
 #string STR_MM_NOT_ALIGNED        #language en-US "%H%s%N: Address parameter %016LX is not aligned.\r\n"
-#string STR_MM_SEGMENT_NOT_FOUND  #language en-US "%H%s%N: Segment %d not found.\r\n"
-#string STR_MM_ADDRESS_RANGE      #language en-US "%H%s%N: IO address out of range 0 - 0xFFFF\r\n"
+#string STR_MM_PCIE_ADDRESS_RANGE #language en-US "%H%s%N: Address parameter %016LX is not a valid PCI/PCIE address.\r\n"
+#string STR_MM_IO_ADDRESS_RANGE   #language en-US "%H%s%N: IO address out of range 0 - 0xFFFF\r\n"
 #string STR_MM_MMIO               #language en-US "%HMMIO%N"
 #string STR_MM_IO                 #language en-US "%HIO%N"
 #string STR_MM_PCI                #language en-US "%HPCI%N"
 #string STR_MM_MEM                #language en-US "%HMEM%N"
 #string STR_MM_PCIE               #language en-US "%HPCIE%N"
 #string STR_MM_ADDRESS            #language en-US "  0x%016lx : "
-#string STR_MM_BUF2               #language en-US "0x%02x"
-#string STR_MM_BUF4               #language en-US "0x%04x"
-#string STR_MM_BUF8               #language en-US "0x%08x"
-#string STR_MM_BUF16              #language en-US "0x%016lx"
+#string STR_MM_BUF                #language en-US "0x%0*lx"
 #string STR_MM_ADDRESS_RANGE2     #language en-US "%H%s%N: IO address out of range\r\n"
 #string STR_MM_ERROR              #language en-US "%H%s%N: Input had incorrect format\r\n"
-#string STR_MM_READ_ERROR         #language en-US "%H%s%N: Unable to read memory.\r\n"
 
 #string STR_SETVAR_PRINT          #language en-US "%g - %s - %04x Bytes\r\n"
 #string STR_SETVAR_ERROR_SET      #language en-US "%H%s%N: Unable to set - %H%g%N - %H%s%N\r\n"
@@ -320,7 +318,10 @@
                                                        "    CorrectableErrorStatus         %08x\r\n"
                                                        "    CorrectableErrorMask           %08x\r\n"
                                                        "    AdvancedErrorCapAndControl     %08x\r\n"
-                                                       "    HeaderLog                      %08x\r\n"
+                                                       "    HeaderLog1                     %08x\r\n"
+                                                       "    HeaderLog2                     %08x\r\n"
+                                                       "    HeaderLog3                     %08x\r\n"
+                                                       "    HeaderLog4                     %08x\r\n"
                                                        "    RootErrorCommand               %08x\r\n"
                                                        "    RootErrorStatus                %08x\r\n"
                                                        "    ErrorSourceIdentification      %04x\r\n"
@@ -406,9 +407,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"
@@ -628,10 +634,11 @@
 "Displays or modifies MEM/MMIO/IO/PCI/PCIE address space.\r\n"
 ".SH SYNOPSIS\r\n"
 " \r\n"
-"MM Address [Value] [-w 1|2|4|8] [-MEM | -MMIO [[Seg] Bus] | -IO [[Seg] Bus] |\r\n"
-"                                 -PCI | -PCIE] [-n]\r\n"
+"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"
 "  -MEM    - Memory Address type\r\n"
 "  -MMIO   - Memory Mapped IO Address type\r\n"
 "  -IO     - IO Address type\r\n"
@@ -655,10 +662,6 @@
 "              4    - 4 bytes\r\n"
 "              8    - 8 bytes\r\n"
 "  -n      - Non-interactive mode\r\n"
-"  Address - Specifies a starting address.\r\n"
-"  Value   - Specifies the value to write.\r\n"
-"  Seg     - Specifies the segment number of the PCI root bridge for -MMIO and -IO address types.\r\n"
-"  Bus     - Specifies the bus number of the PCI root bridge for -MMIO and -IO address types.\r\n"
 ".SH DESCRIPTION\r\n"
 " \r\n"
 "NOTES:\r\n"
@@ -686,9 +689,6 @@
 "      specified width.\r\n"
 "  10. Not all addresses are safe to access. Access to any improper address\r\n"
 "      can bring unexpected results.\r\n"
-"  11. If no Bus or Segment is specified, the first root bridge found is used.\r\n"
-"  12. If only one parameter is specified after -MMIO or -IO, the Bus parameter is assumed\r\n"
-"      and Segment defaults to 0.\r\n"
 ".SH EXAMPLES\r\n"
 " \r\n"
 "EXAMPLES:\r\n"
@@ -813,9 +813,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"
@@ -999,6 +999,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"
@@ -1020,7 +1021,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"
@@ -1029,6 +1030,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"