Merge pull request #831 from fjtrujy/cleanup/drop-pre-lwip-130-compat

cleanup: drop dead `PRE_LWIP_130_COMPAT` branches from `smap` and `tcpip-netman`

Author: uyjulian

iop/network/smap/src/main.c

@@ -92,36 +92,6 @@ SMapLowLevelOutput(NetIF *pNetIF, PBuf *pOutput)
     return result;
 }
 
-// SMapOutput():
-
-// This function is called by the TCP/IP stack when an IP packet should be sent. It'll be invoked in the context of the
-// tcpip-thread, hence no synchronization is required.
-//  For LWIP versions before v1.3.0.
-#ifdef PRE_LWIP_130_COMPAT
-static err_t
-SMapOutput(NetIF *pNetIF, PBuf *pOutput, IPAddr *pIPAddr)
-{
-    err_t result;
-    PBuf *pBuf;
-
-#if USE_GP_REGISTER
-    void *OldGP;
-
-    OldGP = SetModuleGP();
-#endif
-
-    pBuf = etharp_output(pNetIF, pIPAddr, pOutput);
-
-    result = pBuf != NULL ? SMapLowLevelOutput(pNetIF, pBuf) : ERR_OK;
-
-#if USE_GP_REGISTER
-    SetGP(OldGP);
-#endif
-
-    return result;
-}
-#endif
-
 // SMapIFInit():
 
 // Should be called at the beginning of the program to set up the network interface.
@@ -138,20 +108,12 @@ SMapIFInit(NetIF *pNetIF)
     TxHead = NULL;
     TxTail = NULL;
 
-    pNetIF->name[0] = IFNAME0;
-    pNetIF->name[1] = IFNAME1;
-#ifdef PRE_LWIP_130_COMPAT
-    pNetIF->output = &SMapOutput; // For LWIP versions before v1.3.0.
-#else
-    pNetIF->output = &etharp_output; // For LWIP 1.3.0 and later.
-#endif
+    pNetIF->name[0]    = IFNAME0;
+    pNetIF->name[1]    = IFNAME1;
+    pNetIF->output     = &etharp_output;
     pNetIF->linkoutput = &SMapLowLevelOutput;
     pNetIF->hwaddr_len = NETIF_MAX_HWADDR_LEN;
-#ifdef PRE_LWIP_130_COMPAT
-    pNetIF->flags |= (NETIF_FLAG_LINK_UP | NETIF_FLAG_BROADCAST); // For LWIP versions before v1.3.0.
-#else
-    pNetIF->flags |= (NETIF_FLAG_ETHARP | NETIF_FLAG_BROADCAST); // For LWIP v1.3.0 and later.
-#endif
+    pNetIF->flags |= (NETIF_FLAG_ETHARP | NETIF_FLAG_BROADCAST);
     pNetIF->mtu = 1500;
 
     // Get MAC address.

iop/tcpip/tcpip-netman/src/ps2ip.c

@@ -348,21 +348,6 @@ SMapLowLevelOutput(struct netif *pNetIF, struct pbuf* pOutput)
 	return result;
 }
 
-//SMapOutput():
-
-//This function is called by the TCP/IP stack when an IP packet should be sent. It'll be invoked in the context of the
-//tcpip-thread, hence no synchronization is required.
-// For LWIP versions before v1.3.0.
-#ifdef PRE_LWIP_130_COMPAT
-static err_t
-SMapOutput(struct netif *pNetIF, struct pbuf *pOutput, IPAddr* pIPAddr)
-{
-	struct pbuf *pBuf=etharp_output(pNetIF,pIPAddr,pOutput);
-
-	return	pBuf!=NULL ? SMapLowLevelOutput(pNetIF, pBuf):ERR_OK;
-}
-#endif
-
 //Should be called at the beginning of the program to set up the network interface.
 static err_t SMapIFInit(struct netif* pNetIF)
 {
@@ -371,18 +356,10 @@ static err_t SMapIFInit(struct netif* pNetIF)
 
 	pNetIF->name[0]='s';
 	pNetIF->name[1]='m';
-#ifdef PRE_LWIP_130_COMPAT
-	pNetIF->output=&SMapOutput;	// For LWIP versions before v1.3.0.
-#else
-	pNetIF->output=&etharp_output;	// For LWIP 1.3.0 and later.
-#endif
+	pNetIF->output=&etharp_output;
 	pNetIF->linkoutput=&SMapLowLevelOutput;
 	pNetIF->hwaddr_len=NETIF_MAX_HWADDR_LEN;
-#ifdef PRE_LWIP_130_COMPAT
-	pNetIF->flags|=(NETIF_FLAG_LINK_UP|NETIF_FLAG_BROADCAST);	// For LWIP versions before v1.3.0.
-#else
-	pNetIF->flags|=(NETIF_FLAG_ETHARP|NETIF_FLAG_BROADCAST);	// For LWIP v1.3.0 and later.
-#endif
+	pNetIF->flags|=(NETIF_FLAG_ETHARP|NETIF_FLAG_ETHERNET|NETIF_FLAG_BROADCAST);
 	pNetIF->mtu=1500;
 
 	//Get MAC address.