Clean up the private GUID definition in module Level.

0. Remove the unused private GUID from module source files.
1. Use gEfiCallerIdGuid replace of the private module GUID.
2. Add the public header files to define HII FormSet and PackageList GUID used in every HII driver.

Signed-off-by: lgao4
Reviewed-by: ydong10 gdong1 tye jfan12 wli12 rsun3 jyao1 ftian



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12376 6f19259b-4bc3-4df7-8a09-765794883524

6 files changed, 5 insertions, 23 deletions

diff --git a/NetworkPkg/Application/IfConfig6/IfConfig6.c b/NetworkPkg/Application/IfConfig6/IfConfig6.c
index 7a1b2c87f6..a2a3582277 100644
--- a/NetworkPkg/Application/IfConfig6/IfConfig6.c
+++ b/NetworkPkg/Application/IfConfig6/IfConfig6.c
@@ -29,7 +29,6 @@
 

 EFI_HII_HANDLE      mHiiHandle;

 

-EFI_GUID            mEfiIfConfig6Guid     = EFI_IFCONFIG6_GUID;

 SHELL_PARAM_ITEM    mIfConfig6CheckList[] = {

   {

     L"-b",

diff --git a/NetworkPkg/Application/IfConfig6/IfConfig6.h b/NetworkPkg/Application/IfConfig6/IfConfig6.h
index eea7df55d1..ad3a77566a 100644
--- a/NetworkPkg/Application/IfConfig6/IfConfig6.h
+++ b/NetworkPkg/Application/IfConfig6/IfConfig6.h
@@ -1,7 +1,7 @@
 /** @file

   The interface function declaration of shell application IfConfig6.

 

-  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

@@ -16,11 +16,6 @@
 #ifndef _IFCONFIG6_H_

 #define _IFCONFIG6_H_

 

-#define EFI_IFCONFIG6_GUID \

-  { \

-    0xbab7296b, 0x222c, 0x4408, {0x9e, 0x6c, 0xc2, 0x5c, 0x18, 0x7e, 0xff, 0x33} \

-  }

-

 enum {

   IfConfig6OpList     = 1,

   IfConfig6OpSet      = 2,

diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
index 44a1a0cbd4..e4f6057f40 100644
--- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
+++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
@@ -1,7 +1,7 @@
 /** @file

   The main process for IpSecConfig application.

 

-  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

@@ -232,7 +232,6 @@ STR2INT mMapAuthMethod[] = {
 EFI_IPSEC2_PROTOCOL          *mIpSec;

 EFI_IPSEC_CONFIG_PROTOCOL    *mIpSecConfig;

 EFI_HII_HANDLE               mHiiHandle;

-EFI_GUID                     mEfiIpSecConfigGuid = EFI_IPSEC_CONFIG_GUID;

 CHAR16                       mAppName[]          = L"IpSecConfig";

 

 //

diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.h b/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
index 1ab57b56cc..17044fef79 100644
--- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
+++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
@@ -1,7 +1,7 @@
 /** @file

   The internal structure and function declaration in IpSecConfig application.

 

-  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

@@ -26,11 +26,6 @@
 

 #include <Protocol/IpSecConfig.h>

 

-#define EFI_IPSEC_CONFIG_GUID \

-  { \

-    0x9db0c3ac, 0xd9d2, 0x4f96, {0x9e, 0xd7, 0x6d, 0xa6, 0x12, 0xa4, 0xf3, 0x27} \

-  }

-

 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))

 

 #define IPSECCONFIG_STATUS_NAME    L"IpSecStatus"

diff --git a/NetworkPkg/Application/Ping6/Ping6.c b/NetworkPkg/Application/Ping6/Ping6.c
index 345d3b90fd..e0f6cd89e5 100644
--- a/NetworkPkg/Application/Ping6/Ping6.c
+++ b/NetworkPkg/Application/Ping6/Ping6.c
@@ -1,7 +1,7 @@
 /** @file

   The implementation for Ping6 application.

 

-  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

@@ -58,7 +58,6 @@ SHELL_PARAM_ITEM    Ping6ParamList[] = {
 EFI_HII_HANDLE    mHiiHandle;

 CONST CHAR16      *mIp6DstString;

 CONST CHAR16      *mIp6SrcString;

-EFI_GUID          mEfiPing6Guid = EFI_PING6_GUID;

 UINT64            mFrequency = 0;

 /**

   Get and caculate the frequency in tick/ms.

diff --git a/NetworkPkg/Application/Ping6/Ping6.h b/NetworkPkg/Application/Ping6/Ping6.h
index 914e5e46e1..b152ff18bc 100644
--- a/NetworkPkg/Application/Ping6/Ping6.h
+++ b/NetworkPkg/Application/Ping6/Ping6.h
@@ -1,7 +1,7 @@
 /** @file

   The interface function declaration of shell application Ping6 (Ping for v6 series).

 

-  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

@@ -16,11 +16,6 @@
 #ifndef _PING6_H_

 #define _PING6_H_

 

-#define EFI_PING6_GUID \

-  { \

-    0x3f0b2478, 0x3619, 0x46c5, {0x81, 0x50, 0xa5, 0xab, 0xdd, 0xb6, 0x6b, 0xd9} \

-  }

-

 #define PING6_DEFAULT_TIMEOUT      5000

 #define PING6_MAX_SEND_NUMBER      10000

 #define PING6_MAX_BUFFER_SIZE      32768