From 5c5afa7265732c3a0ed3990b685b1512e10c011e Mon Sep 17 00:00:00 2001 From: lgao4 Date: Wed, 21 Sep 2011 02:50:24 +0000 Subject: Remove EFI_USER_INFO_ACCESS_SETUP_ADMIN_GUID definition from MdeModulePkg, because it has been defined in MdePkg. And, keep its definition into MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr to let VFR file consume it. Signed-off-by: lgao4 git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12395 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Include/Guid/DriverSampleHii.h | 4 ---- MdeModulePkg/MdeModulePkg.dec | 1 - MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr | 3 +++ 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/MdeModulePkg/Include/Guid/DriverSampleHii.h b/MdeModulePkg/Include/Guid/DriverSampleHii.h index 01c571f..b5e1dbc 100644 --- a/MdeModulePkg/Include/Guid/DriverSampleHii.h +++ b/MdeModulePkg/Include/Guid/DriverSampleHii.h @@ -25,9 +25,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. 0xb3f56470, 0x6141, 0x4621, {0x8f, 0x19, 0x70, 0x4e, 0x57, 0x7a, 0xa9, 0xe8} \ } -#define EFI_USER_INFO_ACCESS_SETUP_ADMIN_GUID \ - { 0x85b75607, 0xf7ce, 0x471e, { 0xb7, 0xe4, 0x2a, 0xea, 0x5f, 0x72, 0x32, 0xee } } - #define EFI_IFR_REFRESH_ID_OP_GUID \ { \ 0xF5E655D9, 0x02A6, 0x46f2, {0x9E, 0x76, 0xB8, 0xBE, 0x8E, 0x60, 0xAB, 0x22} \ @@ -35,7 +32,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. extern EFI_GUID gDriverSampleFormSetGuid; extern EFI_GUID gDriverSampleInventoryGuid; -extern EFI_GUID gEfiUserInfoAccessSetupAdminGuid; extern EFI_GUID gEfiIfrRefreshIdOpGuid; #endif diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 4097292..f9a19f9 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -216,7 +216,6 @@ ## Include/Guid/DriverSampleHii.h gDriverSampleFormSetGuid = { 0xA04A27f4, 0xDF00, 0x4D42, { 0xB5, 0x52, 0x39, 0x51, 0x13, 0x02, 0x11, 0x3D }} gDriverSampleInventoryGuid = { 0xb3f56470, 0x6141, 0x4621, { 0x8f, 0x19, 0x70, 0x4e, 0x57, 0x7a, 0xa9, 0xe8 }} - gEfiUserInfoAccessSetupAdminGuid = { 0x85b75607, 0xf7ce, 0x471e, { 0xb7, 0xe4, 0x2a, 0xea, 0x5f, 0x72, 0x32, 0xee }} gEfiIfrRefreshIdOpGuid = { 0xF5E655D9, 0x02A6, 0x46f2, { 0x9E, 0x76, 0xB8, 0xBE, 0x8E, 0x60, 0xAB, 0x22 }} ## Include/Guid/PlatDriOverrideHii.h diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr index 78c93d0..cedb665 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr +++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr @@ -43,6 +43,9 @@ #define EFI_VARIABLE_RUNTIME_ACCESS 0x00000004 #define EFI_VARIABLE_READ_ONLY 0x00000008 +#define EFI_USER_INFO_ACCESS_SETUP_ADMIN_GUID \ + { 0x85b75607, 0xf7ce, 0x471e, { 0xb7, 0xe4, 0x2a, 0xea, 0x5f, 0x72, 0x32, 0xee } } + // // Labels definition // -- cgit v1.1