sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up the private GUID definition in module Level.

Browse Source 
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
This commit is contained in:
lgao4
2011-09-18 12:21:01 +00:00
parent b36d134faf
commit c8ad2d7a29
58 changed files with 755 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfig.vfr
View File

@@ -16,7 +16,7 @@
#include "VlanConfigNvData.h"
formset
guid = VLAN_CONFIG_PRIVATE_GUID,
guid = VLAN_CONFIG_FORM_SET_GUID,
title = STRING_TOKEN(STR_VLAN_FORM_SET_TITLE),
help = STRING_TOKEN(STR_VLAN_FORM_SET_TITLE_HELP),
classguid = EFI_HII_PLATFORM_SETUP_FORMSET_GUID,
@@ -24,7 +24,7 @@ formset
varstore VLAN_CONFIGURATION,
varid = VLAN_CONFIGURATION_VARSTORE_ID,
name = VlanNvData,
guid = VLAN_CONFIG_PRIVATE_GUID;
guid = VLAN_CONFIG_FORM_SET_GUID;
form formid = VLAN_HEAD_FORM_ID,
title = STRING_TOKEN(STR_VLAN_FORM_TITLE);

10
MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDriver.c
View File

@@ -15,8 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include "VlanConfigImpl.h"
EFI_GUID gVlanConfigPrivateGuid = VLAN_CONFIG_PRIVATE_GUID;
EFI_DRIVER_BINDING_PROTOCOL gVlanConfigDriverBinding = {
VlanConfigDriverBindingSupported,
VlanConfigDriverBindingStart,
@@ -136,7 +134,7 @@ VlanConfigDriverBindingStart (
//
Status = gBS->OpenProtocol (
ControllerHandle,
&gVlanConfigPrivateGuid,
&gEfiCallerIdGuid,
(VOID **) &PrivateData,
This->DriverBindingHandle,
ControllerHandle,
@@ -203,7 +201,7 @@ VlanConfigDriverBindingStart (
//
Status = gBS->InstallMultipleProtocolInterfaces (
&ControllerHandle,
&gVlanConfigPrivateGuid,
&gEfiCallerIdGuid,
PrivateData,
NULL
);
@@ -266,7 +264,7 @@ VlanConfigDriverBindingStop (
//
Status = gBS->OpenProtocol (
ControllerHandle,
&gVlanConfigPrivateGuid,
&gEfiCallerIdGuid,
(VOID **) &PrivateData,
This->DriverBindingHandle,
ControllerHandle,
@@ -287,7 +285,7 @@ VlanConfigDriverBindingStop (
//
Status = gBS->UninstallMultipleProtocolInterfaces (
ControllerHandle,
&gVlanConfigPrivateGuid,
&gEfiCallerIdGuid,
PrivateData,
NULL
);

1
MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
View File

@@ -52,6 +52,7 @@
[Guids]
gEfiIfrTianoGuid
gVlanConfigFormSetGuid
[Protocols]
gEfiHiiConfigAccessProtocolGuid ## PRODUCES

17
MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
View File

@@ -15,7 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include "VlanConfigImpl.h"
EFI_GUID mVlanFormSetGuid = VLAN_CONFIG_PRIVATE_GUID;
CHAR16 mVlanStorageName[] = L"VlanNvData";
EFI_HII_CONFIG_ROUTING_PROTOCOL *mHiiConfigRouting = NULL;
@@ -37,7 +36,7 @@ VENDOR_DEVICE_PATH mHiiVendorDevicePathNode = {
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
}
},
VLAN_CONFIG_PRIVATE_GUID
VLAN_CONFIG_FORM_SET_GUID
};
/**
@@ -89,7 +88,7 @@ VlanExtractConfig (
}
*Progress = Request;
if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mVlanFormSetGuid, mVlanStorageName)) {
if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gVlanConfigFormSetGuid, mVlanStorageName)) {
return EFI_NOT_FOUND;
}
@@ -119,7 +118,7 @@ VlanExtractConfig (
// Allocate and fill a buffer large enough to hold the <ConfigHdr> template
// followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator
//
ConfigRequestHdr = HiiConstructConfigHdr (&mVlanFormSetGuid, mVlanStorageName, PrivateData->DriverHandle);
ConfigRequestHdr = HiiConstructConfigHdr (&gVlanConfigFormSetGuid, mVlanStorageName, PrivateData->DriverHandle);
Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);
ConfigRequest = AllocateZeroPool (Size);
ASSERT (ConfigRequest != NULL);
@@ -187,7 +186,7 @@ VlanRouteConfig (
}
*Progress = Configuration;
if (!HiiIsConfigHdrMatch (Configuration, &mVlanFormSetGuid, mVlanStorageName)) {
if (!HiiIsConfigHdrMatch (Configuration, &gVlanConfigFormSetGuid, mVlanStorageName)) {
return EFI_NOT_FOUND;
}
@@ -246,7 +245,7 @@ VlanCallback (
//
Configuration = AllocateZeroPool (sizeof (VLAN_CONFIGURATION));
ASSERT (Configuration != NULL);
HiiGetBrowserData (&mVlanFormSetGuid, mVlanStorageName, sizeof (VLAN_CONFIGURATION), (UINT8 *) Configuration);
HiiGetBrowserData (&gVlanConfigFormSetGuid, mVlanStorageName, sizeof (VLAN_CONFIGURATION), (UINT8 *) Configuration);
VlanConfig = PrivateData->VlanConfig;
@@ -316,7 +315,7 @@ VlanCallback (
break;
}
HiiSetBrowserData (&mVlanFormSetGuid, mVlanStorageName, sizeof (VLAN_CONFIGURATION), (UINT8 *) Configuration, NULL);
HiiSetBrowserData (&gVlanConfigFormSetGuid, mVlanStorageName, sizeof (VLAN_CONFIGURATION), (UINT8 *) Configuration, NULL);
FreePool (Configuration);
return EFI_SUCCESS;
}
@@ -444,7 +443,7 @@ VlanUpdateForm (
HiiUpdateForm (
PrivateData->HiiHandle, // HII handle
&mVlanFormSetGuid, // Formset GUID
&gVlanConfigFormSetGuid, // Formset GUID
VLAN_CONFIGURATION_FORM_ID, // Form ID
StartOpCodeHandle, // Label for where to insert opcodes
EndOpCodeHandle // Replace data
@@ -515,7 +514,7 @@ InstallVlanConfigForm (
// Publish the HII package list
//
HiiHandle = HiiAddPackages (
&mVlanFormSetGuid,
&gVlanConfigFormSetGuid,
DriverHandle,
VlanConfigDxeStrings,
VlanConfigBin,

7
MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigNvData.h
View File

@@ -17,12 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#define __VLAN_CONFIG_NV_DATA_H__
#include <Guid/HiiPlatformSetupFormset.h>
#define VLAN_CONFIG_PRIVATE_GUID \
{ \
0xd79df6b0, 0xef44, 0x43bd, {0x97, 0x97, 0x43, 0xe9, 0x3b, 0xcf, 0x5f, 0xa8 } \
}
#include <Guid/VlanConfigHii.h>
#define VLAN_CONFIGURATION_VARSTORE_ID 0x0001
#define VLAN_CONFIGURATION_FORM_ID 0x0001