Updates the logic to allow devices to support SFO output mode

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15760 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Devices.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Devices.c
index 7998bde8c61821c873f44fc8275d9b5355c49013..afabc8a6982aef241d7ef096c3f737bf41bef120 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Devices.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Devices.c
@@ -1,7 +1,7 @@
 /** @file\r
   Main file for devices shell Driver1 function.\r
 \r
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2014, 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
@@ -203,8 +203,11 @@ ShellCommandRunDevices (
 \r
       //\r
       // Print Header\r
+      // only in non SFO mode.\r
       //\r
-      ShellPrintHiiEx(-1, -1, Language, STRING_TOKEN (STR_DEVICES_HEADER_LINES), gShellDriver1HiiHandle);\r
+      if (!ShellCommandLineGetFlag(Package, L"-sfo")){\r
+        ShellPrintHiiEx(-1, -1, Language, STRING_TOKEN (STR_DEVICES_HEADER_LINES), gShellDriver1HiiHandle);\r
+      }\r
 \r
       //\r
       // loop through each handle\r
@@ -222,20 +225,37 @@ ShellCommandRunDevices (
         Name = NULL;\r
         Status = GetDeviceHandleInfo(*HandleListWalker, &Type, &Cfg, &Diag, &Parents, &Devices, &Children, &Name, Language);\r
         if (Name != NULL && (Parents != 0 || Devices != 0 || Children != 0)) {\r
-          ShellPrintHiiEx(\r
-            -1,\r
-            -1,\r
-            Language,\r
-            STRING_TOKEN (STR_DEVICES_ITEM_LINE),\r
-            gShellDriver1HiiHandle,\r
-            ConvertHandleToHandleIndex(*HandleListWalker),\r
-            Type,\r
-            Cfg?L'X':L'-',\r
-            Diag?L'X':L'-',\r
-            Parents,\r
-            Devices,\r
-            Children,\r
-            Name!=NULL?Name:L"<UNKNOWN>");\r
+          if (!ShellCommandLineGetFlag(Package, L"-sfo")){\r
+            ShellPrintHiiEx(\r
+              -1,\r
+              -1,\r
+              Language,\r
+              STRING_TOKEN(STR_DEVICES_ITEM_LINE),\r
+              gShellDriver1HiiHandle,\r
+              ConvertHandleToHandleIndex(*HandleListWalker),\r
+              Type,\r
+              Cfg?L'X':L'-',\r
+              Diag?L'X':L'-',\r
+              Parents,\r
+              Devices,\r
+              Children,\r
+              Name != NULL ? Name : L"<UNKNOWN>");\r
+          } else {\r
+            ShellPrintHiiEx(\r
+              -1,\r
+              -1,\r
+              Language,\r
+              STRING_TOKEN(STR_DEVICES_ITEM_LINE_SFO),\r
+              gShellDriver1HiiHandle,\r
+              ConvertHandleToHandleIndex(*HandleListWalker),\r
+              Type,\r
+              Cfg?L'Y':L'N',\r
+              Diag?L'Y':L'N',\r
+              Parents,\r
+              Devices,\r
+              Children,\r
+              Name != NULL ? Name : L"<UNKNOWN>");\r
+          }\r
         }\r
         if (Name != NULL) {\r
           FreePool(Name);\r

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni
index 1c6d9f6d5b29a44c0ec6aae124c967b40fe16d23..a7c787e01ba7005210a8eada846f5c0bdc9d5ad8 100644 (file)
Binary files a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni and b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni differ