X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ShellPkg%2FLibrary%2FUefiShellDriver1CommandsLib%2FUefiShellDriver1CommandsLib.uni;h=fc4986c8c62f48e703684c0012edc220f0d30864;hb=HEAD;hp=7a3e61e5fc56254f21e2d5dc94dd5a71e6d1e46d;hpb=03a5572bed61a5e0af83d634962c869f89730d75;p=mirror_edk2.git
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni
index 7a3e61e5fc..fc4986c8c6 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni
@@ -2,14 +2,8 @@
//
// (C) Copyright 2016-2017 Hewlett Packard Enterprise Development LP
// (C) Copyright 2012-2015 Hewlett-Packard Development Company, L.P.
-// Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.
-// 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
-// http://opensource.org/licenses/bsd-license.php.
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// Module Name:
//
@@ -90,12 +84,12 @@
#string STR_DEVICES_ITEM_LINE_SFO #language en-US "DevicesInfo,"%x","%c","%c","%c","%d","%d","%d","%s"\r\n"
#string STR_DRIVERS_HEADER_LINES #language en-US "%N"
-" T D\r\n"
-" Y C I\r\n"
-" P F A\r\n"
-"DRV VERSION E G G #D #C DRIVER NAME IMAGE PATH\r\n"
-"=== ======== = = = === === =================================== ==========\r\n"
-#string STR_DRIVERS_ITEM_LINE #language en-US "%H%3x%N %08x %1c %1c %1c %3d %3d %-35s %s\r\n"
+"%H T D%N\r\n"
+"%HD Y C I%N\r\n"
+"%HR P F A%N\r\n"
+"%HV VERSION E G G #D #C DRIVER NAME IMAGE NAME%N\r\n"
+"== ======== = = = == == =================================== ==========\r\n"
+#string STR_DRIVERS_ITEM_LINE #language en-US "%H%2x%N %08x %1c %1c %1c %2s %2s %-35s %s\r\n"
#string STR_DRIVERS_ITEM_LINE_SFO #language en-US "DriversInfo,"%x","%x","%c","%c","%c","%d","%d","%s","%s"\r\n"
#string STR_DH_OUTPUT_DECODE #language en-US "%s: %g\r\n"
@@ -106,28 +100,30 @@
#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_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_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_DRIVER2 #language en-US " Device Path : %B%s%N\r\n"
- " Controller Type : %B%s%N\r\n"
- " Configuration : %B%s%N\r\n"
- " Diagnostics : %B%s%N\r\n"
-#string STR_DH_OUTPUT_DRIVER3 #language en-US " Managed by : %B%s%N\r\n"
-#string STR_DH_OUTPUT_DRIVER4A #language en-US " Drv[%H%02x%N] : Image(%B%s%N)r\n"
-#string STR_DH_OUTPUT_DRIVER4B #language en-US " Drv[%H%02x%N] : %B%s%N\r\n"
-#string STR_DH_OUTPUT_DRIVER5 #language en-US " Parent Controllers : %B%s%N\r\n"
-#string STR_DH_OUTPUT_DRIVER5B #language en-US " Parent[%H%02x%N] : %B%s%N\r\n"
-#string STR_DH_OUTPUT_DRIVER6 #language en-US " Child Controllers : %B%s%N\r\n"
-#string STR_DH_OUTPUT_DRIVER6B #language en-US " Child[%H%02x%N] : %B%s%N\r\n"
-#string STR_DH_OUTPUT_DRIVER7 #language en-US " Driver Name [%H%02x%N] : %B%s%N\r\n"
-#string STR_DH_OUTPUT_DRIVER7B #language en-US " Driver Image Name : %B%s%N\r\n"
-#string STR_DH_OUTPUT_DRIVER8 #language en-US " Driver Version : %B%08x%N\r\n"
- " Driver Type : %B%s%N\r\n"
- " Configuration : %B%s%N\r\n"
- " Diagnostics : %B%s%N\r\n"
-#string STR_DH_OUTPUT_DRIVER9 #language en-US " Managing : %B%s%N\r\n"
-#string STR_DH_OUTPUT_DRIVER9B #language en-US " Ctrl[%H%02x%N] : %B%s%N\r\n"
+#string STR_DH_OUTPUT_DRIVER1 #language en-US " Controller Name : %H%s%N\r\n"
+#string STR_DH_OUTPUT_DRIVER2 #language en-US " Device Path : %H%s%N\r\n"
+ " Controller Type : %H%s%N\r\n"
+ " Configuration : %H%s%N\r\n"
+ " Diagnostics : %H%s%N\r\n"
+#string STR_DH_OUTPUT_DRIVER3 #language en-US " Managed by : %H%s%N\r\n"
+#string STR_DH_OUTPUT_DRIVER4A #language en-US " Drv[%H%02x%N] : Image(%H%s%N)r\n"
+#string STR_DH_OUTPUT_DRIVER4B #language en-US " Drv[%H%02x%N] : %H%s%N\r\n"
+#string STR_DH_OUTPUT_DRIVER5 #language en-US " Parent Controllers : %H%s%N\r\n"
+#string STR_DH_OUTPUT_DRIVER5B #language en-US " Parent[%H%02x%N] : %H%s%N\r\n"
+#string STR_DH_OUTPUT_DRIVER6 #language en-US " Child Controllers : %H%s%N\r\n"
+#string STR_DH_OUTPUT_DRIVER6B #language en-US " Child[%H%02x%N] : %H%s%N\r\n"
+#string STR_DH_OUTPUT_DRIVER6C #language en-US " Child[%H%02x%N] : %H%s%N\r\n"
+#string STR_DH_OUTPUT_DRIVER7 #language en-US " Driver Name [%H%02x%N] : %H%s%N\r\n"
+#string STR_DH_OUTPUT_DRIVER7B #language en-US " Driver Image Name : %H%s%N\r\n"
+#string STR_DH_OUTPUT_DRIVER8 #language en-US " Driver Version : %H%08x%N\r\n"
+ " Driver Type : %H%s%N\r\n"
+ " Configuration : %H%s%N\r\n"
+ " Diagnostics : %H%s%N\r\n"
+#string STR_DH_OUTPUT_DRIVER9 #language en-US " Managing : %H%s%N\r\n"
+#string STR_DH_OUTPUT_DRIVER9B #language en-US " Ctrl[%H%02x%N] : %H%s%N\r\n"
#string STR_DEV_TREE_OUTPUT #language en-US "Ctrl[%H%02x%N] %s\r\n"
@@ -306,7 +302,7 @@
".SH SYNOPSIS\r\n"
" \r\n"
"DISCONNECT DeviceHandle [DriverHandle [ChildHandle]] \r\n"
-"DISCONNECT [-r] [-nc] \r\n"
+"DISCONNECT -r [-nc] \r\n"
".SH OPTIONS\r\n"
" \r\n"
"NOTES:\r\n"
@@ -328,7 +324,7 @@
" disconnect all child handles of the 'DeviceHandle'.\r\n"
" 3. If the '-r' option is specified, all consoles and drivers will be\r\n"
" disconnected from all devices in the system, then consoles are\r\n"
-" reconnected. If the '-nc' option is also spcified, then console devices\r\n"
+" reconnected. If the '-nc' option is also specified, then console devices\r\n"
" are not reconnected.\r\n"
" 4. This command does not support output redirection.\r\n"
".SH EXAMPLES\r\n"
@@ -399,9 +395,9 @@
" * To display all handles with 'diskio' protocol:\r\n"
" Shell> dh -p diskio\r\n"
" \r\n"
-" * To display all handles with 'Image' protocol and break when the screen is\r\n"
+" * To display all handles with 'LoadedImage' protocol and break when the screen is\r\n"
" full:\r\n"
-" Shell> dh -p Image -b\r\n"
+" Shell> dh -p LoadedImage -b\r\n"
".SH RETURNVALUES\r\n"
" \r\n"
"RETURN VALUES:\r\n"
@@ -467,7 +463,7 @@
" CTRL - The handle number of the UEFI device\r\n"
" TYPE - The device type:\r\n"
" [R] - Root Controller\r\n"
-" [B] - Bus Controller\r\n"
+" [B] - Bus Controller\r\n"
" [D] - Device Controller\r\n"
" CFG - A managing driver supports the Driver Configuration\r\n"
" Protocol. Yes if 'Y' or 'X'; No if 'N' or '-'.\r\n"
@@ -520,7 +516,7 @@
" 6. If only a single handle is specified and the handle has an\r\n"
" EFI_DRIVER_BINDING_PROTOCOL on it, then the handle is assumed to be a\r\n"
" driver handle. Otherwise, it is assumed to be a device handle.\r\n"
-" 7. If no parameters are specified, then the command will attempt to bind\r\n"
+" 7. If no parameters are specified, then the command will attempt to bind\r\n"
" all proper drivers to all devices without recursion. Each connection\r\n"
" status will be displayed.\r\n"
" 8. Output redirection is not supported for 'connect -r' usage.\r\n"