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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf
index 7b19fddb53290b29daa8d094272c7aff57899a58..19821a783b7c824f3c9ad57d5a38ac65ecc8e921 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf
@@ -7,7 +7,7 @@
 # data format complying to UEFI HII specification.\r
 #\r
 # This module inits HII database and installs HII protocol based on the avaliable UEFI HII protocol found in the platform..\r
 # data format complying to UEFI HII specification.\r
 #\r
 # This module inits HII database and installs HII protocol based on the avaliable UEFI HII protocol found in the platform..\r

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

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -85,6 +85,7 @@
   gEfiIfrTianoGuid\r
   gEfiIfrFrameworkGuid\r
   gEfiHiiStandardFormGuid\r
   gEfiIfrTianoGuid\r
   gEfiIfrFrameworkGuid\r
   gEfiHiiStandardFormGuid\r

+  gFrameworkBdsFrontPageFormsetGuid\r

 \r
 [Protocols]\r
   gEfiHiiImageProtocolGuid\r
 \r
 [Protocols]\r
   gEfiHiiImageProtocolGuid\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
index 6d17e793a083a06e39cb181cf14c32646a1ba92d..d86572a7778332e04b4b68b6c4d9516a495a3019 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
@@ -3,7 +3,7 @@
   This file contains global defines and prototype definitions\r
   for the Framework HII to Uefi HII Thunk Module.\r
   \r
   This file contains global defines and prototype definitions\r
   for the Framework HII to Uefi HII Thunk Module.\r
   \r

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

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


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

+#include <Guid/FrameworkBdsFrontPageFormSet.h>\r

 \r
 #include <Library/BaseLib.h>\r
 #include <Library/DebugLib.h>\r
 \r
 #include <Library/BaseLib.h>\r
 #include <Library/DebugLib.h>\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c
index e427b6b98d949491476d8eaa0044ee94ac9ce085..1a8219ac46a311fa8b1e7b5f4cc1e3290610dde2 100644 (file)
--- 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\r
 to produce a EFI_FORM_BROWSER_PROTOCOL.\r
 \r
 Framework to UEFI 2.1 Setup Browser Thunk. The file consume EFI_FORM_BROWSER2_PROTOCOL\r
 to produce a EFI_FORM_BROWSER_PROTOCOL.\r
 \r

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

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


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

-EFI_GUID gFrameworkBdsFrontPageFormsetGuid = FRAMEWORK_BDS_FRONTPAGE_FORMSET_GUID;\r

 EFI_HII_HANDLE gStringPackHandle = NULL;\r
 BOOLEAN mFrontPageDisplayed = FALSE;\r
 //\r
 EFI_HII_HANDLE gStringPackHandle = NULL;\r
 BOOLEAN mFrontPageDisplayed = FALSE;\r
 //\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.h
index 339b188bc33794b799aa02426f058f0e62018601..58983da497eafe3736f9cd422362438269aab5c1 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.h
@@ -1,7 +1,7 @@
 /** @file\r
   This file contains macros to be included by SetupBrowser.c.\r
   \r
 /** @file\r
   This file contains macros to be included by SetupBrowser.c.\r
   \r

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

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


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

-//\r
-// In order to follow UEFI spec to do auto booting after a time-out, the GUID of Formset of Frontpage must match this value.\r
-//\r
-#define FRAMEWORK_BDS_FRONTPAGE_FORMSET_GUID  { 0x9e0c30bc, 0x3f06, 0x4ba6, {0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe }}\r
-\r

 #define ONE_SECOND  10000000\r
 \r
 #endif\r
 #define ONE_SECOND  10000000\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Compatibility/Include/Guid/FrameworkBdsFrontPageFormSet.h b/EdkCompatibilityPkg/Compatibility/Include/Guid/FrameworkBdsFrontPageFormSet.h
new file mode 100644 (file)
index 0000000..cedc2a8
--- /dev/null
+++ b/EdkCompatibilityPkg/Compatibility/Include/Guid/FrameworkBdsFrontPageFormSet.h
@@ -0,0 +1,24 @@
+/** @file\r
+  Framework BDS FrontPage FormSet GUID. It will be used when HiiThunk works with Framework BDS driver.\r
+  \r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php.\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+**/\r
+#ifndef __FRAMEWORK_BDS_FRONTPAGE_FORMSET_H__\r
+#define __FRAMEWORK_BDS_FRONTPAGE_FORMSET_H__\r
+\r
+//\r
+// In order to follow UEFI spec to do auto booting after a time-out, the GUID of Formset of Frontpage must match this value.\r
+//\r
+#define FRAMEWORK_BDS_FRONTPAGE_FORMSET_GUID  { 0x9e0c30bc, 0x3f06, 0x4ba6, {0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe }}\r
+\r
+extern EFI_GUID gFrameworkBdsFrontPageFormsetGuid;\r
+\r
+#endif\r

diff --git a/EdkCompatibilityPkg/EdkCompatibilityPkg.dec b/EdkCompatibilityPkg/EdkCompatibilityPkg.dec
index 293d1a0c2d6a5cee976614d19d77488ae821a6ad..21fe884484b743f284446a1d862b1bb0d02dba1d 100644 (file)
--- a/EdkCompatibilityPkg/EdkCompatibilityPkg.dec
+++ b/EdkCompatibilityPkg/EdkCompatibilityPkg.dec
@@ -36,6 +36,7 @@
   gEfiSmmBaseThunkCommunicationGuid       = { 0x6568a3d6, 0x15f, 0x4b4a, { 0x9c, 0x89, 0x1d, 0x14, 0x63, 0x14, 0x13, 0xa } }\r
   gEfiBootStateGuid                       = { 0x60b5e939, 0xfcf, 0x4227, { 0xba, 0x83, 0x6b, 0xbe, 0xd4, 0x5b, 0xc0, 0xe3 } }\r
   gEfiEdkCompatibilityPkgTokenSpaceGuid   = { 0x2354d320, 0x3eb3, 0x4c81, { 0x99, 0xf4, 0xcc, 0x4a, 0xe1, 0x43, 0x46, 0x3e }}\r
   gEfiSmmBaseThunkCommunicationGuid       = { 0x6568a3d6, 0x15f, 0x4b4a, { 0x9c, 0x89, 0x1d, 0x14, 0x63, 0x14, 0x13, 0xa } }\r
   gEfiBootStateGuid                       = { 0x60b5e939, 0xfcf, 0x4227, { 0xba, 0x83, 0x6b, 0xbe, 0xd4, 0x5b, 0xc0, 0xe3 } }\r
   gEfiEdkCompatibilityPkgTokenSpaceGuid   = { 0x2354d320, 0x3eb3, 0x4c81, { 0x99, 0xf4, 0xcc, 0x4a, 0xe1, 0x43, 0x46, 0x3e }}\r

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

 \r
 [Ppis]\r
   gEcpPeiPciCfgPpiGuid                    = { 0xb0ee53d4, 0xa049, 0x4a79, { 0xb2, 0xff, 0x19, 0xd9, 0xfa, 0xef, 0xaa, 0x94 }} \r
 \r
 [Ppis]\r
   gEcpPeiPciCfgPpiGuid                    = { 0xb0ee53d4, 0xa049, 0x4a79, { 0xb2, 0xff, 0x19, 0xd9, 0xfa, 0xef, 0xaa, 0x94 }} \r