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

5
NetworkPkg/IScsiDxe/IScsiCHAP.h
View File

@@ -15,11 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#ifndef _ISCSI_CHAP_H_
#define _ISCSI_CHAP_H_
#define ISCSI_CHAP_AUTH_INFO_GUID \
{ \
0x786ec0ac, 0x65ae, 0x4d1b, { 0xb1, 0x37, 0xd, 0x11, 0xa, 0x48, 0x37, 0x97 }\
}
#define ISCSI_AUTH_METHOD_CHAP "CHAP"
#define ISCSI_KEY_CHAP_ALGORITHM "CHAP_A"

38
NetworkPkg/IScsiDxe/IScsiConfig.c
View File

@@ -14,7 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include "IScsiImpl.h"
EFI_GUID mVendorGuid = ISCSI_CONFIG_GUID;
CHAR16 mVendorStorageName[] = L"ISCSI_CONFIG_IFR_NVDATA";
BOOLEAN mIScsiDeviceListUpdated = FALSE;
UINTN mNumberOfIScsiDevices = 0;
@@ -30,10 +29,7 @@ HII_VENDOR_DEVICE_PATH mIScsiHiiVendorDevicePath = {
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
}
},
//
// {49D7B73E-143D-4716-977B-C45F1CB038CC}
//
{ 0x49d7b73e, 0x143d, 0x4716, { 0x97, 0x7b, 0xc4, 0x5f, 0x1c, 0xb0, 0x38, 0xcc } }
ISCSI_CONFIG_GUID
},
{
END_DEVICE_PATH_TYPE,
@@ -758,7 +754,7 @@ IScsiConvertIfrNvDataToAttemptConfigData (
//
AttemptConfigOrder = IScsiGetVariableAndSize (
L"AttemptOrder",
&mVendorGuid,
&gIScsiConfigGuid,
&AttemptConfigOrderSize
);
@@ -787,7 +783,7 @@ IScsiConvertIfrNvDataToAttemptConfigData (
Status = gRT->SetVariable (
L"AttemptOrder",
&mVendorGuid,
&gIScsiConfigGuid,
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,
AttemptConfigOrderSize,
AttemptConfigOrder
@@ -1028,7 +1024,7 @@ IScsiConfigAddAttempt (
Status = HiiUpdateForm (
mCallbackInfo->RegisteredHandle, // HII handle
&mVendorGuid, // Formset GUID
&gIScsiConfigGuid, // Formset GUID
FORMID_MAC_FORM, // Form ID
StartOpCodeHandle, // Label for where to insert opcodes
EndOpCodeHandle // Replace data
@@ -1098,7 +1094,7 @@ IScsiConfigUpdateAttempt (
HiiUpdateForm (
mCallbackInfo->RegisteredHandle, // HII handle
&mVendorGuid, // Formset GUID
&gIScsiConfigGuid, // Formset GUID
FORMID_MAIN_FORM, // Form ID
StartOpCodeHandle, // Label for where to insert opcodes
EndOpCodeHandle // Replace data
@@ -1143,7 +1139,7 @@ IScsiConfigDeleteAttempts (
AttemptConfigOrder = IScsiGetVariableAndSize (
L"AttemptOrder",
&mVendorGuid,
&gIScsiConfigGuid,
&AttemptConfigOrderSize
);
if ((AttemptConfigOrder == NULL) || (AttemptConfigOrderSize == 0)) {
@@ -1258,7 +1254,7 @@ IScsiConfigDeleteAttempts (
//
Status = gRT->SetVariable (
L"AttemptOrder",
&mVendorGuid,
&gIScsiConfigGuid,
Attribute,
NewTotal * sizeof (UINT8),
AttemptNewOrder
@@ -1317,7 +1313,7 @@ IScsiConfigDisplayDeleteAttempts (
AttemptConfigOrder = IScsiGetVariableAndSize (
L"AttemptOrder",
&mVendorGuid,
&gIScsiConfigGuid,
&AttemptConfigOrderSize
);
if (AttemptConfigOrder != NULL) {
@@ -1354,7 +1350,7 @@ IScsiConfigDisplayDeleteAttempts (
Status = HiiUpdateForm (
mCallbackInfo->RegisteredHandle, // HII handle
&mVendorGuid, // Formset GUID
&gIScsiConfigGuid, // Formset GUID
FORMID_DELETE_FORM, // Form ID
StartOpCodeHandle, // Label for where to insert opcodes
EndOpCodeHandle // Replace data
@@ -1454,7 +1450,7 @@ IScsiConfigDisplayOrderAttempts (
Exit:
Status = HiiUpdateForm (
mCallbackInfo->RegisteredHandle, // HII handle
&mVendorGuid, // Formset GUID
&gIScsiConfigGuid, // Formset GUID
FORMID_ORDER_FORM, // Form ID
StartOpCodeHandle, // Label for where to insert opcodes
EndOpCodeHandle // Replace data
@@ -1498,7 +1494,7 @@ IScsiConfigOrderAttempts (
AttemptConfigOrder = IScsiGetVariableAndSize (
L"AttemptOrder",
&mVendorGuid,
&gIScsiConfigGuid,
&AttemptConfigOrderSize
);
if (AttemptConfigOrder == NULL) {
@@ -1560,7 +1556,7 @@ IScsiConfigOrderAttempts (
Status = gRT->SetVariable (
L"AttemptOrder",
&mVendorGuid,
&gIScsiConfigGuid,
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,
AttemptConfigOrderSize,
AttemptConfigOrderTmp
@@ -1674,7 +1670,7 @@ IScsiConfigProcessDefault (
//
AttemptConfigOrder = IScsiGetVariableAndSize (
L"AttemptOrder",
&mVendorGuid,
&gIScsiConfigGuid,
&AttemptConfigOrderSize
);
@@ -1899,7 +1895,7 @@ IScsiFormExtractConfig (
}
*Progress = Request;
if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mVendorGuid, mVendorStorageName)) {
if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gIScsiConfigGuid, mVendorStorageName)) {
return EFI_NOT_FOUND;
}
@@ -1943,7 +1939,7 @@ IScsiFormExtractConfig (
// 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 (&mVendorGuid, mVendorStorageName, Private->DriverHandle);
ConfigRequestHdr = HiiConstructConfigHdr (&gIScsiConfigGuid, mVendorStorageName, Private->DriverHandle);
Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);
ConfigRequest = AllocateZeroPool (Size);
ASSERT (ConfigRequest != NULL);
@@ -2039,7 +2035,7 @@ IScsiFormRouteConfig (
// Check routing data in <ConfigHdr>.
// Note: if only one Storage is used, then this checking could be skipped.
//
if (!HiiIsConfigHdrMatch (Configuration, &mVendorGuid, mVendorStorageName)) {
if (!HiiIsConfigHdrMatch (Configuration, &gIScsiConfigGuid, mVendorStorageName)) {
*Progress = Configuration;
return EFI_NOT_FOUND;
}
@@ -2494,7 +2490,7 @@ IScsiConfigFormInit (
// Publish our HII data.
//
CallbackInfo->RegisteredHandle = HiiAddPackages (
&mVendorGuid,
&gIScsiConfigGuid,
CallbackInfo->DriverHandle,
IScsiDxeStrings,
IScsiConfigVfrBin,

1
NetworkPkg/IScsiDxe/IScsiConfig.h
View File

@@ -23,7 +23,6 @@ typedef struct _ISCSI_FORM_CALLBACK_INFO ISCSI_FORM_CALLBACK_INFO;
extern UINT8 IScsiConfigVfrBin[];
extern UINT8 IScsiDxeStrings[];
extern ISCSI_FORM_CALLBACK_INFO *mCallbackInfo;
extern EFI_GUID mVendorGuid;
#define VAR_OFFSET(Field) \

5
NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h
View File

@@ -15,10 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#ifndef _ISCSI_NVDATASTRUC_H_
#define _ISCSI_NVDATASTRUC_H_
#define ISCSI_CONFIG_GUID \
{ \
0x6456ed61, 0x3579, 0x41c9, { 0x8a, 0x26, 0x0a, 0x0b, 0xd6, 0x2b, 0x78, 0xfc } \
}
#include <Guid/IScsiConfigHii.h>
#define VAR_EQ_TEST_NAME 0x100
#define CONFIGURATION_VARSTORE_ID 0x6666

2
NetworkPkg/IScsiDxe/IScsiDriver.c
View File

@@ -658,7 +658,7 @@ IScsiStart (
AttemptConfigOrder = IScsiGetVariableAndSize (
L"AttemptOrder",
&mVendorGuid,
&gIScsiConfigGuid,
&AttemptConfigOrderSize
);
ASSERT (AttemptConfigOrder != NULL);

2
NetworkPkg/IScsiDxe/IScsiDxe.inf
View File

@@ -62,6 +62,7 @@
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
CryptoPkg/CryptoPkg.dec
NetworkPkg/NetworkPkg.dec
[LibraryClasses]
BaseLib
@@ -104,3 +105,4 @@
gEfiAcpiTableGuid ## CONSUMES ## GUID
gEfiAcpi10TableGuid ## CONSUMES ## GUID
gEfiAcpi20TableGuid ## CONSUMES ## GUID
gIScsiConfigGuid ## PRODUCES ## GUID

2
NetworkPkg/IScsiDxe/IScsiMisc.c
View File

@@ -921,7 +921,7 @@ IScsiGetConfigData (
//
AttemptConfigOrder = IScsiGetVariableAndSize (
L"AttemptOrder",
&mVendorGuid,
&gIScsiConfigGuid,
&AttemptConfigOrderSize
);
if (AttemptConfigOrder == NULL || AttemptConfigOrderSize == 0) {