Clean up the private GUID definition in module Level.

Signed-off-by: lgao4

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

6 files changed, 31 insertions, 10 deletions

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf
index 7b19fddb53..19821a783b 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf
@@ -7,7 +7,7 @@
 # data format complying to UEFI HII specification.

 #

 # This module inits HII database and installs HII protocol based on the avaliable UEFI HII protocol found in the platform..

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

+# Copyright (c) 2006 - 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

@@ -85,6 +85,7 @@
   gEfiIfrTianoGuid

   gEfiIfrFrameworkGuid

   gEfiHiiStandardFormGuid

+  gFrameworkBdsFrontPageFormsetGuid

 

 [Protocols]

   gEfiHiiImageProtocolGuid

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
index 6d17e793a0..d86572a777 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
@@ -3,7 +3,7 @@
   This file contains global defines and prototype definitions

   for the Framework HII to Uefi HII Thunk Module.

   

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

+Copyright (c) 2006 - 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

@@ -36,6 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/HiiConfigAccess.h>

 #include <Protocol/UgaDraw.h>

 #include <Guid/HiiFormMapMethodGuid.h>

+#include <Guid/FrameworkBdsFrontPageFormSet.h>

 

 #include <Library/BaseLib.h>

 #include <Library/DebugLib.h>

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c
index e427b6b98d..1a8219ac46 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c
@@ -2,7 +2,7 @@
 Framework to UEFI 2.1 Setup Browser Thunk. The file consume EFI_FORM_BROWSER2_PROTOCOL

 to produce a EFI_FORM_BROWSER_PROTOCOL.

 

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

+Copyright (c) 2008 - 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

@@ -16,7 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "HiiDatabase.h"

 #include "SetupBrowser.h"

 

-EFI_GUID gFrameworkBdsFrontPageFormsetGuid = FRAMEWORK_BDS_FRONTPAGE_FORMSET_GUID;

 EFI_HII_HANDLE gStringPackHandle = NULL;

 BOOLEAN mFrontPageDisplayed = FALSE;

 //

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.h
index 339b188bc3..58983da497 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.h
@@ -1,7 +1,7 @@
 /** @file

   This file contains macros to be included by SetupBrowser.c.

   

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

+Copyright (c) 2008 - 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

@@ -15,11 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _HIITHUNK_SETUPBROWSER_H_

 #define _HIITHUNK_SETUPBROWSER_H_

 

-//

-// In order to follow UEFI spec to do auto booting after a time-out, the GUID of Formset of Frontpage must match this value.

-//

-#define FRAMEWORK_BDS_FRONTPAGE_FORMSET_GUID  { 0x9e0c30bc, 0x3f06, 0x4ba6, {0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe }}

-

 #define ONE_SECOND  10000000

 

 #endif

diff --git a/EdkCompatibilityPkg/Compatibility/Include/Guid/FrameworkBdsFrontPageFormSet.h b/EdkCompatibilityPkg/Compatibility/Include/Guid/FrameworkBdsFrontPageFormSet.h
new file mode 100644
index 0000000000..cedc2a86d5
--- /dev/null
+++ b/EdkCompatibilityPkg/Compatibility/Include/Guid/FrameworkBdsFrontPageFormSet.h
@@ -0,0 +1,24 @@
+/** @file

+  Framework BDS FrontPage FormSet GUID. It will be used when HiiThunk works with Framework BDS driver.

+  

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

+#define __FRAMEWORK_BDS_FRONTPAGE_FORMSET_H__

+

+//

+// In order to follow UEFI spec to do auto booting after a time-out, the GUID of Formset of Frontpage must match this value.

+//

+#define FRAMEWORK_BDS_FRONTPAGE_FORMSET_GUID  { 0x9e0c30bc, 0x3f06, 0x4ba6, {0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe }}

+

+extern EFI_GUID gFrameworkBdsFrontPageFormsetGuid;

+

+#endif

diff --git a/EdkCompatibilityPkg/EdkCompatibilityPkg.dec b/EdkCompatibilityPkg/EdkCompatibilityPkg.dec
index 293d1a0c2d..21fe884484 100644
--- a/EdkCompatibilityPkg/EdkCompatibilityPkg.dec
+++ b/EdkCompatibilityPkg/EdkCompatibilityPkg.dec
@@ -36,6 +36,7 @@
   gEfiSmmBaseThunkCommunicationGuid       = { 0x6568a3d6, 0x15f, 0x4b4a, { 0x9c, 0x89, 0x1d, 0x14, 0x63, 0x14, 0x13, 0xa } }

   gEfiBootStateGuid                       = { 0x60b5e939, 0xfcf, 0x4227, { 0xba, 0x83, 0x6b, 0xbe, 0xd4, 0x5b, 0xc0, 0xe3 } }

   gEfiEdkCompatibilityPkgTokenSpaceGuid   = { 0x2354d320, 0x3eb3, 0x4c81, { 0x99, 0xf4, 0xcc, 0x4a, 0xe1, 0x43, 0x46, 0x3e }}

+  gFrameworkBdsFrontPageFormsetGuid       = { 0x9e0c30bc, 0x3f06, 0x4ba6, { 0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe }}

 

 [Ppis]

   gEcpPeiPciCfgPpiGuid                    = { 0xb0ee53d4, 0xa049, 0x4a79, { 0xb2, 0xff, 0x19, 0xd9, 0xfa, 0xef, 0xaa, 0x94 }}