diff --git a/NetworkPkg/Application/IfConfig6/IfConfig6.c b/NetworkPkg/Application/IfConfig6/IfConfig6.c
index 7a1b2c87f6..a2a3582277 100644
--- a/NetworkPkg/Application/IfConfig6/IfConfig6.c
+++ b/NetworkPkg/Application/IfConfig6/IfConfig6.c
@@ -29,7 +29,6 @@
EFI_HII_HANDLE mHiiHandle;
-EFI_GUID mEfiIfConfig6Guid = EFI_IFCONFIG6_GUID;
SHELL_PARAM_ITEM mIfConfig6CheckList[] = {
{
L"-b",
diff --git a/NetworkPkg/Application/IfConfig6/IfConfig6.h b/NetworkPkg/Application/IfConfig6/IfConfig6.h
index eea7df55d1..ad3a77566a 100644
--- a/NetworkPkg/Application/IfConfig6/IfConfig6.h
+++ b/NetworkPkg/Application/IfConfig6/IfConfig6.h
@@ -1,7 +1,7 @@
/** @file
The interface function declaration of shell application IfConfig6.
- Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -16,11 +16,6 @@
#ifndef _IFCONFIG6_H_
#define _IFCONFIG6_H_
-#define EFI_IFCONFIG6_GUID \
- { \
- 0xbab7296b, 0x222c, 0x4408, {0x9e, 0x6c, 0xc2, 0x5c, 0x18, 0x7e, 0xff, 0x33} \
- }
-
enum {
IfConfig6OpList = 1,
IfConfig6OpSet = 2,
diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
index 44a1a0cbd4..e4f6057f40 100644
--- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
+++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
@@ -1,7 +1,7 @@
/** @file
The main process for IpSecConfig application.
- Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -232,7 +232,6 @@ STR2INT mMapAuthMethod[] = {
EFI_IPSEC2_PROTOCOL *mIpSec;
EFI_IPSEC_CONFIG_PROTOCOL *mIpSecConfig;
EFI_HII_HANDLE mHiiHandle;
-EFI_GUID mEfiIpSecConfigGuid = EFI_IPSEC_CONFIG_GUID;
CHAR16 mAppName[] = L"IpSecConfig";
//
diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.h b/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
index 1ab57b56cc..17044fef79 100644
--- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
+++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
@@ -1,7 +1,7 @@
/** @file
The internal structure and function declaration in IpSecConfig application.
- Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -26,11 +26,6 @@
#include
-#define EFI_IPSEC_CONFIG_GUID \
- { \
- 0x9db0c3ac, 0xd9d2, 0x4f96, {0x9e, 0xd7, 0x6d, 0xa6, 0x12, 0xa4, 0xf3, 0x27} \
- }
-
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
#define IPSECCONFIG_STATUS_NAME L"IpSecStatus"
diff --git a/NetworkPkg/Application/Ping6/Ping6.c b/NetworkPkg/Application/Ping6/Ping6.c
index 345d3b90fd..e0f6cd89e5 100644
--- a/NetworkPkg/Application/Ping6/Ping6.c
+++ b/NetworkPkg/Application/Ping6/Ping6.c
@@ -1,7 +1,7 @@
/** @file
The implementation for Ping6 application.
- Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -58,7 +58,6 @@ SHELL_PARAM_ITEM Ping6ParamList[] = {
EFI_HII_HANDLE mHiiHandle;
CONST CHAR16 *mIp6DstString;
CONST CHAR16 *mIp6SrcString;
-EFI_GUID mEfiPing6Guid = EFI_PING6_GUID;
UINT64 mFrequency = 0;
/**
Get and caculate the frequency in tick/ms.
diff --git a/NetworkPkg/Application/Ping6/Ping6.h b/NetworkPkg/Application/Ping6/Ping6.h
index 914e5e46e1..b152ff18bc 100644
--- a/NetworkPkg/Application/Ping6/Ping6.h
+++ b/NetworkPkg/Application/Ping6/Ping6.h
@@ -1,7 +1,7 @@
/** @file
The interface function declaration of shell application Ping6 (Ping for v6 series).
- Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -16,11 +16,6 @@
#ifndef _PING6_H_
#define _PING6_H_
-#define EFI_PING6_GUID \
- { \
- 0x3f0b2478, 0x3619, 0x46c5, {0x81, 0x50, 0xa5, 0xab, 0xdd, 0xb6, 0x6b, 0xd9} \
- }
-
#define PING6_DEFAULT_TIMEOUT 5000
#define PING6_MAX_SEND_NUMBER 10000
#define PING6_MAX_BUFFER_SIZE 32768
diff --git a/NetworkPkg/IScsiDxe/IScsiCHAP.h b/NetworkPkg/IScsiDxe/IScsiCHAP.h
index d71db2c655..132461b84d 100644
--- a/NetworkPkg/IScsiDxe/IScsiCHAP.h
+++ b/NetworkPkg/IScsiDxe/IScsiCHAP.h
@@ -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"
diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c b/NetworkPkg/IScsiDxe/IScsiConfig.c
index 7a528198ef..d347d8dc70 100644
--- a/NetworkPkg/IScsiDxe/IScsiConfig.c
+++ b/NetworkPkg/IScsiDxe/IScsiConfig.c
@@ -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 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 .
// 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,
diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.h b/NetworkPkg/IScsiDxe/IScsiConfig.h
index df0c7539e4..7fd18a0ae2 100644
--- a/NetworkPkg/IScsiDxe/IScsiConfig.h
+++ b/NetworkPkg/IScsiDxe/IScsiConfig.h
@@ -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) \
diff --git a/NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h b/NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h
index ee66e2aae0..9024b398db 100644
--- a/NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h
+++ b/NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h
@@ -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
#define VAR_EQ_TEST_NAME 0x100
#define CONFIGURATION_VARSTORE_ID 0x6666
diff --git a/NetworkPkg/IScsiDxe/IScsiDriver.c b/NetworkPkg/IScsiDxe/IScsiDriver.c
index 2d922eecca..7d8b18455c 100644
--- a/NetworkPkg/IScsiDxe/IScsiDriver.c
+++ b/NetworkPkg/IScsiDxe/IScsiDriver.c
@@ -658,7 +658,7 @@ IScsiStart (
AttemptConfigOrder = IScsiGetVariableAndSize (
L"AttemptOrder",
- &mVendorGuid,
+ &gIScsiConfigGuid,
&AttemptConfigOrderSize
);
ASSERT (AttemptConfigOrder != NULL);
diff --git a/NetworkPkg/IScsiDxe/IScsiDxe.inf b/NetworkPkg/IScsiDxe/IScsiDxe.inf
index 24799fc57c..1e18c3bdc3 100644
--- a/NetworkPkg/IScsiDxe/IScsiDxe.inf
+++ b/NetworkPkg/IScsiDxe/IScsiDxe.inf
@@ -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
\ No newline at end of file
diff --git a/NetworkPkg/IScsiDxe/IScsiMisc.c b/NetworkPkg/IScsiDxe/IScsiMisc.c
index 2cf3db01b7..731081f1df 100644
--- a/NetworkPkg/IScsiDxe/IScsiMisc.c
+++ b/NetworkPkg/IScsiDxe/IScsiMisc.c
@@ -921,7 +921,7 @@ IScsiGetConfigData (
//
AttemptConfigOrder = IScsiGetVariableAndSize (
L"AttemptOrder",
- &mVendorGuid,
+ &gIScsiConfigGuid,
&AttemptConfigOrderSize
);
if (AttemptConfigOrder == NULL || AttemptConfigOrderSize == 0) {
diff --git a/NetworkPkg/Include/Guid/IScsiConfigHii.h b/NetworkPkg/Include/Guid/IScsiConfigHii.h
new file mode 100644
index 0000000000..5077022558
--- /dev/null
+++ b/NetworkPkg/Include/Guid/IScsiConfigHii.h
@@ -0,0 +1,26 @@
+/** @file
+ GUIDs used as HII FormSet and HII Package list GUID in IScsiConfig driver
+ that supports IP4 and IP6 both.
+
+Copyright (c) 2011, Intel Corporation. All rights reserved.
+This program and the accompanying materials are licensed and made available under
+the terms and conditions of the BSD License that accompanies this distribution.
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef __ISCSI_CONFIG_HII_GUID_H__
+#define __ISCSI_CONFIG_HII_GUID_H__
+
+#define ISCSI_CONFIG_GUID \
+ { \
+ 0x4b47d616, 0xa8d6, 0x4552, { 0x9d, 0x44, 0xcc, 0xad, 0x2e, 0xf, 0x4c, 0xf9 } \
+ }
+
+extern EFI_GUID gIScsiConfigGuid;
+
+#endif
diff --git a/NetworkPkg/Include/Guid/Ip6ConfigHii.h b/NetworkPkg/Include/Guid/Ip6ConfigHii.h
new file mode 100644
index 0000000000..f7a3889596
--- /dev/null
+++ b/NetworkPkg/Include/Guid/Ip6ConfigHii.h
@@ -0,0 +1,25 @@
+/** @file
+ GUIDs used as HII FormSet and HII Package list GUID in Ip6Config driver.
+
+Copyright (c) 2011, Intel Corporation. All rights reserved.
+This program and the accompanying materials are licensed and made available under
+the terms and conditions of the BSD License that accompanies this distribution.
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef __IP6_CONFIG_HII_GUID_H__
+#define __IP6_CONFIG_HII_GUID_H__
+
+#define IP6_CONFIG_NVDATA_GUID \
+ { \
+ 0x2eea107, 0x98db, 0x400e, { 0x98, 0x30, 0x46, 0xa, 0x15, 0x42, 0xd7, 0x99 } \
+ }
+
+extern EFI_GUID gIp6ConfigNvDataGuid;
+
+#endif
diff --git a/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c b/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c
index 7bc049ca45..7dbba664bf 100644
--- a/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c
+++ b/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c
@@ -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 .
// 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,
diff --git a/NetworkPkg/Ip6Dxe/Ip6ConfigNv.h b/NetworkPkg/Ip6Dxe/Ip6ConfigNv.h
index d184776707..ef1893c549 100644
--- a/NetworkPkg/Ip6Dxe/Ip6ConfigNv.h
+++ b/NetworkPkg/Ip6Dxe/Ip6ConfigNv.h
@@ -1,7 +1,7 @@
/** @file
The header file of Ip6ConfigNv.c.
- Copyright (c) 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.
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' '
diff --git a/NetworkPkg/Ip6Dxe/Ip6Dxe.inf b/NetworkPkg/Ip6Dxe/Ip6Dxe.inf
index 1510927e4b..012dfabb4e 100644
--- a/NetworkPkg/Ip6Dxe/Ip6Dxe.inf
+++ b/NetworkPkg/Ip6Dxe/Ip6Dxe.inf
@@ -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
\ No newline at end of file
diff --git a/NetworkPkg/Ip6Dxe/Ip6NvData.h b/NetworkPkg/Ip6Dxe/Ip6NvData.h
index 6c981d2aa7..b67e6249b5 100644
--- a/NetworkPkg/Ip6Dxe/Ip6NvData.h
+++ b/NetworkPkg/Ip6Dxe/Ip6NvData.h
@@ -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
#define FORMID_MAIN_FORM 1
#define FORMID_MANUAL_CONFIG_FORM 2
diff --git a/NetworkPkg/IpSecDxe/IkeCommon.h b/NetworkPkg/IpSecDxe/IkeCommon.h
index 6041675efa..4bcfe6c2a6 100644
--- a/NetworkPkg/IpSecDxe/IkeCommon.h
+++ b/NetworkPkg/IpSecDxe/IkeCommon.h
@@ -1,7 +1,7 @@
/** @file
Common operation of the IKE.
- Copyright (c) 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -40,7 +40,6 @@
#define IKE_NONCE_SIZE 16
#define IKE_MAX_RETRY 4
#define IKE_SPI_BASE 0x10000
-#define PRF_HMAC_SHA1_GUID &gEfiCryptAlgorithmSha1Guid
#define IKE_PAYLOAD_SIGNATURE SIGNATURE_32('I','K','E','P')
#define IKE_PAYLOAD_BY_PACKET(a) CR(a,IKE_PAYLOAD,ByPacket,IKE_PAYLOAD_SIGNATURE)
diff --git a/NetworkPkg/NetworkPkg.dec b/NetworkPkg/NetworkPkg.dec
index 9d235d8d14..e4d7eb131b 100644
--- a/NetworkPkg/NetworkPkg.dec
+++ b/NetworkPkg/NetworkPkg.dec
@@ -20,11 +20,20 @@
PACKAGE_GUID = 947988BE-8D5C-471a-893D-AD181C46BEBB
PACKAGE_VERSION = 0.92
+[Includes]
+ Include
+
[Guids]
## Network package token space guid.
# Include/Guid/NetworkPkgTokenSpace.h
gEfiNetworkPkgTokenSpaceGuid = { 0x40e064b2, 0x0ae0, 0x48b1, { 0xa0, 0x7d, 0xf8, 0xcf, 0x1e, 0x1a, 0x23, 0x10}}
+ # Include/Guid/Ip6ConfigHii.h
+ gIp6ConfigNvDataGuid = { 0x2eea107, 0x98db, 0x400e, { 0x98, 0x30, 0x46, 0xa, 0x15, 0x42, 0xd7, 0x99}}
+
+ # Include/Guid/IscsiConfigHii.h
+ gIScsiConfigGuid = { 0x4b47d616, 0xa8d6, 0x4552, { 0x9d, 0x44, 0xcc, 0xad, 0x2e, 0xf, 0x4c, 0xf9}}
+
[PcdsFeatureFlag]
## If true, the IKEv2 Certificate Authentication feature is enabled.
gEfiNetworkPkgTokenSpaceGuid.PcdIpsecCertificateEnabled|TRUE|BOOLEAN|0x00000007
diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c b/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
index e4ab9557a1..8cfc8fb93c 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
@@ -25,14 +25,6 @@ EFI_DRIVER_BINDING_PROTOCOL gPxeBcDriverBinding = {
NULL
};
-//
-// PXE_PRIVATE_GUID is only used to keep the relationship between
-// NIC handle and virtual child handles.
-//
-EFI_GUID mPxeBcPrivateGuid = PXEBC_PRIVATE_GUID;
-
-
-
/**
Get the Nic handle using any child handle in the IPv4 stack.
@@ -237,7 +229,7 @@ PxeBcDestroyIp4Children (
//
gBS->CloseProtocol (
Private->Controller,
- &mPxeBcPrivateGuid,
+ &gEfiCallerIdGuid,
This->DriverBindingHandle,
Private->Ip4Nic->Controller
);
@@ -397,7 +389,7 @@ PxeBcDestroyIp6Children (
//
gBS->CloseProtocol (
Private->Controller,
- &mPxeBcPrivateGuid,
+ &gEfiCallerIdGuid,
This->DriverBindingHandle,
Private->Ip6Nic->Controller
);
@@ -722,7 +714,7 @@ PxeBcCreateIp4Children (
//
Status = gBS->OpenProtocol (
ControllerHandle,
- &mPxeBcPrivateGuid,
+ &gEfiCallerIdGuid,
(VOID **) &Id,
This->DriverBindingHandle,
Private->Ip4Nic->Controller,
@@ -1030,7 +1022,7 @@ PxeBcCreateIp6Children (
//
Status = gBS->OpenProtocol (
ControllerHandle,
- &mPxeBcPrivateGuid,
+ &gEfiCallerIdGuid,
(VOID **) &Id,
This->DriverBindingHandle,
Private->Ip6Nic->Controller,
@@ -1214,7 +1206,7 @@ PxeBcDriverBindingStart (
Status = gBS->OpenProtocol (
ControllerHandle,
- &mPxeBcPrivateGuid,
+ &gEfiCallerIdGuid,
(VOID **) &Id,
This->DriverBindingHandle,
ControllerHandle,
@@ -1282,10 +1274,13 @@ PxeBcDriverBindingStart (
//
// Install PxeBaseCodePrivate protocol onto the real NIC handler.
+ // PxeBaseCodePrivate protocol is only used to keep the relationship between
+ // NIC handle and virtual child handles.
+ // gEfiCallerIdGuid will be used as its protocol guid.
//
Status = gBS->InstallProtocolInterface (
&ControllerHandle,
- &mPxeBcPrivateGuid,
+ &gEfiCallerIdGuid,
EFI_NATIVE_INTERFACE,
&Private->Id
);
@@ -1322,7 +1317,7 @@ PxeBcDriverBindingStart (
ON_ERROR:
gBS->UninstallProtocolInterface (
ControllerHandle,
- &mPxeBcPrivateGuid,
+ &gEfiCallerIdGuid,
&Private->Id
);
PxeBcDestroyIp4Children (This, Private);
@@ -1403,7 +1398,7 @@ PxeBcDriverBindingStop (
//
Status = gBS->OpenProtocol (
NicHandle,
- &mPxeBcPrivateGuid,
+ &gEfiCallerIdGuid,
(VOID **) &Id,
This->DriverBindingHandle,
ControllerHandle,
@@ -1459,7 +1454,7 @@ PxeBcDriverBindingStop (
if (Private->Ip4Nic == NULL && Private->Ip6Nic == NULL) {
gBS->UninstallProtocolInterface (
NicHandle,
- &mPxeBcPrivateGuid,
+ &gEfiCallerIdGuid,
&Private->Id
);
FreePool (Private);
diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.h b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.h
index 04e0617c6e..0b0ff1c06a 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.h
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.h
@@ -77,12 +77,6 @@ typedef struct _PXEBC_VIRTUAL_NIC PXEBC_VIRTUAL_NIC;
#define PXEBC_PRIVATE_DATA_FROM_ID(a) CR (a, PXEBC_PRIVATE_DATA, Id, PXEBC_PRIVATE_DATA_SIGNATURE)
#define PXEBC_VIRTUAL_NIC_FROM_LOADFILE(a) CR (a, PXEBC_VIRTUAL_NIC, LoadFile, PXEBC_VIRTUAL_NIC_SIGNATURE)
-#define PXEBC_PRIVATE_GUID \
- { \
- 0xa4dfac32, 0xfbb4, 0x4907,{0xb3, 0x13, 0x4, 0xe, 0xe2, 0x42, 0x33, 0x20 } \
- }
-
-
typedef union {
PXEBC_DHCP4_PACKET_CACHE Dhcp4;
PXEBC_DHCP6_PACKET_CACHE Dhcp6;