//\r
// (C) Copyright 2016-2017 Hewlett Packard Enterprise Development LP<BR>\r
// (C) Copyright 2012-2015 Hewlett-Packard Development Company, L.P.<BR>\r
-// Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
-// This program and the accompanying materials\r
-// are licensed and made available under the terms and conditions of the BSD License\r
-// which accompanies this distribution. The full text of the license may be found at\r
-// http://opensource.org/licenses/bsd-license.php.\r
-//\r
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+// Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+// SPDX-License-Identifier: BSD-2-Clause-Patent\r
//\r
// Module Name:\r
//\r
#string STR_DH_OUTPUT_ALL_HEADER #language en-US "Handle dump\r\n"\r
#string STR_DH_OUTPUT_GUID_HEADER #language en-US "Handle dump by protocol '%g'\r\n"\r
#string STR_DH_OUTPUT_NAME_HEADER #language en-US "Handle dump by protocol '%s'\r\n"\r
+#string STR_DH_OUTPUT_SINGLE_D #language en-US "%H%02x%N: %s\r\n"\r
#string STR_DH_OUTPUT_SINGLE #language en-US "%H%02x%N: %x\r\n%s"\r
#string STR_DH_OUTPUT_SFO #language en-US "%s, %s, %s, %H%02x%N, %s, %s\r\n"\r
-#string STR_DH_OUTPUT_DRIVER1 #language en-US " Controller Name : %B%s%N\r\n"\r
-#string STR_DH_OUTPUT_DRIVER2 #language en-US " Device Path : %B%s%N\r\n"\r
- " Controller Type : %B%s%N\r\n"\r
- " Configuration : %B%s%N\r\n"\r
- " Diagnostics : %B%s%N\r\n"\r
-#string STR_DH_OUTPUT_DRIVER3 #language en-US " Managed by : %B%s%N\r\n"\r
-#string STR_DH_OUTPUT_DRIVER4A #language en-US " Drv[%H%02x%N] : Image(%B%s%N)r\n"\r
-#string STR_DH_OUTPUT_DRIVER4B #language en-US " Drv[%H%02x%N] : %B%s%N\r\n"\r
-#string STR_DH_OUTPUT_DRIVER5 #language en-US " Parent Controllers : %B%s%N\r\n"\r
-#string STR_DH_OUTPUT_DRIVER5B #language en-US " Parent[%H%02x%N] : %B%s%N\r\n"\r
-#string STR_DH_OUTPUT_DRIVER6 #language en-US " Child Controllers : %B%s%N\r\n"\r
-#string STR_DH_OUTPUT_DRIVER6B #language en-US " Child[%H%02x%N] : %B%s%N\r\n"\r
-#string STR_DH_OUTPUT_DRIVER7 #language en-US " Driver Name [%H%02x%N] : %B%s%N\r\n"\r
-#string STR_DH_OUTPUT_DRIVER7B #language en-US " Driver Image Name : %B%s%N\r\n"\r
-#string STR_DH_OUTPUT_DRIVER8 #language en-US " Driver Version : %B%08x%N\r\n"\r
- " Driver Type : %B%s%N\r\n"\r
- " Configuration : %B%s%N\r\n"\r
- " Diagnostics : %B%s%N\r\n"\r
-#string STR_DH_OUTPUT_DRIVER9 #language en-US " Managing : %B%s%N\r\n"\r
-#string STR_DH_OUTPUT_DRIVER9B #language en-US " Ctrl[%H%02x%N] : %B%s%N\r\n"\r
+#string STR_DH_OUTPUT_DRIVER1 #language en-US " Controller Name : %H%s%N\r\n"\r
+#string STR_DH_OUTPUT_DRIVER2 #language en-US " Device Path : %H%s%N\r\n"\r
+ " Controller Type : %H%s%N\r\n"\r
+ " Configuration : %H%s%N\r\n"\r
+ " Diagnostics : %H%s%N\r\n"\r
+#string STR_DH_OUTPUT_DRIVER3 #language en-US " Managed by : %H%s%N\r\n"\r
+#string STR_DH_OUTPUT_DRIVER4A #language en-US " Drv[%H%02x%N] : Image(%H%s%N)r\n"\r
+#string STR_DH_OUTPUT_DRIVER4B #language en-US " Drv[%H%02x%N] : %H%s%N\r\n"\r
+#string STR_DH_OUTPUT_DRIVER5 #language en-US " Parent Controllers : %H%s%N\r\n"\r
+#string STR_DH_OUTPUT_DRIVER5B #language en-US " Parent[%H%02x%N] : %H%s%N\r\n"\r
+#string STR_DH_OUTPUT_DRIVER6 #language en-US " Child Controllers : %H%s%N\r\n"\r
+#string STR_DH_OUTPUT_DRIVER6B #language en-US " Child[%H%02x%N] : %H%s%N\r\n"\r
+#string STR_DH_OUTPUT_DRIVER6C #language en-US " Child[%H%02x%N] : %H%s%N\r\n"\r
+#string STR_DH_OUTPUT_DRIVER7 #language en-US " Driver Name [%H%02x%N] : %H%s%N\r\n"\r
+#string STR_DH_OUTPUT_DRIVER7B #language en-US " Driver Image Name : %H%s%N\r\n"\r
+#string STR_DH_OUTPUT_DRIVER8 #language en-US " Driver Version : %H%08x%N\r\n"\r
+ " Driver Type : %H%s%N\r\n"\r
+ " Configuration : %H%s%N\r\n"\r
+ " Diagnostics : %H%s%N\r\n"\r
+#string STR_DH_OUTPUT_DRIVER9 #language en-US " Managing : %H%s%N\r\n"\r
+#string STR_DH_OUTPUT_DRIVER9B #language en-US " Ctrl[%H%02x%N] : %H%s%N\r\n"\r
\r
#string STR_DEV_TREE_OUTPUT #language en-US "Ctrl[%H%02x%N] %s\r\n"\r
\r
".SH SYNOPSIS\r\n"\r
" \r\n"\r
"DISCONNECT DeviceHandle [DriverHandle [ChildHandle]] \r\n"\r
-"DISCONNECT [-r] [-nc] \r\n"\r
+"DISCONNECT -r [-nc] \r\n"\r
".SH OPTIONS\r\n"\r
" \r\n"\r
"NOTES:\r\n"\r
" disconnect all child handles of the 'DeviceHandle'.\r\n"\r
" 3. If the '-r' option is specified, all consoles and drivers will be\r\n"\r
" disconnected from all devices in the system, then consoles are\r\n"\r
-" reconnected. If the '-nc' option is also spcified, then console devices\r\n"\r
+" reconnected. If the '-nc' option is also specified, then console devices\r\n"\r
" are not reconnected.\r\n"\r
" 4. This command does not support output redirection.\r\n"\r
".SH EXAMPLES\r\n"\r
" * To display all handles with 'diskio' protocol:\r\n"\r
" Shell> dh -p diskio\r\n"\r
" \r\n"\r
-" * To display all handles with 'Image' protocol and break when the screen is\r\n"\r
+" * To display all handles with 'LoadedImage' protocol and break when the screen is\r\n"\r
" full:\r\n"\r
-" Shell> dh -p Image -b\r\n"\r
+" Shell> dh -p LoadedImage -b\r\n"\r
".SH RETURNVALUES\r\n"\r
" \r\n"\r
"RETURN VALUES:\r\n"\r
" CTRL - The handle number of the UEFI device\r\n"\r
" TYPE - The device type:\r\n"\r
" [R] - Root Controller\r\n"\r
-" [B] - Bus Controller\r\n" \r
+" [B] - Bus Controller\r\n"\r
" [D] - Device Controller\r\n"\r
" CFG - A managing driver supports the Driver Configuration\r\n"\r
" Protocol. Yes if 'Y' or 'X'; No if 'N' or '-'.\r\n"\r
" 6. If only a single handle is specified and the handle has an\r\n"\r
" EFI_DRIVER_BINDING_PROTOCOL on it, then the handle is assumed to be a\r\n"\r
" driver handle. Otherwise, it is assumed to be a device handle.\r\n"\r
-" 7. If no parameters are specified, then the command will attempt to bind\r\n" \r
+" 7. If no parameters are specified, then the command will attempt to bind\r\n"\r
" all proper drivers to all devices without recursion. Each connection\r\n"\r
" status will be displayed.\r\n"\r
" 8. Output redirection is not supported for 'connect -r' usage.\r\n"\r