\r
EFI_HII_HANDLE mHiiHandle;\r
\r
-EFI_GUID mEfiIfConfig6Guid = EFI_IFCONFIG6_GUID;\r
SHELL_PARAM_ITEM mIfConfig6CheckList[] = {\r
{\r
L"-b",\r
/** @file\r
The interface function declaration of shell application IfConfig6.\r
\r
- Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
#ifndef _IFCONFIG6_H_\r
#define _IFCONFIG6_H_\r
\r
-#define EFI_IFCONFIG6_GUID \\r
- { \\r
- 0xbab7296b, 0x222c, 0x4408, {0x9e, 0x6c, 0xc2, 0x5c, 0x18, 0x7e, 0xff, 0x33} \\r
- }\r
-\r
enum {\r
IfConfig6OpList = 1,\r
IfConfig6OpSet = 2,\r
/** @file\r
The main process for IpSecConfig application.\r
\r
- Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
EFI_IPSEC2_PROTOCOL *mIpSec;\r
EFI_IPSEC_CONFIG_PROTOCOL *mIpSecConfig;\r
EFI_HII_HANDLE mHiiHandle;\r
-EFI_GUID mEfiIpSecConfigGuid = EFI_IPSEC_CONFIG_GUID;\r
CHAR16 mAppName[] = L"IpSecConfig";\r
\r
//\r
/** @file\r
The internal structure and function declaration in IpSecConfig application.\r
\r
- Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
\r
#include <Protocol/IpSecConfig.h>\r
\r
-#define EFI_IPSEC_CONFIG_GUID \\r
- { \\r
- 0x9db0c3ac, 0xd9d2, 0x4f96, {0x9e, 0xd7, 0x6d, 0xa6, 0x12, 0xa4, 0xf3, 0x27} \\r
- }\r
-\r
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))\r
\r
#define IPSECCONFIG_STATUS_NAME L"IpSecStatus"\r
/** @file\r
The implementation for Ping6 application.\r
\r
- Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
EFI_HII_HANDLE mHiiHandle;\r
CONST CHAR16 *mIp6DstString;\r
CONST CHAR16 *mIp6SrcString;\r
-EFI_GUID mEfiPing6Guid = EFI_PING6_GUID;\r
UINT64 mFrequency = 0;\r
/**\r
Get and caculate the frequency in tick/ms.\r
/** @file\r
The interface function declaration of shell application Ping6 (Ping for v6 series).\r
\r
- Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
#ifndef _PING6_H_\r
#define _PING6_H_\r
\r
-#define EFI_PING6_GUID \\r
- { \\r
- 0x3f0b2478, 0x3619, 0x46c5, {0x81, 0x50, 0xa5, 0xab, 0xdd, 0xb6, 0x6b, 0xd9} \\r
- }\r
-\r
#define PING6_DEFAULT_TIMEOUT 5000\r
#define PING6_MAX_SEND_NUMBER 10000\r
#define PING6_MAX_BUFFER_SIZE 32768\r
#ifndef _ISCSI_CHAP_H_\r
#define _ISCSI_CHAP_H_\r
\r
-#define ISCSI_CHAP_AUTH_INFO_GUID \\r
- { \\r
- 0x786ec0ac, 0x65ae, 0x4d1b, { 0xb1, 0x37, 0xd, 0x11, 0xa, 0x48, 0x37, 0x97 }\\r
- }\r
-\r
#define ISCSI_AUTH_METHOD_CHAP "CHAP"\r
\r
#define ISCSI_KEY_CHAP_ALGORITHM "CHAP_A"\r
\r
#include "IScsiImpl.h"\r
\r
-EFI_GUID mVendorGuid = ISCSI_CONFIG_GUID;\r
CHAR16 mVendorStorageName[] = L"ISCSI_CONFIG_IFR_NVDATA";\r
BOOLEAN mIScsiDeviceListUpdated = FALSE;\r
UINTN mNumberOfIScsiDevices = 0;\r
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
}\r
},\r
- //\r
- // {49D7B73E-143D-4716-977B-C45F1CB038CC}\r
- //\r
- { 0x49d7b73e, 0x143d, 0x4716, { 0x97, 0x7b, 0xc4, 0x5f, 0x1c, 0xb0, 0x38, 0xcc } }\r
+ ISCSI_CONFIG_GUID\r
},\r
{\r
END_DEVICE_PATH_TYPE,\r
//\r
AttemptConfigOrder = IScsiGetVariableAndSize (\r
L"AttemptOrder",\r
- &mVendorGuid,\r
+ &gIScsiConfigGuid,\r
&AttemptConfigOrderSize\r
);\r
\r
\r
Status = gRT->SetVariable (\r
L"AttemptOrder",\r
- &mVendorGuid,\r
+ &gIScsiConfigGuid,\r
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
AttemptConfigOrderSize,\r
AttemptConfigOrder\r
\r
Status = HiiUpdateForm (\r
mCallbackInfo->RegisteredHandle, // HII handle\r
- &mVendorGuid, // Formset GUID\r
+ &gIScsiConfigGuid, // Formset GUID\r
FORMID_MAC_FORM, // Form ID\r
StartOpCodeHandle, // Label for where to insert opcodes\r
EndOpCodeHandle // Replace data\r
\r
HiiUpdateForm (\r
mCallbackInfo->RegisteredHandle, // HII handle\r
- &mVendorGuid, // Formset GUID\r
+ &gIScsiConfigGuid, // Formset GUID\r
FORMID_MAIN_FORM, // Form ID\r
StartOpCodeHandle, // Label for where to insert opcodes\r
EndOpCodeHandle // Replace data\r
\r
AttemptConfigOrder = IScsiGetVariableAndSize (\r
L"AttemptOrder",\r
- &mVendorGuid,\r
+ &gIScsiConfigGuid,\r
&AttemptConfigOrderSize\r
);\r
if ((AttemptConfigOrder == NULL) || (AttemptConfigOrderSize == 0)) {\r
//\r
Status = gRT->SetVariable (\r
L"AttemptOrder",\r
- &mVendorGuid,\r
+ &gIScsiConfigGuid,\r
Attribute,\r
NewTotal * sizeof (UINT8),\r
AttemptNewOrder\r
\r
AttemptConfigOrder = IScsiGetVariableAndSize (\r
L"AttemptOrder",\r
- &mVendorGuid,\r
+ &gIScsiConfigGuid,\r
&AttemptConfigOrderSize\r
);\r
if (AttemptConfigOrder != NULL) {\r
\r
Status = HiiUpdateForm (\r
mCallbackInfo->RegisteredHandle, // HII handle\r
- &mVendorGuid, // Formset GUID\r
+ &gIScsiConfigGuid, // Formset GUID\r
FORMID_DELETE_FORM, // Form ID\r
StartOpCodeHandle, // Label for where to insert opcodes\r
EndOpCodeHandle // Replace data\r
Exit:\r
Status = HiiUpdateForm (\r
mCallbackInfo->RegisteredHandle, // HII handle\r
- &mVendorGuid, // Formset GUID\r
+ &gIScsiConfigGuid, // Formset GUID\r
FORMID_ORDER_FORM, // Form ID\r
StartOpCodeHandle, // Label for where to insert opcodes\r
EndOpCodeHandle // Replace data\r
\r
AttemptConfigOrder = IScsiGetVariableAndSize (\r
L"AttemptOrder",\r
- &mVendorGuid,\r
+ &gIScsiConfigGuid,\r
&AttemptConfigOrderSize\r
);\r
if (AttemptConfigOrder == NULL) {\r
\r
Status = gRT->SetVariable (\r
L"AttemptOrder",\r
- &mVendorGuid,\r
+ &gIScsiConfigGuid,\r
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
AttemptConfigOrderSize,\r
AttemptConfigOrderTmp\r
//\r
AttemptConfigOrder = IScsiGetVariableAndSize (\r
L"AttemptOrder",\r
- &mVendorGuid,\r
+ &gIScsiConfigGuid,\r
&AttemptConfigOrderSize\r
);\r
\r
}\r
\r
*Progress = Request;\r
- if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mVendorGuid, mVendorStorageName)) {\r
+ if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gIScsiConfigGuid, mVendorStorageName)) {\r
return EFI_NOT_FOUND;\r
}\r
\r
// Allocate and fill a buffer large enough to hold the <ConfigHdr> template\r
// followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
//\r
- ConfigRequestHdr = HiiConstructConfigHdr (&mVendorGuid, mVendorStorageName, Private->DriverHandle);\r
+ ConfigRequestHdr = HiiConstructConfigHdr (&gIScsiConfigGuid, mVendorStorageName, Private->DriverHandle);\r
Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
ConfigRequest = AllocateZeroPool (Size);\r
ASSERT (ConfigRequest != NULL);\r
// Check routing data in <ConfigHdr>.\r
// Note: if only one Storage is used, then this checking could be skipped.\r
//\r
- if (!HiiIsConfigHdrMatch (Configuration, &mVendorGuid, mVendorStorageName)) {\r
+ if (!HiiIsConfigHdrMatch (Configuration, &gIScsiConfigGuid, mVendorStorageName)) {\r
*Progress = Configuration;\r
return EFI_NOT_FOUND;\r
}\r
// Publish our HII data.\r
//\r
CallbackInfo->RegisteredHandle = HiiAddPackages (\r
- &mVendorGuid,\r
+ &gIScsiConfigGuid,\r
CallbackInfo->DriverHandle,\r
IScsiDxeStrings,\r
IScsiConfigVfrBin,\r
extern UINT8 IScsiConfigVfrBin[];\r
extern UINT8 IScsiDxeStrings[];\r
extern ISCSI_FORM_CALLBACK_INFO *mCallbackInfo;\r
-extern EFI_GUID mVendorGuid;\r
\r
\r
#define VAR_OFFSET(Field) \\r
#ifndef _ISCSI_NVDATASTRUC_H_\r
#define _ISCSI_NVDATASTRUC_H_\r
\r
-#define ISCSI_CONFIG_GUID \\r
- { \\r
- 0x6456ed61, 0x3579, 0x41c9, { 0x8a, 0x26, 0x0a, 0x0b, 0xd6, 0x2b, 0x78, 0xfc } \\r
- }\r
+#include <Guid/IScsiConfigHii.h>\r
\r
#define VAR_EQ_TEST_NAME 0x100\r
#define CONFIGURATION_VARSTORE_ID 0x6666\r
\r
AttemptConfigOrder = IScsiGetVariableAndSize (\r
L"AttemptOrder",\r
- &mVendorGuid,\r
+ &gIScsiConfigGuid,\r
&AttemptConfigOrderSize\r
);\r
ASSERT (AttemptConfigOrder != NULL);\r
MdePkg/MdePkg.dec\r
MdeModulePkg/MdeModulePkg.dec\r
CryptoPkg/CryptoPkg.dec\r
+ NetworkPkg/NetworkPkg.dec\r
\r
[LibraryClasses]\r
BaseLib\r
gEfiAcpiTableGuid ## CONSUMES ## GUID\r
gEfiAcpi10TableGuid ## CONSUMES ## GUID\r
gEfiAcpi20TableGuid ## CONSUMES ## GUID\r
+ gIScsiConfigGuid ## PRODUCES ## GUID
\ No newline at end of file
//\r
AttemptConfigOrder = IScsiGetVariableAndSize (\r
L"AttemptOrder",\r
- &mVendorGuid,\r
+ &gIScsiConfigGuid,\r
&AttemptConfigOrderSize\r
);\r
if (AttemptConfigOrder == NULL || AttemptConfigOrderSize == 0) {\r
--- /dev/null
+/** @file\r
+ GUIDs used as HII FormSet and HII Package list GUID in IScsiConfig driver \r
+ that supports IP4 and IP6 both. \r
+ \r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License that accompanies this distribution. \r
+The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php. \r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, \r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+**/\r
+\r
+#ifndef __ISCSI_CONFIG_HII_GUID_H__\r
+#define __ISCSI_CONFIG_HII_GUID_H__\r
+\r
+#define ISCSI_CONFIG_GUID \\r
+ { \\r
+ 0x4b47d616, 0xa8d6, 0x4552, { 0x9d, 0x44, 0xcc, 0xad, 0x2e, 0xf, 0x4c, 0xf9 } \\r
+ }\r
+\r
+extern EFI_GUID gIScsiConfigGuid;\r
+\r
+#endif\r
--- /dev/null
+/** @file\r
+ GUIDs used as HII FormSet and HII Package list GUID in Ip6Config driver. \r
+ \r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License that accompanies this distribution. \r
+The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php. \r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, \r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+**/\r
+\r
+#ifndef __IP6_CONFIG_HII_GUID_H__\r
+#define __IP6_CONFIG_HII_GUID_H__\r
+\r
+#define IP6_CONFIG_NVDATA_GUID \\r
+ { \\r
+ 0x2eea107, 0x98db, 0x400e, { 0x98, 0x30, 0x46, 0xa, 0x15, 0x42, 0xd7, 0x99 } \\r
+ }\r
+\r
+extern EFI_GUID gIp6ConfigNvDataGuid;\r
+\r
+#endif\r
\r
#include "Ip6Impl.h"\r
\r
-EFI_GUID mIp6HiiVendorDevicePathGuid = IP6_HII_VENDOR_DEVICE_PATH_GUID;\r
-EFI_GUID mIp6ConfigNvDataGuid = IP6_CONFIG_NVDATA_GUID;\r
CHAR16 mIp6ConfigStorageName[] = L"IP6_CONFIG_IFR_NVDATA";\r
\r
/**\r
\r
Status = HiiUpdateForm (\r
HiiHandle, // HII handle\r
- &mIp6ConfigNvDataGuid, // Formset GUID\r
+ &gIp6ConfigNvDataGuid, // Formset GUID\r
FORMID_MAIN_FORM, // Form ID\r
StartOpCodeHandle, // Label for where to insert opcodes\r
EndOpCodeHandle // Replace data\r
\r
*Progress = Request;\r
if ((Request != NULL) &&\r
- !HiiIsConfigHdrMatch (Request, &mIp6ConfigNvDataGuid, mIp6ConfigStorageName)) {\r
+ !HiiIsConfigHdrMatch (Request, &gIp6ConfigNvDataGuid, mIp6ConfigStorageName)) {\r
return EFI_NOT_FOUND;\r
}\r
\r
// followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator.\r
//\r
ConfigRequestHdr = HiiConstructConfigHdr (\r
- &mIp6ConfigNvDataGuid,\r
+ &gIp6ConfigNvDataGuid,\r
mIp6ConfigStorageName,\r
Private->ChildHandle\r
);\r
// Check routing data in <ConfigHdr>.\r
// Note: if only one Storage is used, then this checking could be skipped.\r
//\r
- if (!HiiIsConfigHdrMatch (Configuration, &mIp6ConfigNvDataGuid, mIp6ConfigStorageName)) {\r
+ if (!HiiIsConfigHdrMatch (Configuration, &gIp6ConfigNvDataGuid, mIp6ConfigStorageName)) {\r
*Progress = Configuration;\r
return EFI_NOT_FOUND;\r
}\r
VendorDeviceNode.Header.Type = HARDWARE_DEVICE_PATH;\r
VendorDeviceNode.Header.SubType = HW_VENDOR_DP;\r
\r
- CopyGuid (&VendorDeviceNode.Guid, &mIp6HiiVendorDevicePathGuid);\r
+ CopyGuid (&VendorDeviceNode.Guid, &gEfiCallerIdGuid);\r
\r
SetDevicePathNodeLength (&VendorDeviceNode.Header, sizeof (VENDOR_DEVICE_PATH));\r
CallbackInfo->HiiVendorDevicePath = AppendDevicePathNode (\r
// Publish our HII data\r
//\r
CallbackInfo->RegisteredHandle = HiiAddPackages (\r
- &mIp6ConfigNvDataGuid,\r
+ &gIp6ConfigNvDataGuid,\r
CallbackInfo->ChildHandle,\r
Ip6DxeStrings,\r
Ip6ConfigBin,\r
/** @file\r
The header file of Ip6ConfigNv.c.\r
\r
- Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
extern UINT8 Ip6ConfigBin[];\r
extern UINT8 Ip6DxeStrings[];\r
\r
-#define IP6_HII_VENDOR_DEVICE_PATH_GUID \\r
- { \\r
- 0x13288098, 0xb11f, 0x45b9, { 0xbc, 0x4f, 0x91, 0xb5, 0x4b, 0xa3, 0x39, 0xb9 } \\r
- }\r
-\r
#define IP6_ETHERNET L"Ethernet"\r
#define IP6_EXPERIMENTAL_ETHERNET L"Experimental Ethernet"\r
#define IP6_ADDRESS_DELIMITER L' '\r
[Packages]\r
MdePkg/MdePkg.dec\r
MdeModulePkg/MdeModulePkg.dec\r
-\r
+ NetworkPkg/NetworkPkg.dec\r
\r
[LibraryClasses]\r
BaseLib\r
\r
[Guids]\r
gEfiIfrTianoGuid ## CONSUMES ## GUID\r
+ gIp6ConfigNvDataGuid ## PRODUCES ## GUID
\ No newline at end of file
#ifndef _IP6_NV_DATA_H_\r
#define _IP6_NV_DATA_H_\r
\r
-#define IP6_CONFIG_NVDATA_GUID \\r
- { \\r
- 0x2eea107, 0x98db, 0x400e, { 0x98, 0x30, 0x46, 0xa, 0x15, 0x42, 0xd7, 0x99 } \\r
- }\r
+#include <Guid/Ip6ConfigHii.h>\r
\r
#define FORMID_MAIN_FORM 1\r
#define FORMID_MANUAL_CONFIG_FORM 2\r
/** @file\r
Common operation of the IKE.\r
\r
- Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
#define IKE_NONCE_SIZE 16\r
#define IKE_MAX_RETRY 4\r
#define IKE_SPI_BASE 0x10000\r
-#define PRF_HMAC_SHA1_GUID &gEfiCryptAlgorithmSha1Guid\r
#define IKE_PAYLOAD_SIGNATURE SIGNATURE_32('I','K','E','P')\r
#define IKE_PAYLOAD_BY_PACKET(a) CR(a,IKE_PAYLOAD,ByPacket,IKE_PAYLOAD_SIGNATURE)\r
\r
PACKAGE_GUID = 947988BE-8D5C-471a-893D-AD181C46BEBB\r
PACKAGE_VERSION = 0.92\r
\r
+[Includes]\r
+ Include\r
+\r
[Guids]\r
## Network package token space guid.\r
# Include/Guid/NetworkPkgTokenSpace.h\r
gEfiNetworkPkgTokenSpaceGuid = { 0x40e064b2, 0x0ae0, 0x48b1, { 0xa0, 0x7d, 0xf8, 0xcf, 0x1e, 0x1a, 0x23, 0x10}}\r
\r
+ # Include/Guid/Ip6ConfigHii.h\r
+ gIp6ConfigNvDataGuid = { 0x2eea107, 0x98db, 0x400e, { 0x98, 0x30, 0x46, 0xa, 0x15, 0x42, 0xd7, 0x99}}\r
+\r
+ # Include/Guid/IscsiConfigHii.h\r
+ gIScsiConfigGuid = { 0x4b47d616, 0xa8d6, 0x4552, { 0x9d, 0x44, 0xcc, 0xad, 0x2e, 0xf, 0x4c, 0xf9}}\r
+\r
[PcdsFeatureFlag]\r
## If true, the IKEv2 Certificate Authentication feature is enabled.\r
gEfiNetworkPkgTokenSpaceGuid.PcdIpsecCertificateEnabled|TRUE|BOOLEAN|0x00000007\r
NULL\r
};\r
\r
-//\r
-// PXE_PRIVATE_GUID is only used to keep the relationship between \r
-// NIC handle and virtual child handles.\r
-//\r
-EFI_GUID mPxeBcPrivateGuid = PXEBC_PRIVATE_GUID;\r
-\r
-\r
-\r
/**\r
Get the Nic handle using any child handle in the IPv4 stack.\r
\r
//\r
gBS->CloseProtocol (\r
Private->Controller,\r
- &mPxeBcPrivateGuid,\r
+ &gEfiCallerIdGuid,\r
This->DriverBindingHandle,\r
Private->Ip4Nic->Controller\r
);\r
//\r
gBS->CloseProtocol (\r
Private->Controller,\r
- &mPxeBcPrivateGuid,\r
+ &gEfiCallerIdGuid,\r
This->DriverBindingHandle,\r
Private->Ip6Nic->Controller\r
);\r
//\r
Status = gBS->OpenProtocol (\r
ControllerHandle,\r
- &mPxeBcPrivateGuid,\r
+ &gEfiCallerIdGuid,\r
(VOID **) &Id,\r
This->DriverBindingHandle,\r
Private->Ip4Nic->Controller,\r
//\r
Status = gBS->OpenProtocol (\r
ControllerHandle,\r
- &mPxeBcPrivateGuid,\r
+ &gEfiCallerIdGuid,\r
(VOID **) &Id,\r
This->DriverBindingHandle,\r
Private->Ip6Nic->Controller,\r
\r
Status = gBS->OpenProtocol (\r
ControllerHandle,\r
- &mPxeBcPrivateGuid,\r
+ &gEfiCallerIdGuid,\r
(VOID **) &Id,\r
This->DriverBindingHandle,\r
ControllerHandle,\r
\r
//\r
// Install PxeBaseCodePrivate protocol onto the real NIC handler.\r
+ // PxeBaseCodePrivate protocol is only used to keep the relationship between \r
+ // NIC handle and virtual child handles.\r
+ // gEfiCallerIdGuid will be used as its protocol guid.\r
//\r
Status = gBS->InstallProtocolInterface (\r
&ControllerHandle,\r
- &mPxeBcPrivateGuid,\r
+ &gEfiCallerIdGuid,\r
EFI_NATIVE_INTERFACE,\r
&Private->Id\r
);\r
ON_ERROR:\r
gBS->UninstallProtocolInterface (\r
ControllerHandle,\r
- &mPxeBcPrivateGuid,\r
+ &gEfiCallerIdGuid,\r
&Private->Id\r
);\r
PxeBcDestroyIp4Children (This, Private);\r
//\r
Status = gBS->OpenProtocol (\r
NicHandle,\r
- &mPxeBcPrivateGuid,\r
+ &gEfiCallerIdGuid,\r
(VOID **) &Id,\r
This->DriverBindingHandle,\r
ControllerHandle,\r
if (Private->Ip4Nic == NULL && Private->Ip6Nic == NULL) {\r
gBS->UninstallProtocolInterface (\r
NicHandle,\r
- &mPxeBcPrivateGuid,\r
+ &gEfiCallerIdGuid,\r
&Private->Id\r
);\r
FreePool (Private);\r
#define PXEBC_PRIVATE_DATA_FROM_ID(a) CR (a, PXEBC_PRIVATE_DATA, Id, PXEBC_PRIVATE_DATA_SIGNATURE)\r
#define PXEBC_VIRTUAL_NIC_FROM_LOADFILE(a) CR (a, PXEBC_VIRTUAL_NIC, LoadFile, PXEBC_VIRTUAL_NIC_SIGNATURE)\r
\r
-#define PXEBC_PRIVATE_GUID \\r
- { \\r
- 0xa4dfac32, 0xfbb4, 0x4907,{0xb3, 0x13, 0x4, 0xe, 0xe2, 0x42, 0x33, 0x20 } \\r
- }\r
-\r
-\r
typedef union {\r
PXEBC_DHCP4_PACKET_CACHE Dhcp4;\r
PXEBC_DHCP6_PACKET_CACHE Dhcp6;\r