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

26 files changed, 109 insertions, 50 deletions

diff --git a/ShellPkg/Include/Guid/ShellLibHiiGuid.h b/ShellPkg/Include/Guid/ShellLibHiiGuid.h
new file mode 100644
index 0000000000..26d3279d46
--- /dev/null
+++ b/ShellPkg/Include/Guid/ShellLibHiiGuid.h
@@ -0,0 +1,67 @@
+/** @file

+  GUIDs for HII package list installed by Shell libraries.

+

+  Copyright (c) 2011, Intel Corporation. All rights reserved.<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

+  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.

+

+**/

+

+#ifndef _SHELLLIB_HII_GUID_H_

+#define _SHELLLIB_HII_GUID_H_

+

+#define HANDLE_PARSING_HII_GUID \

+  { \

+  0xb8969637, 0x81de, 0x43af, { 0xbc, 0x9a, 0x24, 0xd9, 0x89, 0x13, 0xf2, 0xf6 } \

+  }

+

+#define SHELL_DEBUG1_HII_GUID \

+  { \

+    0x25f200aa, 0xd3cb, 0x470a, { 0xbf, 0x51, 0xe7, 0xd1, 0x62, 0xd2, 0x2e, 0x6f } \

+  }

+

+#define SHELL_DRIVER1_HII_GUID \

+  { \

+  0xaf0b742, 0x63ec, 0x45bd, {0x8d, 0xb6, 0x71, 0xad, 0x7f, 0x2f, 0xe8, 0xe8} \

+  }

+

+#define SHELL_INSTALL1_HII_GUID \

+  { \

+    0x7d574d54, 0xd364, 0x4d4a, { 0x95, 0xe3, 0x49, 0x45, 0xdb, 0x7a, 0xd3, 0xee } \

+  }

+

+#define SHELL_LEVEL1_HII_GUID \

+  { \

+    0xdec5daa4, 0x6781, 0x4820, { 0x9c, 0x63, 0xa7, 0xb0, 0xe4, 0xf1, 0xdb, 0x31 } \

+  }

+

+#define SHELL_LEVEL2_HII_GUID \

+  { \

+    0xf95a7ccc, 0x4c55, 0x4426, { 0xa7, 0xb4, 0xdc, 0x89, 0x61, 0x95, 0xb, 0xae } \

+  }

+

+#define SHELL_LEVEL3_HII_GUID \

+  { \

+    0x4344558d, 0x4ef9, 0x4725, { 0xb1, 0xe4, 0x33, 0x76, 0xe8, 0xd6, 0x97, 0x4f } \

+  }

+

+#define SHELL_NETWORK1_HII_GUID \

+  { \

+    0xf3d301bb, 0xf4a5, 0x45a8, { 0xb0, 0xb7, 0xfa, 0x99, 0x9c, 0x62, 0x37, 0xae } \

+  }

+

+extern EFI_GUID gHandleParsingHiiGuid;

+extern EFI_GUID gShellDebug1HiiGuid;

+extern EFI_GUID gShellDriver1HiiGuid;

+extern EFI_GUID gShellInstall1HiiGuid;

+extern EFI_GUID gShellLevel1HiiGuid;

+extern EFI_GUID gShellLevel2HiiGuid;

+extern EFI_GUID gShellLevel3HiiGuid;

+extern EFI_GUID gShellNetwork1HiiGuid;

+

+#endif

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
index 131c077b1e..77f7756dc7 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
@@ -14,11 +14,6 @@
 

 #include "UefiHandleParsingLib.h"

 

-

-STATIC CONST EFI_GUID mHandleParsingHiiGuid = \

-  { \

-  0xb8969637, 0x81de, 0x43af, { 0xbc, 0x9a, 0x24, 0xd9, 0x89, 0x13, 0xf2, 0xf6 } \

-  };

 EFI_HANDLE mHandleParsingHiiHandle;

 HANDLE_INDEX_LIST mHandleList = {{{NULL,NULL},0,0},0};

 

