Remove gEfiNetworkInterfaceIdentifierProtocolGuid reference from code base. Only...

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / UndiRuntimeDxe / Undi32.h

diff --git a/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Undi32.h b/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Undi32.h
index b0b75339095874f47c36a2b6ad6c8d085dd65c19..32f80fa8f2742411d2c9e8ddb6a60d3591a55f8c 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Undi32.h
+++ b/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Undi32.h
@@ -1,14 +1,14 @@
 \r
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation.\r
-All rights reserved. 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
-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
+Copyright (c) 2006 - 2007, Intel Corporation.\r
+All rights reserved. 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
+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
 Module Name:\r
 \r
@@ -61,12 +61,11 @@ Revision History
 #define MUST_BE_INITIALIZED 2\r
 \r
 #define UNDI_DEV_SIGNATURE   EFI_SIGNATURE_32('u','n','d','i')\r
-#define UNDI_DEV_FROM_THIS(a) CR(a, UNDI32_DEV, NIIProtocol, UNDI_DEV_SIGNATURE)\r
+#define UNDI_DEV_FROM_THIS(a) CR(a, UNDI32_DEV, NIIProtocol_31, UNDI_DEV_SIGNATURE)\r
 #define UNDI_DEV_FROM_NIC(a) CR(a, UNDI32_DEV, NicInfo, UNDI_DEV_SIGNATURE)\r
 \r
 typedef struct {\r
   UINTN                                     Signature;\r
-  EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL NIIProtocol;\r
   EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL NIIProtocol_31;\r
   EFI_HANDLE                                DeviceHandle;\r
   EFI_DEVICE_PATH_PROTOCOL                  *Undi32BaseDevPath;\r
@@ -110,7 +109,6 @@ typedef VOID (*unmap_mem)(UINT64, UINT64, UINT32, UINT32, UINT64);
 typedef VOID (*sync_mem)(UINT64, UINT64, UINT32, UINT32, UINT64);\r
 \r
 extern UNDI_CALL_TABLE  api_table[];\r
-extern PXE_SW_UNDI      *pxe;     // !pxe structure\r
 extern PXE_SW_UNDI      *pxe_31;  // !pxe structure for 3.1 drivers\r
 extern UNDI32_DEV       *UNDI32DeviceList[MAX_NIC_INTERFACES];\r
 \r
@@ -157,7 +155,7 @@ VOID PhyReset (NIC_DATA_INSTANCE *AdapterInfo);
 VOID\r
 MdiWrite (\r
   IN NIC_DATA_INSTANCE *AdapterInfo,\r
-  IN UINT8 RegAddress, \r
+  IN UINT8 RegAddress,\r
   IN UINT8 PhyAddress,\r
   IN UINT16 DataValue\r
   );\r
@@ -165,7 +163,7 @@ MdiWrite (
 VOID\r
 MdiRead(\r
   IN NIC_DATA_INSTANCE *AdapterInfo,\r
-  IN UINT8 RegAddress, \r
+  IN UINT8 RegAddress,\r
   IN UINT8 PhyAddress,\r
   IN OUT UINT16 *DataValue\r
   );\r
@@ -362,13 +360,12 @@ UNDI_Receive (
   );\r
 \r
 VOID UNDI_APIEntry_new(UINT64);\r
-VOID UNDI_APIEntry_old(UINT64);\r
 VOID UNDI_APIEntry_Common(UINT64);\r
 \r
 PXE_IPV4 convert_mcip(PXE_MAC_ADDR *);\r
 INT32 validate_mcip (PXE_MAC_ADDR *MCastAddr);\r
 \r
-VOID PxeStructInit (PXE_SW_UNDI *PxePtr, UINTN VersionFlag);\r
+VOID PxeStructInit (PXE_SW_UNDI *PxePtr);\r
 VOID PxeUpdate (NIC_DATA_INSTANCE *NicPtr, PXE_SW_UNDI *PxePtr);\r
 \r
 #endif\r