/** @file\r
Initialization functions for EFI UNDI32 driver.\r
\r
-Copyright (c) 2006 - 2008, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
http://opensource.org/licenses/bsd-license.php\r
\r
PXE_SW_UNDI *pxe_31 = NULL; // 3.1 entry\r
UNDI32_DEV *UNDI32DeviceList[MAX_NIC_INTERFACES];\r
-NII_TABLE *UndiDataPointer = NULL;\r
+UNDI_CONFIG_TABLE *UndiDataPointer = NULL;\r
\r
//\r
// UNDI Class Driver Global Variables\r
//\r
// UNDI32DeviceList is an array of pointers\r
//\r
- for (Index = 0; Index < pxe_31->IFcnt; Index++) {\r
+ for (Index = 0; Index < (pxe_31->IFcnt | pxe_31->IFcntExt << 8); Index++) {\r
UNDI32DeviceList[Index]->NIIProtocol_31.Id = (UINT64) (UINTN) Pxe31Pointer;\r
EfiConvertPointer (\r
EFI_OPTIONAL_PTR,\r
**/\r
VOID\r
EFIAPI\r
-UndiNotifyExitBs (\r
+UndiNotifyReadyToBoot (\r
EFI_EVENT Event,\r
VOID *Context\r
)\r
// the IfNum index for the current interface will be the total number\r
// of interfaces initialized so far\r
//\r
- UNDI32Device->NIIProtocol_31.IfNum = pxe_31->IFcnt;\r
+ UNDI32Device->NIIProtocol_31.IfNum = pxe_31->IFcnt | pxe_31->IFcntExt << 8;\r
\r
PxeUpdate (&UNDI32Device->NicInfo, pxe_31);\r
\r
UNDI32Device->NIIProtocol_31.MinorVer = PXE_ROMID_MINORVER_31;\r
UNDI32Device->NIIProtocol_31.ImageSize = 0;\r
UNDI32Device->NIIProtocol_31.ImageAddr = 0;\r
- UNDI32Device->NIIProtocol_31.Ipv6Supported = FALSE;\r
+ UNDI32Device->NIIProtocol_31.Ipv6Supported = TRUE;\r
\r
UNDI32Device->NIIProtocol_31.StringId[0] = 'U';\r
UNDI32Device->NIIProtocol_31.StringId[1] = 'N';\r
\r
UNDI32Device->DeviceHandle = NULL;\r
\r
+ UNDI32Device->Aip.GetInformation = UndiAipGetInfo;\r
+ UNDI32Device->Aip.SetInformation = UndiAipSetInfo;\r
+ UNDI32Device->Aip.GetSupportedTypes = UndiAipGetSupportedTypes;\r
+\r
//\r
// install both the 3.0 and 3.1 NII protocols.\r
//\r
&UNDI32Device->NIIProtocol_31,\r
&gEfiDevicePathProtocolGuid,\r
UNDI32Device->Undi32DevPath,\r
+ &gEfiAdapterInformationProtocolGuid,\r
+ &UNDI32Device->Aip,\r
NULL\r
);\r
\r
goto UndiErrorDeleteDevicePath;\r
}\r
\r
- Len = (pxe_31->IFcnt * sizeof (NII_ENTRY)) + sizeof (UndiDataPointer);\r
+ Len = ((pxe_31->IFcnt|pxe_31->IFcntExt << 8)* sizeof (UndiDataPointer->NII_entry)) + sizeof (UndiDataPointer);\r
Status = gBS->AllocatePool (EfiRuntimeServicesData, Len, (VOID **) &UndiDataPointer);\r
\r
if (EFI_ERROR (Status)) {\r
&UNDI32Device->NIIProtocol_31,\r
&gEfiDevicePathProtocolGuid,\r
UNDI32Device->Undi32DevPath,\r
+ &gEfiAdapterInformationProtocolGuid,\r
+ &UNDI32Device->Aip,\r
NULL\r
);\r
\r
UINTN Index;\r
UNDI32_DEV *UNDI32Device;\r
EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL *NIIProtocol;\r
- EFI_PCI_IO_PROTOCOL *PciIo;\r
\r
//\r
// Complete all outstanding transactions to Controller.\r
\r
UNDI32Device = UNDI_DEV_FROM_THIS (NIIProtocol);\r
\r
- //\r
- // Restore original PCI attributes\r
- //\r
- Status = UNDI32Device->NicInfo.Io_Function->Attributes (\r
- UNDI32Device->NicInfo.Io_Function,\r
- EfiPciIoAttributeOperationSet,\r
- UNDI32Device->NicInfo.OriginalPciAttributes,\r
- NULL\r
- );\r
- ASSERT_EFI_ERROR (Status);\r
-\r
Status = gBS->CloseProtocol (\r
Controller,\r
&gEfiPciIoProtocolGuid,\r
This->DriverBindingHandle,\r
ChildHandleBuffer[Index]\r
);\r
-\r
- Status = gBS->UninstallMultipleProtocolInterfaces (\r
- ChildHandleBuffer[Index],\r
- &gEfiDevicePathProtocolGuid,\r
- UNDI32Device->Undi32DevPath,\r
- &gEfiNetworkInterfaceIdentifierProtocolGuid_31,\r
- &UNDI32Device->NIIProtocol_31,\r
- NULL\r
- );\r
-\r
- if (EFI_ERROR (Status)) {\r
- gBS->OpenProtocol (\r
- Controller,\r
- &gEfiPciIoProtocolGuid,\r
- (VOID **) &PciIo,\r
- This->DriverBindingHandle,\r
- ChildHandleBuffer[Index],\r
- EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
- );\r
- } else {\r
- gBS->FreePool (UNDI32Device->Undi32DevPath);\r
- gBS->FreePool (UNDI32Device);\r
+ if (!EFI_ERROR (Status)) {\r
+ Status = gBS->UninstallMultipleProtocolInterfaces (\r
+ ChildHandleBuffer[Index],\r
+ &gEfiDevicePathProtocolGuid,\r
+ UNDI32Device->Undi32DevPath,\r
+ &gEfiNetworkInterfaceIdentifierProtocolGuid_31,\r
+ &UNDI32Device->NIIProtocol_31,\r
+ NULL\r
+ );\r
+ if (!EFI_ERROR (Status)) {\r
+ //\r
+ // Restore original PCI attributes\r
+ //\r
+ Status = UNDI32Device->NicInfo.Io_Function->Attributes (\r
+ UNDI32Device->NicInfo.Io_Function,\r
+ EfiPciIoAttributeOperationSet,\r
+ UNDI32Device->NicInfo.OriginalPciAttributes,\r
+ NULL\r
+ );\r
+\r
+ ASSERT_EFI_ERROR (Status);\r
+\r
+ gBS->FreePool (UNDI32Device->Undi32DevPath);\r
+ gBS->FreePool (UNDI32Device);\r
+\r
+ }\r
}\r
}\r
\r
\r
MacAddrNode.Header.Type = MESSAGING_DEVICE_PATH;\r
MacAddrNode.Header.SubType = MSG_MAC_ADDR_DP;\r
- MacAddrNode.Header.Length[0] = sizeof (MacAddrNode);\r
+ MacAddrNode.Header.Length[0] = (UINT8) sizeof (MacAddrNode);\r
MacAddrNode.Header.Length[1] = 0;\r
\r
//\r
{\r
EFI_STATUS Status;\r
EFI_CONFIGURATION_TABLE *CfgPtr;\r
- NII_TABLE *TmpData;\r
+ UNDI_CONFIG_TABLE *TmpData;\r
UINT16 Index;\r
- NII_TABLE *UndiData;\r
+ UNDI_CONFIG_TABLE *UndiData;\r
\r
if (pxe_31 == NULL) {\r
return EFI_SUCCESS;\r
return EFI_SUCCESS;\r
}\r
\r
- UndiData = (NII_TABLE *)UndiDataPointer;\r
+ UndiData = (UNDI_CONFIG_TABLE *)UndiDataPointer;\r
\r
- UndiData->NumEntries = pxe_31->IFcnt;\r
- UndiData->NextLink = NULL;\r
+ UndiData->NumberOfInterfaces = (pxe_31->IFcnt | pxe_31->IFcntExt << 8);\r
+ UndiData->nextlink = NULL;\r
\r
- for (Index = 0; Index < pxe_31->IFcnt; Index++) {\r
- UndiData->NiiEntry[Index].InterfacePointer = &UNDI32DeviceList[Index]->NIIProtocol_31;\r
- UndiData->NiiEntry[Index].DevicePathPointer = UNDI32DeviceList[Index]->Undi32DevPath;\r
+ for (Index = 0; Index < (pxe_31->IFcnt | pxe_31->IFcntExt << 8); Index++) {\r
+ UndiData->NII_entry[Index].NII_InterfacePointer = &UNDI32DeviceList[Index]->NIIProtocol_31;\r
+ UndiData->NII_entry[Index].DevicePathPointer = UNDI32DeviceList[Index]->Undi32DevPath;\r
}\r
\r
//\r
}\r
\r
if (Index < gST->NumberOfTableEntries) {\r
- TmpData = (NII_TABLE *) CfgPtr->VendorTable;\r
+ TmpData = (UNDI_CONFIG_TABLE *) CfgPtr->VendorTable;\r
\r
//\r
// go to the last link\r
//\r
- while (TmpData->NextLink != NULL) {\r
- TmpData = TmpData->NextLink;\r
+ while (TmpData->nextlink != NULL) {\r
+ TmpData = TmpData->nextlink;\r
}\r
\r
- TmpData->NextLink = UndiData;\r
+ TmpData->nextlink = UndiData;\r
\r
//\r
// 1st one in chain\r
//\r
- UndiData = (NII_TABLE *) CfgPtr->VendorTable;\r
+ UndiData = (UNDI_CONFIG_TABLE *) CfgPtr->VendorTable;\r
}\r
\r
//\r
EFI_EVENT Event;\r
EFI_STATUS Status;\r
\r
- Status = EfiLibInstallDriverBinding (\r
+ Status = EfiLibInstallDriverBindingComponentName2 (\r
ImageHandle,\r
SystemTable,\r
&gUndiDriverBinding,\r
- ImageHandle\r
+ ImageHandle,\r
+ &gUndiComponentName,\r
+ &gUndiComponentName2\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
Status = gBS->CreateEventEx (\r
EVT_NOTIFY_SIGNAL,\r
TPL_NOTIFY,\r
- UndiNotifyExitBs,\r
+ UndiNotifyReadyToBoot,\r
NULL,\r
- &gEfiEventExitBootServicesGuid,\r
+ &gEfiEventReadyToBootGuid,\r
&Event\r
);\r
ASSERT_EFI_ERROR (Status);\r
projects / mirror_edk2.git / blobdiff