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

2 files changed, 12 insertions, 23 deletions

diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c b/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
index e4ab9557a1..8cfc8fb93c 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
@@ -25,14 +25,6 @@ EFI_DRIVER_BINDING_PROTOCOL gPxeBcDriverBinding = {
   NULL

 };

 

-//

-// PXE_PRIVATE_GUID is only used to keep the relationship between 

-// NIC handle and virtual child handles.

-//

-EFI_GUID mPxeBcPrivateGuid = PXEBC_PRIVATE_GUID;

-

-

-

 /**

   Get the Nic handle using any child handle in the IPv4 stack.

 

@@ -237,7 +229,7 @@ PxeBcDestroyIp4Children (
     //

     gBS->CloseProtocol (

            Private->Controller,

-           &mPxeBcPrivateGuid,

+           &gEfiCallerIdGuid,

            This->DriverBindingHandle,

            Private->Ip4Nic->Controller

            );

@@ -397,7 +389,7 @@ PxeBcDestroyIp6Children (
     //

     gBS->CloseProtocol (

            Private->Controller,

-           &mPxeBcPrivateGuid,

+           &gEfiCallerIdGuid,

            This->DriverBindingHandle,

            Private->Ip6Nic->Controller

            );

@@ -722,7 +714,7 @@ PxeBcCreateIp4Children (
   //

   Status = gBS->OpenProtocol (

                   ControllerHandle,

-                  &mPxeBcPrivateGuid,

+                  &gEfiCallerIdGuid,

                   (VOID **) &Id,

                   This->DriverBindingHandle,

                   Private->Ip4Nic->Controller,

@@ -1030,7 +1022,7 @@ PxeBcCreateIp6Children (
   //

   Status = gBS->OpenProtocol (

                   ControllerHandle,

-                  &mPxeBcPrivateGuid,

+                  &gEfiCallerIdGuid,

                   (VOID **) &Id,

                   This->DriverBindingHandle,

                   Private->Ip6Nic->Controller,

@@ -1214,7 +1206,7 @@ PxeBcDriverBindingStart (
 

   Status = gBS->OpenProtocol (

                   ControllerHandle,

-                  &mPxeBcPrivateGuid,

+                  &gEfiCallerIdGuid,

                   (VOID **) &Id,

                   This->DriverBindingHandle,

                   ControllerHandle,

@@ -1282,10 +1274,13 @@ PxeBcDriverBindingStart (
 

     //

     // Install PxeBaseCodePrivate protocol onto the real NIC handler.

+    // PxeBaseCodePrivate protocol is only used to keep the relationship between 

+    // NIC handle and virtual child handles.

+    // gEfiCallerIdGuid will be used as its protocol guid.

     //

     Status = gBS->InstallProtocolInterface (

                     &ControllerHandle,

-                    &mPxeBcPrivateGuid,

+                    &gEfiCallerIdGuid,

                     EFI_NATIVE_INTERFACE,

                     &Private->Id

                     );

@@ -1322,7 +1317,7 @@ PxeBcDriverBindingStart (
 ON_ERROR:

   gBS->UninstallProtocolInterface (

          ControllerHandle,

-         &mPxeBcPrivateGuid,

+         &gEfiCallerIdGuid,

          &Private->Id

          );

   PxeBcDestroyIp4Children (This, Private);

@@ -1403,7 +1398,7 @@ PxeBcDriverBindingStop (
     //

     Status = gBS->OpenProtocol (

                     NicHandle,

-                    &mPxeBcPrivateGuid,

+                    &gEfiCallerIdGuid,

                     (VOID **) &Id,

                     This->DriverBindingHandle,

                     ControllerHandle,

@@ -1459,7 +1454,7 @@ PxeBcDriverBindingStop (
   if (Private->Ip4Nic == NULL && Private->Ip6Nic == NULL) {

     gBS->UninstallProtocolInterface (

            NicHandle,

-           &mPxeBcPrivateGuid,

+           &gEfiCallerIdGuid,

            &Private->Id

            );

     FreePool (Private);

diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.h b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.h
index 04e0617c6e..0b0ff1c06a 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.h
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.h
@@ -77,12 +77,6 @@ typedef struct _PXEBC_VIRTUAL_NIC   PXEBC_VIRTUAL_NIC;
 #define PXEBC_PRIVATE_DATA_FROM_ID(a)         CR (a, PXEBC_PRIVATE_DATA, Id, PXEBC_PRIVATE_DATA_SIGNATURE)

 #define PXEBC_VIRTUAL_NIC_FROM_LOADFILE(a)    CR (a, PXEBC_VIRTUAL_NIC, LoadFile, PXEBC_VIRTUAL_NIC_SIGNATURE)

 

-#define PXEBC_PRIVATE_GUID  \

-  { \

-    0xa4dfac32, 0xfbb4, 0x4907,{0xb3, 0x13, 0x4, 0xe, 0xe2, 0x42, 0x33, 0x20 }  \

-  }

-

-

 typedef union {

   PXEBC_DHCP4_PACKET_CACHE            Dhcp4;

   PXEBC_DHCP6_PACKET_CACHE            Dhcp6;