Rename uip_poll->devif_poll and uip_timer->devif_timer

8 files changed, 37 insertions, 37 deletions

diff --git a/nuttx/drivers/net/cs89x0.c b/nuttx/drivers/net/cs89x0.c
index 38906b082..9bb17ac4c 100644
--- a/nuttx/drivers/net/cs89x0.c
+++ b/nuttx/drivers/net/cs89x0.c
@@ -311,7 +311,7 @@ static int cs89x0_transmit(struct cs89x0_driver_s *cs89x0)
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from uip_poll().  uip_poll() may be called:
+ *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -518,7 +518,7 @@ static void cs89x0_txdone(struct cs89x0_driver_s *cs89x0, uint16_t isq)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)uip_poll(&cs89x0->cs_dev, cs89x0_uiptxpoll);
+  (void)devif_poll(&cs89x0->cs_dev, cs89x0_uiptxpoll);
 }
 
 /****************************************************************************
@@ -663,7 +663,7 @@ static void cs89x0_txtimeout(int argc, uint32_t arg, ...)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)uip_poll(&cs89x0->cs_dev, cs89x0_uiptxpoll);
+  (void)devif_poll(&cs89x0->cs_dev, cs89x0_uiptxpoll);
 }
 
 /****************************************************************************
@@ -692,7 +692,7 @@ static void cs89x0_polltimer(int argc, uint32_t arg, ...)
 
   /* If so, update TCP timing states and poll uIP for new XMIT data */
 
-  (void)uip_timer(&cs89x0->cs_dev, cs89x0_uiptxpoll, CS89x0_POLLHSEC);
+  (void)devif_timer(&cs89x0->cs_dev, cs89x0_uiptxpoll, CS89x0_POLLHSEC);
 
   /* Setup the watchdog poll timer again */
 
@@ -811,7 +811,7 @@ static int cs89x0_txavail(struct net_driver_s *dev)
 
       /* If so, then poll uIP for new XMIT data */
 
-      (void)uip_poll(&cs89x0->cs_dev, cs89x0_uiptxpoll);
+      (void)devif_poll(&cs89x0->cs_dev, cs89x0_uiptxpoll);
     }
 
   irqrestore(flags);
diff --git a/nuttx/drivers/net/dm90x0.c b/nuttx/drivers/net/dm90x0.c
index 58e9901bb..6127defa7 100644
--- a/nuttx/drivers/net/dm90x0.c
+++ b/nuttx/drivers/net/dm90x0.c
@@ -823,7 +823,7 @@ static int dm9x_transmit(struct dm9x_driver_s *dm9x)
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from uip_poll().  uip_poll() may be called:
+ *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the DM90x0 is reset
@@ -1086,7 +1086,7 @@ static void dm9x_txdone(struct dm9x_driver_s *dm9x)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)uip_poll(&dm9x->dm_dev, dm9x_uiptxpoll);
+  (void)devif_poll(&dm9x->dm_dev, dm9x_uiptxpoll);
 }
 
 /****************************************************************************
@@ -1249,7 +1249,7 @@ static void dm9x_txtimeout(int argc, uint32_t arg, ...)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)uip_poll(&dm9x->dm_dev, dm9x_uiptxpoll);
+  (void)devif_poll(&dm9x->dm_dev, dm9x_uiptxpoll);
 }
 
 /****************************************************************************
@@ -1291,7 +1291,7 @@ static void dm9x_polltimer(int argc, uint32_t arg, ...)
     {
       /* If so, update TCP timing states and poll uIP for new XMIT data */
 
-      (void)uip_timer(&dm9x->dm_dev, dm9x_uiptxpoll, DM6X_POLLHSEC);
+      (void)devif_timer(&dm9x->dm_dev, dm9x_uiptxpoll, DM6X_POLLHSEC);
     }
 
   /* Setup the watchdog poll timer again */
@@ -1499,7 +1499,7 @@ static int dm9x_txavail(struct net_driver_s *dev)
         {
           /* If so, then poll uIP for new XMIT data */
 
-          (void)uip_poll(&dm9x->dm_dev, dm9x_uiptxpoll);
+          (void)devif_poll(&dm9x->dm_dev, dm9x_uiptxpoll);
         }
     }
   irqrestore(flags);
diff --git a/nuttx/drivers/net/e1000.c b/nuttx/drivers/net/e1000.c
index 272101290..b800ca949 100644
--- a/nuttx/drivers/net/e1000.c
+++ b/nuttx/drivers/net/e1000.c
@@ -457,7 +457,7 @@ static int e1000_transmit(struct e1000_dev *e1000)
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from uip_poll().  uip_poll() may be called:
+ *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -641,7 +641,7 @@ static void e1000_txtimeout(int argc, uint32_t arg, ...)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)uip_poll(&e1000->netdev, e1000_uiptxpoll);
+  (void)devif_poll(&e1000->netdev, e1000_uiptxpoll);
 }
 
 /****************************************************************************
@@ -681,7 +681,7 @@ static void e1000_polltimer(int argc, uint32_t arg, ...)
    * we will missing TCP time state updates?
    */
 
