Remove gEfiNetworkInterfaceIdentifierProtocolGuid reference from code base. Only...

[mirror_edk2.git] / MdeModulePkg / Universal / Network / SnpDxe / start.c

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/start.c b/MdeModulePkg/Universal/Network/SnpDxe/start.c
index 10c9554a0f3e8d55050d9f90f8cb7dd17d989893..eaba03c57dbe657cf8c914ab6d7f2d6990843b6d 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/start.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/start.c
@@ -33,10 +33,8 @@ pxe_start (
   SNP_DRIVER *snp\r
   )\r
 {\r
-  PXE_CPB_START_30  *cpb;\r
   PXE_CPB_START_31  *cpb_31;\r
 \r
-  cpb     = snp->cpb;\r
   cpb_31  = snp->cpb;\r
   //\r
   // Initialize UNDI Start CDB for H/W UNDI\r
@@ -57,37 +55,23 @@ pxe_start (
   // a S/W UNDI.\r
   //\r
   if (snp->is_swundi) {\r
-    if (snp->IsOldUndi) {\r
-      snp->cdb.CPBsize  = sizeof (PXE_CPB_START_30);\r
-      snp->cdb.CPBaddr  = (UINT64)(UINTN) cpb;\r
-\r
-      cpb->Delay        = (UINT64)(UINTN) &snp_undi32_callback_delay_30;\r
-      cpb->Block        = (UINT64)(UINTN) &snp_undi32_callback_block_30;\r
-\r
-      //\r
-      // Virtual == Physical.  This can be set to zero.\r
-      //\r
-      cpb->Virt2Phys  = (UINT64)(UINTN) &snp_undi32_callback_v2p_30;\r
-      cpb->Mem_IO     = (UINT64)(UINTN) &snp_undi32_callback_memio_30;\r
-    } else {\r
-      snp->cdb.CPBsize  = sizeof (PXE_CPB_START_31);\r
-      snp->cdb.CPBaddr  = (UINT64)(UINTN) cpb_31;\r
-\r
-      cpb_31->Delay     = (UINT64)(UINTN) &snp_undi32_callback_delay;\r
-      cpb_31->Block     = (UINT64)(UINTN) &snp_undi32_callback_block;\r
-\r
-      //\r
-      // Virtual == Physical.  This can be set to zero.\r
-      //\r
-      cpb_31->Virt2Phys = (UINT64)(UINTN) 0;\r
-      cpb_31->Mem_IO    = (UINT64)(UINTN) &snp_undi32_callback_memio;\r
-\r
-      cpb_31->Map_Mem   = (UINT64)(UINTN) &snp_undi32_callback_map;\r
-      cpb_31->UnMap_Mem = (UINT64)(UINTN) &snp_undi32_callback_unmap;\r
-      cpb_31->Sync_Mem  = (UINT64)(UINTN) &snp_undi32_callback_sync;\r
-\r
-      cpb_31->Unique_ID = (UINT64)(UINTN) snp;\r
-    }\r
+    snp->cdb.CPBsize  = sizeof (PXE_CPB_START_31);\r
+    snp->cdb.CPBaddr  = (UINT64)(UINTN) cpb_31;\r
+\r
+    cpb_31->Delay     = (UINT64)(UINTN) &snp_undi32_callback_delay;\r
+    cpb_31->Block     = (UINT64)(UINTN) &snp_undi32_callback_block;\r
+\r
+    //\r
+    // Virtual == Physical.  This can be set to zero.\r
+    //\r
+    cpb_31->Virt2Phys = (UINT64)(UINTN) 0;\r
+    cpb_31->Mem_IO    = (UINT64)(UINTN) &snp_undi32_callback_memio;\r
+\r
+    cpb_31->Map_Mem   = (UINT64)(UINTN) &snp_undi32_callback_map;\r
+    cpb_31->UnMap_Mem = (UINT64)(UINTN) &snp_undi32_callback_unmap;\r
+    cpb_31->Sync_Mem  = (UINT64)(UINTN) &snp_undi32_callback_sync;\r
+\r
+    cpb_31->Unique_ID = (UINT64)(UINTN) snp;\r
   }\r
   //\r
   // Issue UNDI command and check result.\r