Consume the UNDI_CONFIG_TABLE defined in MdePkg and remove the local definition of...

Signed-off-by: vanjeff
Reviewed-by: mdkinney
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12561 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OptionRomPkg/UndiRuntimeDxe/Init.c b/OptionRomPkg/UndiRuntimeDxe/Init.c
index d6ad430a6331bb0eb58fc67fd6f388344b5e2771..10c26ad438b942d681e2dca4182ab63bdece61f7 100644 (file)
--- a/OptionRomPkg/UndiRuntimeDxe/Init.c
+++ b/OptionRomPkg/UndiRuntimeDxe/Init.c
@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \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
@@ -470,7 +470,7 @@ UndiDriverStart (
     goto UndiErrorDeleteDevicePath;\r
   }\r
 \r
-  Len = (pxe_31->IFcnt * sizeof (NII_ENTRY)) + sizeof (UndiDataPointer);\r
+  Len = (pxe_31->IFcnt * sizeof (UndiDataPointer->NII_entry)) + sizeof (UndiDataPointer);\r
   Status = gBS->AllocatePool (EfiRuntimeServicesData, Len, (VOID **) &UndiDataPointer);\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -935,9 +935,9 @@ InstallConfigTable (
 {\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
@@ -947,14 +947,14 @@ InstallConfigTable (
     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;\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
+    UndiData->NII_entry[Index].NII_InterfacePointer = &UNDI32DeviceList[Index]->NIIProtocol_31;\r
+    UndiData->NII_entry[Index].DevicePathPointer    = UNDI32DeviceList[Index]->Undi32DevPath;\r
   }\r
 \r
   //\r
@@ -975,21 +975,21 @@ InstallConfigTable (
   }\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

diff --git a/OptionRomPkg/UndiRuntimeDxe/Undi32.h b/OptionRomPkg/UndiRuntimeDxe/Undi32.h
index 6409bea391e4f5154382a94b06bd88fada2a83b3..c35f4f3eab3bf7e24b71cd18885dc765accb4fa9 100644 (file)
--- a/OptionRomPkg/UndiRuntimeDxe/Undi32.h
+++ b/OptionRomPkg/UndiRuntimeDxe/Undi32.h
@@ -1,7 +1,7 @@
 /** @file\r
   EFI internal structures for the EFI UNDI driver.\r
 \r
-Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, 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
@@ -71,18 +71,6 @@ typedef struct {
   VOID (*api_ptr)();\r
 } UNDI_CALL_TABLE;\r
 \r
-typedef struct {\r
-  EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL *InterfacePointer;\r
-  EFI_DEVICE_PATH_PROTOCOL                  *DevicePathPointer;\r
-} NII_ENTRY;\r
-\r
-typedef struct NII_CONFIG_ENTRY {\r
-  UINT32                   NumEntries;\r
-  UINT32                   Reserved;              // padding for alignment\r
-  struct NII_CONFIG_ENTRY  *NextLink;\r
-  NII_ENTRY                NiiEntry[1];\r
-} NII_TABLE;\r
-\r
 typedef VOID (*ptr)(VOID);\r
 typedef VOID (*bsptr_30)(UINTN);\r
 typedef VOID (*virtphys_30)(UINT64, UINT64);\r