-  (void)uip_timer(&e1000->netdev, e1000_uiptxpoll, E1000_POLLHSEC);
+  (void)devif_timer(&e1000->netdev, e1000_uiptxpoll, E1000_POLLHSEC);
 
   /* Setup the watchdog poll timer again */
 
@@ -819,7 +819,7 @@ static int e1000_txavail(struct net_driver_s *dev)
 
       if (e1000->tx_ring.desc[tail].desc_status)
         {
-          (void)uip_poll(&e1000->netdev, e1000_uiptxpoll);
+          (void)devif_poll(&e1000->netdev, e1000_uiptxpoll);
         }
     }
 
@@ -938,7 +938,7 @@ static irqreturn_t e1000_interrupt_handler(int irq, void *dev_id)
 
   if (intr_cause & (1<<0))
     {
-      uip_poll(&e1000->netdev, e1000_uiptxpoll);
+      devif_poll(&e1000->netdev, e1000_uiptxpoll);
     }
 
 
diff --git a/nuttx/drivers/net/enc28j60.c b/nuttx/drivers/net/enc28j60.c
index e3d9d47aa..67cae3af2 100644
--- a/nuttx/drivers/net/enc28j60.c
+++ b/nuttx/drivers/net/enc28j60.c
@@ -1167,7 +1167,7 @@ static int enc_transmit(FAR struct enc_driver_s *priv)
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from uip_poll().  uip_poll() may be called:
+ *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -1276,7 +1276,7 @@ static void enc_txif(FAR struct enc_driver_s *priv)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)uip_poll(&priv->dev, enc_uiptxpoll);
+  (void)devif_poll(&priv->dev, enc_uiptxpoll);
 }
 
 /****************************************************************************
@@ -1835,7 +1835,7 @@ static void enc_toworker(FAR void *arg)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)uip_poll(&priv->dev, enc_uiptxpoll);
+  (void)devif_poll(&priv->dev, enc_uiptxpoll);
 
   /* Release lock on uIP */
 
@@ -1924,7 +1924,7 @@ static void enc_pollworker(FAR void *arg)
        * in progress, we will missing TCP time state updates?
        */
 
-      (void)uip_timer(&priv->dev, enc_uiptxpoll, ENC_POLLHSEC);
+      (void)devif_timer(&priv->dev, enc_uiptxpoll, ENC_POLLHSEC);
     }
 
   /* Release lock on the SPI bus and uIP */
@@ -2144,7 +2144,7 @@ static int enc_txavail(struct net_driver_s *dev)
         {
           /* The interface is up and TX is idle; poll uIP for new XMIT data */
 
-          (void)uip_poll(&priv->dev, enc_uiptxpoll);
+          (void)devif_poll(&priv->dev, enc_uiptxpoll);
         }
     }
 
diff --git a/nuttx/drivers/net/encx24j600.c b/nuttx/drivers/net/encx24j600.c
index a0d90761a..2665f9694 100644
--- a/nuttx/drivers/net/encx24j600.c
+++ b/nuttx/drivers/net/encx24j600.c
@@ -1179,7 +1179,7 @@ static int enc_txenqueue(FAR struct enc_driver_s *priv)
  *
  * Description:
  *   Enqueues uIP packets if available.
- *   This is a callback from uip_poll().  uip_poll() may be called:
+ *   This is a callback from devif_poll().  devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timedout and the interface is reset
@@ -1305,7 +1305,7 @@ static void enc_txif(FAR struct enc_driver_s *priv)
 
       /* Poll for uip packets */
 
-      uip_poll(&priv->dev, enc_uiptxpoll);
+      devif_poll(&priv->dev, enc_uiptxpoll);
     }
   else
     {
@@ -2005,7 +2005,7 @@ static void enc_toworker(FAR void *arg)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)uip_poll(&priv->dev, enc_uiptxpoll);
+  (void)devif_poll(&priv->dev, enc_uiptxpoll);
 
   /* Release uIP */
 
@@ -2095,7 +2095,7 @@ static void enc_pollworker(FAR void *arg)
        * in progress, we will missing TCP time state updates?
        */
 
-      (void)uip_timer(&priv->dev, enc_uiptxpoll, ENC_POLLHSEC);
+      (void)devif_timer(&priv->dev, enc_uiptxpoll, ENC_POLLHSEC);
     }
 
   /* Release lock on the SPI bus and uIP */
@@ -2321,7 +2321,7 @@ static int enc_txavail(struct net_driver_s *dev)
         {
           /* The interface is up and TX is idle; poll uIP for new XMIT data */
 
-          (void)uip_poll(&priv->dev, enc_uiptxpoll);
+          (void)devif_poll(&priv->dev, enc_uiptxpoll);
         }
     }
 
