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.
3. Move two EBC protocols for debug purpose from EBC driver to MdeModulePkg Include directory. 

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



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

2 files changed, 6 insertions, 9 deletions

diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.c b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.c
index 9d28c40ab0..adce780e09 100644
--- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.c
+++ b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.c
@@ -2,7 +2,7 @@
 This is an example of how a driver retrieve HII data using HII Package List

 Protocol, and how to publish the HII data.

 

-Copyright (c) 2009, 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

 which accompanies this distribution.  The full text of the license may be found at

@@ -14,6 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/

 

 #include <Uefi.h>

+#include <Guid/HiiResourceSampleHii.h>

 #include <Protocol/HiiPackageList.h>

 #include <Library/DevicePathLib.h>

 #include <Library/UefiDriverEntryPoint.h>

@@ -45,10 +46,7 @@ HII_VENDOR_DEVICE_PATH  mHiiVendorDevicePath = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)

       }

     },

-    //

-    // {D49D2EB0-44D5-4621-9FD6-1A92C9109B99}

-    //

-    { 0xD49D2EB0, 0x44D5, 0x4621, { 0x9F, 0xD6, 0x1A, 0x92, 0xC9, 0x10, 0x9B, 0x99 } }

+    HII_RESOURCE_SAMPLE_FORM_SET_GUID

   },

   {

     END_DEVICE_PATH_TYPE,

diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/Sample.vfr b/MdeModulePkg/Universal/HiiResourcesSampleDxe/Sample.vfr
index 9c7d5a47bf..3ca20988e8 100644
--- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/Sample.vfr
+++ b/MdeModulePkg/Universal/HiiResourcesSampleDxe/Sample.vfr
@@ -1,6 +1,6 @@
 // *++

 //

-// Copyright (c) 2009, 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

 // which accompanies this distribution.  The full text of the license may be found at

@@ -21,11 +21,10 @@
 //

 // --*/

 

-#define SAMPLE_GUID    { 0x4f4ef7f0, 0xaa29, 0x4ce9, 0xba, 0x41, 0x64, 0x3e, 0x1, 0x23, 0xa9, 0x9f }

-

+#include <Guid/HiiResourceSampleHii.h>

 

 formset

-  guid     = SAMPLE_GUID,

+  guid     = HII_RESOURCE_SAMPLE_FORM_SET_GUID,

   title    = STRING_TOKEN(STR_SAMPLE_FORM_SET_TITLE),

   help     = STRING_TOKEN(STR_SAMPLE_FORM_SET_HELP),