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.

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



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12376 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4
2011-09-18 12:27:49 +00:00
parent a0c56a8219
commit 9bdc659213
23 changed files with 110 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
NetworkPkg/Ip6Dxe/Ip6ConfigNv.c
View File

@@ -15,8 +15,6 @@
#include "Ip6Impl.h"
EFI_GUID mIp6HiiVendorDevicePathGuid = IP6_HII_VENDOR_DEVICE_PATH_GUID;
EFI_GUID mIp6ConfigNvDataGuid = IP6_CONFIG_NVDATA_GUID;
CHAR16 mIp6ConfigStorageName[] = L"IP6_CONFIG_IFR_NVDATA";
/**
@@ -556,7 +554,7 @@ Ip6ConvertAddressListToString (
Status = HiiUpdateForm (
HiiHandle, // HII handle
&mIp6ConfigNvDataGuid, // Formset GUID
&gIp6ConfigNvDataGuid, // Formset GUID
FORMID_MAIN_FORM, // Form ID
StartOpCodeHandle, // Label for where to insert opcodes
EndOpCodeHandle // Replace data
@@ -1447,7 +1445,7 @@ Ip6FormExtractConfig (
*Progress = Request;
if ((Request != NULL) &&
!HiiIsConfigHdrMatch (Request, &mIp6ConfigNvDataGuid, mIp6ConfigStorageName)) {
!HiiIsConfigHdrMatch (Request, &gIp6ConfigNvDataGuid, mIp6ConfigStorageName)) {
return EFI_NOT_FOUND;
}
@@ -1478,7 +1476,7 @@ Ip6FormExtractConfig (
// followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator.
//
ConfigRequestHdr = HiiConstructConfigHdr (
&mIp6ConfigNvDataGuid,
&gIp6ConfigNvDataGuid,
mIp6ConfigStorageName,
Private->ChildHandle
);
@@ -1578,7 +1576,7 @@ Ip6FormRouteConfig (
// Check routing data in <ConfigHdr>.
// Note: if only one Storage is used, then this checking could be skipped.
//
if (!HiiIsConfigHdrMatch (Configuration, &mIp6ConfigNvDataGuid, mIp6ConfigStorageName)) {
if (!HiiIsConfigHdrMatch (Configuration, &gIp6ConfigNvDataGuid, mIp6ConfigStorageName)) {
*Progress = Configuration;
return EFI_NOT_FOUND;
}
@@ -1962,7 +1960,7 @@ Ip6ConfigFormInit (
VendorDeviceNode.Header.Type = HARDWARE_DEVICE_PATH;
VendorDeviceNode.Header.SubType = HW_VENDOR_DP;
CopyGuid (&VendorDeviceNode.Guid, &mIp6HiiVendorDevicePathGuid);
CopyGuid (&VendorDeviceNode.Guid, &gEfiCallerIdGuid);
SetDevicePathNodeLength (&VendorDeviceNode.Header, sizeof (VENDOR_DEVICE_PATH));
CallbackInfo->HiiVendorDevicePath = AppendDevicePathNode (
@@ -2012,7 +2010,7 @@ Ip6ConfigFormInit (
// Publish our HII data
//
CallbackInfo->RegisteredHandle = HiiAddPackages (
&mIp6ConfigNvDataGuid,
&gIp6ConfigNvDataGuid,
CallbackInfo->ChildHandle,
Ip6DxeStrings,
Ip6ConfigBin,

7
NetworkPkg/Ip6Dxe/Ip6ConfigNv.h
View File

@@ -1,7 +1,7 @@
/** @file
The header file of Ip6ConfigNv.c.
Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2010 - 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
@@ -22,11 +22,6 @@
extern UINT8 Ip6ConfigBin[];
extern UINT8 Ip6DxeStrings[];
#define IP6_HII_VENDOR_DEVICE_PATH_GUID \
{ \
0x13288098, 0xb11f, 0x45b9, { 0xbc, 0x4f, 0x91, 0xb5, 0x4b, 0xa3, 0x39, 0xb9 } \
}
#define IP6_ETHERNET L"Ethernet"
#define IP6_EXPERIMENTAL_ETHERNET L"Experimental Ethernet"
#define IP6_ADDRESS_DELIMITER L' '

3
NetworkPkg/Ip6Dxe/Ip6Dxe.inf
View File

@@ -67,7 +67,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
[LibraryClasses]
BaseLib
@@ -98,3 +98,4 @@
[Guids]
gEfiIfrTianoGuid ## CONSUMES ## GUID
gIp6ConfigNvDataGuid ## PRODUCES ## GUID

5
NetworkPkg/Ip6Dxe/Ip6NvData.h
View File

@@ -16,10 +16,7 @@
#ifndef _IP6_NV_DATA_H_
#define _IP6_NV_DATA_H_
#define IP6_CONFIG_NVDATA_GUID \
{ \
0x2eea107, 0x98db, 0x400e, { 0x98, 0x30, 0x46, 0xa, 0x15, 0x42, 0xd7, 0x99 } \
}
#include <Guid/Ip6ConfigHii.h>
#define FORMID_MAIN_FORM 1
#define FORMID_MANUAL_CONFIG_FORM 2