Clean up the private GUID definition in module Level.

Signed-off-by: lgao4
Reviewed-by: jcarsey
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12394 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ShellPkg/Include/Guid/ShellLibHiiGuid.h b/ShellPkg/Include/Guid/ShellLibHiiGuid.h
new file mode 100644 (file)
index 0000000..26d3279
--- /dev/null
+++ b/ShellPkg/Include/Guid/ShellLibHiiGuid.h
@@ -0,0 +1,67 @@
+/** @file\r
+  GUIDs for HII package list installed by Shell libraries.\r
+\r
+  Copyright (c) 2011, 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
+\r
+**/\r
+\r
+#ifndef _SHELLLIB_HII_GUID_H_\r
+#define _SHELLLIB_HII_GUID_H_\r
+\r
+#define HANDLE_PARSING_HII_GUID \\r
+  { \\r
+  0xb8969637, 0x81de, 0x43af, { 0xbc, 0x9a, 0x24, 0xd9, 0x89, 0x13, 0xf2, 0xf6 } \\r
+  }\r
+\r
+#define SHELL_DEBUG1_HII_GUID \\r
+  { \\r
+    0x25f200aa, 0xd3cb, 0x470a, { 0xbf, 0x51, 0xe7, 0xd1, 0x62, 0xd2, 0x2e, 0x6f } \\r
+  }\r
+\r
+#define SHELL_DRIVER1_HII_GUID \\r
+  { \\r
+  0xaf0b742, 0x63ec, 0x45bd, {0x8d, 0xb6, 0x71, 0xad, 0x7f, 0x2f, 0xe8, 0xe8} \\r
+  }\r
+\r
+#define SHELL_INSTALL1_HII_GUID \\r
+  { \\r
+    0x7d574d54, 0xd364, 0x4d4a, { 0x95, 0xe3, 0x49, 0x45, 0xdb, 0x7a, 0xd3, 0xee } \\r
+  }\r
+\r
+#define SHELL_LEVEL1_HII_GUID \\r
+  { \\r
+    0xdec5daa4, 0x6781, 0x4820, { 0x9c, 0x63, 0xa7, 0xb0, 0xe4, 0xf1, 0xdb, 0x31 } \\r
+  }\r
+\r
+#define SHELL_LEVEL2_HII_GUID \\r
+  { \\r
+    0xf95a7ccc, 0x4c55, 0x4426, { 0xa7, 0xb4, 0xdc, 0x89, 0x61, 0x95, 0xb, 0xae } \\r
+  }\r
+\r
+#define SHELL_LEVEL3_HII_GUID \\r
+  { \\r
+    0x4344558d, 0x4ef9, 0x4725, { 0xb1, 0xe4, 0x33, 0x76, 0xe8, 0xd6, 0x97, 0x4f } \\r
+  }\r
+\r
+#define SHELL_NETWORK1_HII_GUID \\r
+  { \\r
+    0xf3d301bb, 0xf4a5, 0x45a8, { 0xb0, 0xb7, 0xfa, 0x99, 0x9c, 0x62, 0x37, 0xae } \\r
+  }\r
+\r
+extern EFI_GUID gHandleParsingHiiGuid;\r
+extern EFI_GUID gShellDebug1HiiGuid;\r
+extern EFI_GUID gShellDriver1HiiGuid;\r
+extern EFI_GUID gShellInstall1HiiGuid;\r
+extern EFI_GUID gShellLevel1HiiGuid;\r
+extern EFI_GUID gShellLevel2HiiGuid;\r
+extern EFI_GUID gShellLevel3HiiGuid;\r
+extern EFI_GUID gShellNetwork1HiiGuid;\r
+\r
+#endif\r

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
index 131c077b1e2b2628e322077f4bf75d87d0336533..77f7756dc7237178f2e6c9dcf4c284ee9a537146 100644 (file)
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
@@ -14,11 +14,6 @@
 \r
 #include "UefiHandleParsingLib.h"\r
 \r
-\r
-STATIC CONST EFI_GUID mHandleParsingHiiGuid = \\r
-  { \\r
-  0xb8969637, 0x81de, 0x43af, { 0xbc, 0x9a, 0x24, 0xd9, 0x89, 0x13, 0xf2, 0xf6 } \\r
-  };\r
 EFI_HANDLE mHandleParsingHiiHandle;\r
 HANDLE_INDEX_LIST mHandleList = {{{NULL,NULL},0,0},0};\r
 \r
@@ -37,7 +32,7 @@ HandleParsingLibConstructor (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  mHandleParsingHiiHandle = HiiAddPackages (&mHandleParsingHiiGuid, gImageHandle, UefiHandleParsingLibStrings, NULL);\r
+  mHandleParsingHiiHandle = HiiAddPackages (&gHandleParsingHiiGuid, gImageHandle, UefiHandleParsingLibStrings, NULL);\r
   if (mHandleParsingHiiHandle == NULL) {\r
     return (EFI_DEVICE_ERROR);\r
   }\r

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
index de61b7cce6956e5bdeb51a6fbb93afc9904e2c78..39b2e6535c844a76e2d59fb433c5cc27befc6a62 100644 (file)
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
@@ -24,6 +24,7 @@
 #include <Guid/GlobalVariable.h>\r
 #include <Guid/Gpt.h>\r
 #include <Guid/FileSystemInfo.h>\r
+#include <Guid/ShellLibHiiGuid.h>\r
 \r
 #include <Protocol/SimpleFileSystem.h>\r
 #include <Protocol/LoadedImage.h>\r

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
index dab32951d230d1aacd7debc15e49849ddfa70556..46d918611a59b22f1f09cc98d0fa1cb36d0e5038 100644 (file)
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
@@ -1,6 +1,6 @@
 ##  @file\r
 #  Provides interface to advanced shell functionality for parsing both handle and protocol database.\r
-#  Copyright (c) 2010, Intel Corporation. All rights reserved. <BR>\r
+#  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved. <BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -149,6 +149,7 @@
   gEfiGlobalVariableGuid\r
   gEfiPartTypeSystemPartGuid\r
   gEfiPartTypeLegacyMbrGuid\r
+  gHandleParsingHiiGuid\r
 \r
 [Pcd.common]\r
   gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize     # ALWAYS_CONSUMED\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
index b54d8e1f28f4a259d1045963dbf4d7f373db571a..9ab5d89748a82bd62aea26a355fa8fc2b40f39cd 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
@@ -16,10 +16,6 @@
 \r
 STATIC CONST CHAR16 mFileName[] = L"Debug1Commands";\r
 EFI_HANDLE gShellDebug1HiiHandle = NULL;\r
-CONST EFI_GUID gShellDebug1HiiGuid = \\r
-  { \\r
-    0x25f200aa, 0xd3cb, 0x470a, { 0xbf, 0x51, 0xe7, 0xd1, 0x62, 0xd2, 0x2e, 0x6f } \\r
-  };\r
 \r
 /**\r
   Gets the debug file name.  This will be used if HII is not working.\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h
index 7cabfe3278d3576737294ab9a3f390a89ad9444d..bbc539126b01803ee338227586c8ab8a8cabc3f3 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h
@@ -22,6 +22,7 @@
 #include <Guid/ConsoleInDevice.h>\r
 #include <Guid/ConsoleOutDevice.h>\r
 #include <Guid/FileSystemInfo.h>\r
+#include <Guid/ShellLibHiiGuid.h>\r
 \r
 #include <Protocol/EfiShell.h>\r
 #include <Protocol/EfiShellParameters.h>\r
@@ -60,7 +61,6 @@
 \r
 \r
 extern        EFI_HANDLE                        gShellDebug1HiiHandle;\r
-extern CONST  EFI_GUID                          gShellDebug1HiiGuid;\r
 \r
 /**\r
   Function printing hex output to the console.\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
index f773cb600fbc0e88fd0edadedc831340612234fd..6452543676600201fbcbfc94860a9724aa45c161 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
@@ -1,7 +1,7 @@
 ##  @file\r
 # Provides shell Debug1 profile functions\r
 #\r
-# Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -135,4 +135,4 @@
   gEfiSalSystemTableGuid\r
   gEfiAcpi10TableGuid\r
   gEfiAcpi20TableGuid\r
-\r
+  gShellDebug1HiiGuid\r

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.c
index 109fa721785e7815176a3849a6de1b1a2757a187..957fde9b8db3a98ad8152d9117f00f50a3668148 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.c
@@ -18,11 +18,6 @@ STATIC CONST CHAR16 mFileName[] = L"Driver1Commands";
 EFI_HANDLE gShellDriver1HiiHandle = NULL;\r
 BOOLEAN    gInReconnect = FALSE;\r
 \r
-CONST EFI_GUID gShellDriver1HiiGuid = \\r
-  { \\r
-  0xaf0b742, 0x63ec, 0x45bd, {0x8d, 0xb6, 0x71, 0xad, 0x7f, 0x2f, 0xe8, 0xe8} \\r
-  };\r
-\r
 /**\r
   Function to return the name of the file containing help if HII will not be used.\r
 \r

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h
index 61754a54773d0e93094dd2d684b825fb5bb2d7ff..19633a4b71fc100b799885168c141131b1623d9d 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h
@@ -21,6 +21,7 @@
 #include <Guid/GlobalVariable.h>\r
 #include <Guid/ConsoleInDevice.h>\r
 #include <Guid/ConsoleOutDevice.h>\r
+#include <Guid/ShellLibHiiGuid.h>\r
 \r
 #include <Protocol/EfiShell.h>\r
 #include <Protocol/EfiShellParameters.h>\r
@@ -57,7 +58,6 @@
 \r
 \r
 extern        EFI_HANDLE                        gShellDriver1HiiHandle;\r
-extern CONST  EFI_GUID                          gShellDriver1HiiGuid;\r
 extern        BOOLEAN                           gInReconnect;\r
 \r
 /**\r

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
index c02b5e2d80e221c3015396306d16747afcc71853..2050c71ecdcf9e5e90e776e1857c0e45fffe6ac3 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
@@ -1,7 +1,7 @@
 ##  @file\r
 # Provides shell driver1 profile functions\r
 #\r
-# Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -70,4 +70,4 @@
   gEfiGlobalVariableGuid                          # ALWAYS_CONSUMED\r
   gEfiConsoleInDeviceGuid                         # ALWAYS_CONSUMED\r
   gEfiConsoleOutDeviceGuid                        # ALWAYS_CONSUMED\r
-\r
+  gShellDriver1HiiGuid                            ## PRODUCES\r

diff --git a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.c b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.c
index 28a9a9c3267f89b230d99956a09e4176489ca21e..b7f0878b739c570183dbe1cf5fb44e4481e4a431 100644 (file)
--- a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.c
@@ -16,10 +16,6 @@
 \r
 STATIC CONST CHAR16 mFileName[] = L"ShellCommands";\r
 EFI_HANDLE gShellInstall1HiiHandle = NULL;\r
-CONST EFI_GUID gShellInstall1HiiGuid = \\r
-  { \\r
-    0x7d574d54, 0xd364, 0x4d4a, { 0x95, 0xe3, 0x49, 0x45, 0xdb, 0x7a, 0xd3, 0xee } \\r
-  };\r
 \r
 /**\r
   Function to get the filename with help context if HII will not be used.\r

diff --git a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.h b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.h
index 48dcd4c2fcc1ce0750fdd8b6003575ec4fad0bf2..09207c06989116d65371e9f87eba0637bde50536 100644 (file)
--- a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.h
@@ -18,6 +18,8 @@
 #include <Uefi.h>\r
 #include <ShellBase.h>\r
 \r
+#include <Guid/ShellLibHiiGuid.h>\r
+\r
 #include <Protocol/EfiShell.h>\r
 #include <Protocol/EfiShellParameters.h>\r
 #include <Protocol/DevicePath.h>\r
@@ -40,7 +42,6 @@
 #include <Library/FileHandleLib.h>\r
 \r
 extern        EFI_HANDLE                        gShellInstall1HiiHandle;\r
-extern CONST  EFI_GUID                          gShellInstall1HiiGuid;\r
 \r
 /**\r
   Function for 'bcfg' command.\r

diff --git a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
index 5c7fb4eb03689656c38a7143364a4b94ec9c68a6..5188a003841e1760cc60a9a9dfa495c01f2f9bc2 100644 (file)
--- a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
@@ -1,7 +1,7 @@
 ##  @file\r
 #  Provides shell install1 functions\r
 #\r
-#  Copyright (c) 2010, Intel Corporation. All rights reserved. <BR>\r
+#  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved. <BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -49,3 +49,5 @@
 [Pcd]\r
   gEfiShellPkgTokenSpaceGuid.PcdShellProfileMask # ALWAYS_CONSUMED\r
 \r
+[Guids]\r
+  gShellInstall1HiiGuid\r

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c
index 7fc8690ceb6720539b2618af61765bc8030e3ebf..a9dd6ccdabcde6c31be8f2af12f313fc42dc4d64 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c
@@ -16,11 +16,6 @@
 \r
 STATIC CONST CHAR16 mFileName[] = L"ShellCommands";\r
 EFI_HANDLE gShellLevel1HiiHandle = NULL;\r
-CONST EFI_GUID gShellLevel1HiiGuid = \\r
-  { \\r
-    0xdec5daa4, 0x6781, 0x4820, { 0x9c, 0x63, 0xa7, 0xb0, 0xe4, 0xf1, 0xdb, 0x31 }\r
-  };\r
-\r
 \r
 /**\r
   Return the help text filename.  Only used if no HII information found.\r

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h
index e8439e7a8bcd95c88e81f335455a03ffa312876f..b0ef50315808c3cd164860dc86cf5be98d281025 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h
@@ -18,6 +18,8 @@
 #include <Uefi.h>\r
 #include <ShellBase.h>\r
 \r
+#include <Guid/ShellLibHiiGuid.h>\r
+\r
 #include <Protocol/EfiShell.h>\r
 #include <Protocol/EfiShellParameters.h>\r
 #include <Protocol/DevicePath.h>\r
@@ -40,7 +42,6 @@
 #include <Library/FileHandleLib.h>\r
 \r
 extern        EFI_HANDLE                        gShellLevel1HiiHandle;\r
-extern CONST  EFI_GUID                          gShellLevel1HiiGuid;\r
 \r
 /**\r
   Function for 'stall' command.\r

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
index 3a62cc3c8e3e3db5c3e66df486ba70a06ae6fc22..02b1627b4ff13b2b529d86ade784dfa021ff57ff 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
@@ -54,3 +54,6 @@
 \r
 [Pcd.common]\r
   gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel # ALWAYS_CONSUMED\r
+\r
+[Guids]\r
+  gShellLevel1HiiGuid\r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
index ce3d87ba502f745bf9e9a17f85e4c71c455bf053..6bdc39f08b9ecdb5989d86925ac5f88d935c30c5 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
@@ -36,10 +36,6 @@
 \r
 CONST CHAR16 mFileName[] = L"ShellCommands";\r
 EFI_HANDLE gShellLevel2HiiHandle = NULL;\r
-CONST EFI_GUID gShellLevel2HiiGuid = \\r
-  { \\r
-    0xf95a7ccc, 0x4c55, 0x4426, { 0xa7, 0xb4, 0xdc, 0x89, 0x61, 0x95, 0xb, 0xae } \\r
-  };\r
 \r
 /**\r
   Get the filename to get help text from if not using HII.\r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
index 80f6d59ee9f5bd5896a896cb51e04c1433b3c478..201824757320dbe61df63ab0c5c9e21f6133760c 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
@@ -26,6 +26,8 @@
 #include <Uefi.h>\r
 #include <ShellBase.h>\r
 \r
+#include <Guid/ShellLibHiiGuid.h>\r
+\r
 #include <Protocol/EfiShell.h>\r
 #include <Protocol/EfiShellParameters.h>\r
 #include <Protocol/DevicePath.h>\r
@@ -50,7 +52,6 @@
 \r
 extern CONST  CHAR16                            mFileName[];\r
 extern        EFI_HANDLE                        gShellLevel2HiiHandle;\r
-extern CONST  EFI_GUID                          gShellLevel2HiiGuid;\r
 \r
 /**\r
   Function for 'attrib' command.\r

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
index 52dc28feb2692f6cf66663af9a13fc13935aa4b2..5787c817f9548ecd0dc6510b1ecd5ff8ff35c650 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
@@ -82,3 +82,4 @@
 [Guids]\r
   gEfiFileSystemInfoGuid\r
   gEfiFileInfoGuid\r
+  gShellLevel2HiiGuid
\ No newline at end of file

diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.c
index 3c4fe542604312e557dcd3090ce4734ced5f16dd..e784872d6319a26b8bada96646866317540875d2 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.c
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.c
@@ -15,10 +15,6 @@
 \r
 CONST CHAR16 gShellLevel3FileName[] = L"ShellCommands";\r
 EFI_HANDLE gShellLevel3HiiHandle = NULL;\r
-STATIC CONST EFI_GUID gShellLevel3HiiGuid = \\r
-  { \\r
-    0x4344558d, 0x4ef9, 0x4725, { 0xb1, 0xe4, 0x33, 0x76, 0xe8, 0xd6, 0x97, 0x4f } \\r
-  };\r
 \r
 /**\r
   return the filename to get help from is not using HII.\r

diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.h b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.h
index bab34a412d01cc1692e6c9b567ccbdd5ce776903..5636d497c06bfba0d2a044ce051572d7f0f90fe7 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.h
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.h
@@ -18,6 +18,8 @@
 #include <Uefi.h>\r
 #include <ShellBase.h>\r
 \r
+#include <Guid/ShellLibHiiGuid.h>\r
+\r
 #include <Protocol/EfiShell.h>\r
 #include <Protocol/EfiShellParameters.h>\r
 #include <Protocol/DevicePath.h>\r

diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
index 16c6f7a2b3c6947d09bcce7a595a2bfdc0685fda..936476d0d5e8182da1ddfb119f7ae17292e598c6 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
@@ -2,7 +2,7 @@
 # Provides shell level 3 functions\r
 # Note that the interactive versions of the time, date, and timezone functions are handled in the level 2 library.\r
 #\r
-# Copyright (c) 2009-2010, Intel Corporation. All rights reserved. <BR>\r
+# Copyright (c) 2009-2011, Intel Corporation. All rights reserved. <BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -61,6 +61,7 @@
 \r
 [Guids]\r
   gEfiFileInfoGuid\r
+  gShellLevel3HiiGuid\r
 \r
 [Pcd.common]\r
   gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel\r

diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.c b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.c
index b0de1ae6944c75db28c2a20595d56e3f75128166..49849a619169a3c3396b6c1905ee94d96812a24e 100644 (file)
--- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.c
@@ -15,10 +15,6 @@
 \r
 CONST CHAR16 gShellNetwork1FileName[] = L"ShellCommands";\r
 EFI_HANDLE gShellNetwork1HiiHandle = NULL;\r
-STATIC CONST EFI_GUID gShellNetwork1HiiGuid = \\r
-  { \\r
-    0xf3d301bb, 0xf4a5, 0x45a8, { 0xb0, 0xb7, 0xfa, 0x99, 0x9c, 0x62, 0x37, 0xae } \\r
-  };\r
 \r
 /**\r
   return the file name of the help text file if not using HII.\r

diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.h b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.h
index 1093479f83d0053e837daaee7272f7d25e5bffe0..68a7c93c96724c302615f220dc59da6a10361abf 100644 (file)
--- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.h
@@ -19,6 +19,8 @@
 #include <Uefi.h>\r
 #include <ShellBase.h>\r
 \r
+#include <Guid/ShellLibHiiGuid.h>\r
+\r
 #include <Protocol/Cpu.h>\r
 #include <Protocol/ServiceBinding.h>\r
 #include <Protocol/Ip6.h>\r

diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
index 5a6ddbf6ed97d6a1ceda6dcb17fd8ffa910bb992..4857a7e795c40a704989baa6cc66f5f1469809eb 100644 (file)
--- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
@@ -61,4 +61,7 @@
 \r
   gEfiIp6ProtocolGuid                           # SOMETIMES_CONSUMED\r
   gEfiIp6ServiceBindingProtocolGuid             # SOMETIMES_CONSUMED\r
-  gEfiIp6ConfigProtocolGuid                     # SOMETIMES_CONSUMED
\ No newline at end of file
+  gEfiIp6ConfigProtocolGuid                     # SOMETIMES_CONSUMED\r
+  \r
+[Guids]\r
+  gShellNetwork1HiiGuid
\ No newline at end of file

diff --git a/ShellPkg/ShellPkg.dec b/ShellPkg/ShellPkg.dec
index e83b6cf50441aa405cad6e9c730b01d6c15160ac..a96e606773177127c4b2bfecbb21609c57f0b86e 100644 (file)
--- a/ShellPkg/ShellPkg.dec
+++ b/ShellPkg/ShellPkg.dec
@@ -51,7 +51,15 @@
   gShellVariableGuid              = {0x158def5a, 0xf656, 0x419c, {0xb0, 0x27, 0x7a, 0x31, 0x92, 0xc0, 0x79, 0xd2}}\r
   gShellMapGuid                   = {0x51271e13, 0x7de3, 0x43af, {0x8b, 0xc2, 0x71, 0xad, 0x3b, 0x82, 0x43, 0x25}}\r
   gShellAliasGuid                 = {0x0053d9d6, 0x2659, 0x4599, {0xa2, 0x6b, 0xef, 0x45, 0x36, 0xe6, 0x31, 0xa9}}\r
-\r
+  gHandleParsingHiiGuid           = {0xb8969637, 0x81de, 0x43af, {0xbc, 0x9a, 0x24, 0xd9, 0x89, 0x13, 0xf2, 0xf6}}\r
+  gShellDebug1HiiGuid             = {0x25f200aa, 0xd3cb, 0x470a, {0xbf, 0x51, 0xe7, 0xd1, 0x62, 0xd2, 0x2e, 0x6f}}\r
+  gShellDriver1HiiGuid            = {0xaf0b742, 0x63ec, 0x45bd, {0x8d, 0xb6, 0x71, 0xad, 0x7f, 0x2f, 0xe8, 0xe8}}\r
+  gShellInstall1HiiGuid           = {0x7d574d54, 0xd364, 0x4d4a, {0x95, 0xe3, 0x49, 0x45, 0xdb, 0x7a, 0xd3, 0xee}}\r
+  gShellLevel1HiiGuid             = {0xdec5daa4, 0x6781, 0x4820, {0x9c, 0x63, 0xa7, 0xb0, 0xe4, 0xf1, 0xdb, 0x31}}\r
+  gShellLevel2HiiGuid             = {0xf95a7ccc, 0x4c55, 0x4426, {0xa7, 0xb4, 0xdc, 0x89, 0x61, 0x95, 0xb, 0xae}}\r
+  gShellLevel3HiiGuid             = {0x4344558d, 0x4ef9, 0x4725, {0xb1, 0xe4, 0x33, 0x76, 0xe8, 0xd6, 0x97, 0x4f}}\r
+  gShellNetwork1HiiGuid           = {0xf3d301bb, 0xf4a5, 0x45a8, {0xb0, 0xb7, 0xfa, 0x99, 0x9c, 0x62, 0x37, 0xae}}\r
+  \r
 [Protocols]\r
   gEfiShellProtocolGuid           = {0x6302d008, 0x7f9b, 0x4f30, {0x87, 0xac, 0x60, 0xc9, 0xfe, 0xf5, 0xda, 0x4e}}\r
   gEfiShellParametersProtocolGuid = {0x752f3136, 0x4e16, 0x4fdc, {0xa2, 0x2a, 0xe5, 0xf4, 0x68, 0x12, 0xf4, 0xca}}\r