@@ -37,7 +32,7 @@ HandleParsingLibConstructor (
   IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  mHandleParsingHiiHandle = HiiAddPackages (&mHandleParsingHiiGuid, gImageHandle, UefiHandleParsingLibStrings, NULL);

+  mHandleParsingHiiHandle = HiiAddPackages (&gHandleParsingHiiGuid, gImageHandle, UefiHandleParsingLibStrings, NULL);

   if (mHandleParsingHiiHandle == NULL) {

     return (EFI_DEVICE_ERROR);

   }

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
index de61b7cce6..39b2e6535c 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
@@ -24,6 +24,7 @@
 #include <Guid/GlobalVariable.h>

 #include <Guid/Gpt.h>

 #include <Guid/FileSystemInfo.h>

+#include <Guid/ShellLibHiiGuid.h>

 

 #include <Protocol/SimpleFileSystem.h>

 #include <Protocol/LoadedImage.h>

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
index dab32951d2..46d918611a 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
@@ -1,6 +1,6 @@
 ##  @file

 #  Provides interface to advanced shell functionality for parsing both handle and protocol database.

-#  Copyright (c) 2010, Intel Corporation. All rights reserved. <BR>

+#  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved. <BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -149,6 +149,7 @@
   gEfiGlobalVariableGuid

   gEfiPartTypeSystemPartGuid

   gEfiPartTypeLegacyMbrGuid

+  gHandleParsingHiiGuid

 

 [Pcd.common]

   gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize     # ALWAYS_CONSUMED

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
index b54d8e1f28..9ab5d89748 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
@@ -16,10 +16,6 @@
 

 STATIC CONST CHAR16 mFileName[] = L"Debug1Commands";

 EFI_HANDLE gShellDebug1HiiHandle = NULL;

-CONST EFI_GUID gShellDebug1HiiGuid = \

-  { \

-    0x25f200aa, 0xd3cb, 0x470a, { 0xbf, 0x51, 0xe7, 0xd1, 0x62, 0xd2, 0x2e, 0x6f } \

-  };

 

 /**

   Gets the debug file name.  This will be used if HII is not working.

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h
index 7cabfe3278..bbc539126b 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h
@@ -22,6 +22,7 @@
 #include <Guid/ConsoleInDevice.h>

 #include <Guid/ConsoleOutDevice.h>

 #include <Guid/FileSystemInfo.h>

+#include <Guid/ShellLibHiiGuid.h>

 

 #include <Protocol/EfiShell.h>

 #include <Protocol/EfiShellParameters.h>

@@ -60,7 +61,6 @@
 

 

 extern        EFI_HANDLE                        gShellDebug1HiiHandle;

-extern CONST  EFI_GUID                          gShellDebug1HiiGuid;

 

 /**

   Function printing hex output to the console.

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
index f773cb600f..6452543676 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
@@ -1,7 +1,7 @@
 ##  @file

 # Provides shell Debug1 profile functions

 #

-# Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -135,4 +135,4 @@
   gEfiSalSystemTableGuid

   gEfiAcpi10TableGuid

   gEfiAcpi20TableGuid

-

+  gShellDebug1HiiGuid

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.c
index 109fa72178..957fde9b8d 100644
--- 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;

 BOOLEAN    gInReconnect = FALSE;

 

-CONST EFI_GUID gShellDriver1HiiGuid = \

-  { \

-  0xaf0b742, 0x63ec, 0x45bd, {0x8d, 0xb6, 0x71, 0xad, 0x7f, 0x2f, 0xe8, 0xe8} \

-  };

-

 /**

   Function to return the name of the file containing help if HII will not be used.

 

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h
index 61754a5477..19633a4b71 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h
@@ -21,6 +21,7 @@
 #include <Guid/GlobalVariable.h>

 #include <Guid/ConsoleInDevice.h>

 #include <Guid/ConsoleOutDevice.h>

+#include <Guid/ShellLibHiiGuid.h>

 

 #include <Protocol/EfiShell.h>

 #include <Protocol/EfiShellParameters.h>

@@ -57,7 +58,6 @@
 

 

 extern        EFI_HANDLE                        gShellDriver1HiiHandle;

-extern CONST  EFI_GUID                          gShellDriver1HiiGuid;

 extern        BOOLEAN                           gInReconnect;

 

 /**

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
index c02b5e2d80..2050c71ecd 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
@@ -1,7 +1,7 @@
 ##  @file

 # Provides shell driver1 profile functions

 #

-# Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -70,4 +70,4 @@
   gEfiGlobalVariableGuid                          # ALWAYS_CONSUMED

   gEfiConsoleInDeviceGuid                         # ALWAYS_CONSUMED

   gEfiConsoleOutDeviceGuid                        # ALWAYS_CONSUMED

-

+  gShellDriver1HiiGuid                            ## PRODUCES

diff --git a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.c b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.c
index 28a9a9c326..b7f0878b73 100644
--- a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.c
@@ -16,10 +16,6 @@
 

 STATIC CONST CHAR16 mFileName[] = L"ShellCommands";

 EFI_HANDLE gShellInstall1HiiHandle = NULL;

-CONST EFI_GUID gShellInstall1HiiGuid = \

-  { \

-    0x7d574d54, 0xd364, 0x4d4a, { 0x95, 0xe3, 0x49, 0x45, 0xdb, 0x7a, 0xd3, 0xee } \

-  };

 

 /**

   Function to get the filename with help context if HII will not be used.

diff --git a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.h b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.h
index 48dcd4c2fc..09207c0698 100644
--- a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.h
@@ -18,6 +18,8 @@
 #include <Uefi.h>

 #include <ShellBase.h>

 

+#include <Guid/ShellLibHiiGuid.h>

+

 #include <Protocol/EfiShell.h>

 #include <Protocol/EfiShellParameters.h>

 #include <Protocol/DevicePath.h>

@@ -40,7 +42,6 @@
 #include <Library/FileHandleLib.h>

 

 extern        EFI_HANDLE                        gShellInstall1HiiHandle;

-extern CONST  EFI_GUID                          gShellInstall1HiiGuid;

 

 /**

   Function for 'bcfg' command.

diff --git a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
index 5c7fb4eb03..5188a00384 100644
--- a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
@@ -1,7 +1,7 @@
 ##  @file

 #  Provides shell install1 functions

 #

-#  Copyright (c) 2010, Intel Corporation. All rights reserved. <BR>

+#  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved. <BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -49,3 +49,5 @@
 [Pcd]

   gEfiShellPkgTokenSpaceGuid.PcdShellProfileMask # ALWAYS_CONSUMED

 

+[Guids]

+  gShellInstall1HiiGuid

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c
index 7fc8690ceb..a9dd6ccdab 100644
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c
@@ -16,11 +16,6 @@
 

 STATIC CONST CHAR16 mFileName[] = L"ShellCommands";

 EFI_HANDLE gShellLevel1HiiHandle = NULL;

-CONST EFI_GUID gShellLevel1HiiGuid = \

-  { \

-    0xdec5daa4, 0x6781, 0x4820, { 0x9c, 0x63, 0xa7, 0xb0, 0xe4, 0xf1, 0xdb, 0x31 }

-  };

-

 

 /**

   Return the help text filename.  Only used if no HII information found.

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h
index e8439e7a8b..b0ef503158 100644
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h
@@ -18,6 +18,8 @@
 #include <Uefi.h>

 #include <ShellBase.h>

 

+#include <Guid/ShellLibHiiGuid.h>

+

 #include <Protocol/EfiShell.h>

 #include <Protocol/EfiShellParameters.h>

 #include <Protocol/DevicePath.h>

@@ -40,7 +42,6 @@
 #include <Library/FileHandleLib.h>

 

 extern        EFI_HANDLE                        gShellLevel1HiiHandle;

-extern CONST  EFI_GUID                          gShellLevel1HiiGuid;

 

 /**

   Function for 'stall' command.

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
index 3a62cc3c8e..02b1627b4f 100644
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
@@ -54,3 +54,6 @@
 

 [Pcd.common]

   gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel # ALWAYS_CONSUMED

+

+[Guids]

+  gShellLevel1HiiGuid

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
index ce3d87ba50..6bdc39f08b 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
@@ -36,10 +36,6 @@
 

 CONST CHAR16 mFileName[] = L"ShellCommands";

 EFI_HANDLE gShellLevel2HiiHandle = NULL;

-CONST EFI_GUID gShellLevel2HiiGuid = \

-  { \

-    0xf95a7ccc, 0x4c55, 0x4426, { 0xa7, 0xb4, 0xdc, 0x89, 0x61, 0x95, 0xb, 0xae } \

-  };

 

 /**

   Get the filename to get help text from if not using HII.

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
index 80f6d59ee9..2018247573 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
@@ -26,6 +26,8 @@
 #include <Uefi.h>

 #include <ShellBase.h>

 

+#include <Guid/ShellLibHiiGuid.h>

+

 #include <Protocol/EfiShell.h>

 #include <Protocol/EfiShellParameters.h>

 #include <Protocol/DevicePath.h>

@@ -50,7 +52,6 @@
 

 extern CONST  CHAR16                            mFileName[];

 extern        EFI_HANDLE                        gShellLevel2HiiHandle;

-extern CONST  EFI_GUID                          gShellLevel2HiiGuid;

 

 /**

   Function for 'attrib' command.

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
index 52dc28feb2..5787c817f9 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
@@ -82,3 +82,4 @@
 [Guids]

   gEfiFileSystemInfoGuid

   gEfiFileInfoGuid

+  gShellLevel2HiiGuid
\ No newline at end of file
diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.c
index 3c4fe54260..e784872d63 100644
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.c
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.c
@@ -15,10 +15,6 @@
 

 CONST CHAR16 gShellLevel3FileName[] = L"ShellCommands";

 EFI_HANDLE gShellLevel3HiiHandle = NULL;

-STATIC CONST EFI_GUID gShellLevel3HiiGuid = \

-  { \

-    0x4344558d, 0x4ef9, 0x4725, { 0xb1, 0xe4, 0x33, 0x76, 0xe8, 0xd6, 0x97, 0x4f } \

-  };

 

 /**

   return the filename to get help from is not using HII.

diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.h b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.h
index bab34a412d..5636d497c0 100644
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.h
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.h
@@ -18,6 +18,8 @@
 #include <Uefi.h>

 #include <ShellBase.h>

 

+#include <Guid/ShellLibHiiGuid.h>

+

 #include <Protocol/EfiShell.h>

 #include <Protocol/EfiShellParameters.h>

 #include <Protocol/DevicePath.h>

diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
index 16c6f7a2b3..936476d0d5 100644
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
@@ -2,7 +2,7 @@
 # Provides shell level 3 functions

 # Note that the interactive versions of the time, date, and timezone functions are handled in the level 2 library.

 #

-# Copyright (c) 2009-2010, Intel Corporation. All rights reserved. <BR>

+# Copyright (c) 2009-2011, Intel Corporation. All rights reserved. <BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -61,6 +61,7 @@
 

 [Guids]

   gEfiFileInfoGuid

+  gShellLevel3HiiGuid

 

 [Pcd.common]

   gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel

diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.c b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.c
index b0de1ae694..49849a6191 100644
--- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.c
@@ -15,10 +15,6 @@
 

 CONST CHAR16 gShellNetwork1FileName[] = L"ShellCommands";

 EFI_HANDLE gShellNetwork1HiiHandle = NULL;

-STATIC CONST EFI_GUID gShellNetwork1HiiGuid = \

-  { \

-    0xf3d301bb, 0xf4a5, 0x45a8, { 0xb0, 0xb7, 0xfa, 0x99, 0x9c, 0x62, 0x37, 0xae } \

-  };

 

 /**

   return the file name of the help text file if not using HII.

diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.h b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.h
index 1093479f83..68a7c93c96 100644
--- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.h
@@ -19,6 +19,8 @@
 #include <Uefi.h>

 #include <ShellBase.h>

 

+#include <Guid/ShellLibHiiGuid.h>

+

 #include <Protocol/Cpu.h>

 #include <Protocol/ServiceBinding.h>

 #include <Protocol/Ip6.h>

diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
index 5a6ddbf6ed..4857a7e795 100644
--- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
@@ -61,4 +61,7 @@
 

   gEfiIp6ProtocolGuid                           # SOMETIMES_CONSUMED

   gEfiIp6ServiceBindingProtocolGuid             # SOMETIMES_CONSUMED

-  gEfiIp6ConfigProtocolGuid                     # SOMETIMES_CONSUMED
\ No newline at end of file
+  gEfiIp6ConfigProtocolGuid                     # SOMETIMES_CONSUMED

+  

+[Guids]

+  gShellNetwork1HiiGuid
\ No newline at end of file
diff --git a/ShellPkg/ShellPkg.dec b/ShellPkg/ShellPkg.dec
index e83b6cf504..a96e606773 100644
--- a/ShellPkg/ShellPkg.dec
+++ b/ShellPkg/ShellPkg.dec
@@ -51,7 +51,15 @@
   gShellVariableGuid              = {0x158def5a, 0xf656, 0x419c, {0xb0, 0x27, 0x7a, 0x31, 0x92, 0xc0, 0x79, 0xd2}}

   gShellMapGuid                   = {0x51271e13, 0x7de3, 0x43af, {0x8b, 0xc2, 0x71, 0xad, 0x3b, 0x82, 0x43, 0x25}}

   gShellAliasGuid                 = {0x0053d9d6, 0x2659, 0x4599, {0xa2, 0x6b, 0xef, 0x45, 0x36, 0xe6, 0x31, 0xa9}}

-

+  gHandleParsingHiiGuid           = {0xb8969637, 0x81de, 0x43af, {0xbc, 0x9a, 0x24, 0xd9, 0x89, 0x13, 0xf2, 0xf6}}

+  gShellDebug1HiiGuid             = {0x25f200aa, 0xd3cb, 0x470a, {0xbf, 0x51, 0xe7, 0xd1, 0x62, 0xd2, 0x2e, 0x6f}}

+  gShellDriver1HiiGuid            = {0xaf0b742, 0x63ec, 0x45bd, {0x8d, 0xb6, 0x71, 0xad, 0x7f, 0x2f, 0xe8, 0xe8}}

+  gShellInstall1HiiGuid           = {0x7d574d54, 0xd364, 0x4d4a, {0x95, 0xe3, 0x49, 0x45, 0xdb, 0x7a, 0xd3, 0xee}}

+  gShellLevel1HiiGuid             = {0xdec5daa4, 0x6781, 0x4820, {0x9c, 0x63, 0xa7, 0xb0, 0xe4, 0xf1, 0xdb, 0x31}}

+  gShellLevel2HiiGuid             = {0xf95a7ccc, 0x4c55, 0x4426, {0xa7, 0xb4, 0xdc, 0x89, 0x61, 0x95, 0xb, 0xae}}

+  gShellLevel3HiiGuid             = {0x4344558d, 0x4ef9, 0x4725, {0xb1, 0xe4, 0x33, 0x76, 0xe8, 0xd6, 0x97, 0x4f}}

+  gShellNetwork1HiiGuid           = {0xf3d301bb, 0xf4a5, 0x45a8, {0xb0, 0xb7, 0xfa, 0x99, 0x9c, 0x62, 0x37, 0xae}}

+  

 [Protocols]

   gEfiShellProtocolGuid           = {0x6302d008, 0x7f9b, 0x4f30, {0x87, 0xac, 0x60, 0xc9, 0xfe, 0xf5, 0xda, 0x4e}}

   gEfiShellParametersProtocolGuid = {0x752f3136, 0x4e16, 0x4fdc, {0xa2, 0x2a, 0xe5, 0xf4, 0x68, 0x12, 0xf4, 0xca}}