diff --git a/nuttx/drivers/net/skeleton.c b/nuttx/drivers/net/skeleton.c
index 129554c3f..a7ce5c68b 100644
--- a/nuttx/drivers/net/skeleton.c
+++ b/nuttx/drivers/net/skeleton.c
@@ -183,7 +183,7 @@ static int skel_transmit(FAR struct skel_driver_s *skel)
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from uip_poll().  uip_poll() may be called:
+ *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -323,7 +323,7 @@ static void skel_txdone(FAR struct skel_driver_s *skel)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)uip_poll(&skel->sk_dev, skel_uiptxpoll);
+  (void)devif_poll(&skel->sk_dev, skel_uiptxpoll);
 }
 
 /****************************************************************************
@@ -394,7 +394,7 @@ static void skel_txtimeout(int argc, uint32_t arg, ...)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)uip_poll(&skel->sk_dev, skel_uiptxpoll);
+  (void)devif_poll(&skel->sk_dev, skel_uiptxpoll);
 }
 
 /****************************************************************************
@@ -428,7 +428,7 @@ static void skel_polltimer(int argc, uint32_t arg, ...)
    * we will missing TCP time state updates?
    */
 
-  (void)uip_timer(&skel->sk_dev, skel_uiptxpoll, skeleton_POLLHSEC);
+  (void)devif_timer(&skel->sk_dev, skel_uiptxpoll, skeleton_POLLHSEC);
 
   /* Setup the watchdog poll timer again */
 
@@ -554,7 +554,7 @@ static int skel_txavail(struct net_driver_s *dev)
 
       /* If so, then poll uIP for new XMIT data */
 
-      (void)uip_poll(&skel->sk_dev, skel_uiptxpoll);
+      (void)devif_poll(&skel->sk_dev, skel_uiptxpoll);
     }
 
   irqrestore(flags);
diff --git a/nuttx/drivers/net/slip.c b/nuttx/drivers/net/slip.c
index 1bc0a9d18..7746c4e20 100644
--- a/nuttx/drivers/net/slip.c
+++ b/nuttx/drivers/net/slip.c
@@ -402,7 +402,7 @@ static int slip_transmit(FAR struct slip_driver_s *priv)
  *
  * Description:
  *   Check if uIP has any outgoing packets ready to send.  This is a
- *   callback from uip_poll().  uip_poll() may be called:
+ *   callback from devif_poll().  devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete, or
  *   2. When the preceding TX packet send times o ]ut and the interface is reset
@@ -495,7 +495,7 @@ static void slip_txtask(int argc, char *argv[])
 
           flags = net_lock();
           priv->dev.d_buf = priv->txbuf;
-          (void)uip_timer(&priv->dev, slip_uiptxpoll, SLIP_POLLHSEC);
+          (void)devif_timer(&priv->dev, slip_uiptxpoll, SLIP_POLLHSEC);
           net_unlock(flags);
           slip_semgive(priv);
         }
diff --git a/nuttx/drivers/net/vnet.c b/nuttx/drivers/net/vnet.c
index c00e612b7..d3db255e3 100644
--- a/nuttx/drivers/net/vnet.c
+++ b/nuttx/drivers/net/vnet.c
@@ -202,7 +202,7 @@ static int vnet_transmit(FAR struct vnet_driver_s *vnet)
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from uip_poll().  uip_poll() may be called:
+ *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -345,7 +345,7 @@ static void vnet_txdone(FAR struct vnet_driver_s *vnet)
 
 	/* Then poll uIP for new XMIT data */
 
-	(void)uip_poll(&vnet->sk_dev, vnet_uiptxpoll);
+	(void)devif_poll(&vnet->sk_dev, vnet_uiptxpoll);
 }
 
 /****************************************************************************
@@ -377,7 +377,7 @@ static void vnet_txtimeout(int argc, uint32_t arg, ...)
 
 	/* Then poll uIP for new XMIT data */
 
-	(void)uip_poll(&vnet->sk_dev, vnet_uiptxpoll);
+	(void)devif_poll(&vnet->sk_dev, vnet_uiptxpoll);
 }
 
 /****************************************************************************
@@ -417,7 +417,7 @@ static void vnet_polltimer(int argc, uint32_t arg, ...)
 	 * we will missing TCP time state updates?
 	 */
 
-	(void)uip_timer(&vnet->sk_dev, vnet_uiptxpoll, VNET_POLLHSEC);
+	(void)devif_timer(&vnet->sk_dev, vnet_uiptxpoll, VNET_POLLHSEC);
 
 	/* Setup the watchdog poll timer again */
 
@@ -545,7 +545,7 @@ static int vnet_txavail(struct net_driver_s *dev)
 
 		/* If so, then poll uIP for new XMIT data */
 
-		(void)uip_poll(&vnet->sk_dev, vnet_uiptxpoll);
+		(void)devif_poll(&vnet->sk_dev, vnet_uiptxpoll);
     }
 
 out: