From 7668388eb7fd1960efaa409e3191cc7b7d5cb014 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 1 Jul 2014 18:41:08 -0600 Subject: NET: Rename XYZ_uiptxpoll to just XYZ_txpoll --- nuttx/drivers/net/cs89x0.c | 14 +++++++------- nuttx/drivers/net/dm90x0.c | 14 +++++++------- nuttx/drivers/net/e1000.c | 14 +++++++------- nuttx/drivers/net/enc28j60.c | 14 +++++++------- nuttx/drivers/net/encx24j600.c | 14 +++++++------- nuttx/drivers/net/skeleton.c | 14 +++++++------- nuttx/drivers/net/slip.c | 8 ++++---- nuttx/drivers/net/vnet.c | 14 +++++++------- 8 files changed, 53 insertions(+), 53 deletions(-) (limited to 'nuttx/drivers/net') diff --git a/nuttx/drivers/net/cs89x0.c b/nuttx/drivers/net/cs89x0.c index 9bb17ac4c..89ac47210 100644 --- a/nuttx/drivers/net/cs89x0.c +++ b/nuttx/drivers/net/cs89x0.c @@ -116,7 +116,7 @@ static void cs89x0_putppreg(struct cs89x0_driver_s *cs89x0, int addr, /* Common TX logic */ static int cs89x0_transmit(struct cs89x0_driver_s *cs89x0); -static int cs89x0_uiptxpoll(struct net_driver_s *dev); +static int cs89x0_txpoll(struct net_driver_s *dev); /* Interrupt handling */ @@ -307,7 +307,7 @@ static int cs89x0_transmit(struct cs89x0_driver_s *cs89x0) } /**************************************************************************** - * Function: cs89x0_uiptxpoll + * Function: cs89x0_txpoll * * Description: * The transmitter is available, check if uIP has any outgoing packets ready @@ -327,7 +327,7 @@ static int cs89x0_transmit(struct cs89x0_driver_s *cs89x0) * ****************************************************************************/ -static int cs89x0_uiptxpoll(struct net_driver_s *dev) +static int cs89x0_txpoll(struct net_driver_s *dev) { struct cs89x0_driver_s *cs89x0 = (struct cs89x0_driver_s *)dev->d_private; @@ -518,7 +518,7 @@ static void cs89x0_txdone(struct cs89x0_driver_s *cs89x0, uint16_t isq) /* Then poll uIP for new XMIT data */ - (void)devif_poll(&cs89x0->cs_dev, cs89x0_uiptxpoll); + (void)devif_poll(&cs89x0->cs_dev, cs89x0_txpoll); } /**************************************************************************** @@ -663,7 +663,7 @@ static void cs89x0_txtimeout(int argc, uint32_t arg, ...) /* Then poll uIP for new XMIT data */ - (void)devif_poll(&cs89x0->cs_dev, cs89x0_uiptxpoll); + (void)devif_poll(&cs89x0->cs_dev, cs89x0_txpoll); } /**************************************************************************** @@ -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)devif_timer(&cs89x0->cs_dev, cs89x0_uiptxpoll, CS89x0_POLLHSEC); + (void)devif_timer(&cs89x0->cs_dev, cs89x0_txpoll, 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)devif_poll(&cs89x0->cs_dev, cs89x0_uiptxpoll); + (void)devif_poll(&cs89x0->cs_dev, cs89x0_txpoll); } irqrestore(flags); diff --git a/nuttx/drivers/net/dm90x0.c b/nuttx/drivers/net/dm90x0.c index 6127defa7..f3c4090a1 100644 --- a/nuttx/drivers/net/dm90x0.c +++ b/nuttx/drivers/net/dm90x0.c @@ -376,7 +376,7 @@ static bool dm9x_rxchecksumready(uint8_t); /* Common TX logic */ static int dm9x_transmit(struct dm9x_driver_s *dm9x); -static int dm9x_uiptxpoll(struct net_driver_s *dev); +static int dm9x_txpoll(struct net_driver_s *dev); /* Interrupt handling */ @@ -819,7 +819,7 @@ static int dm9x_transmit(struct dm9x_driver_s *dm9x) } /**************************************************************************** - * Function: dm9x_uiptxpoll + * Function: dm9x_txpoll * * Description: * The transmitter is available, check if uIP has any outgoing packets ready @@ -839,7 +839,7 @@ static int dm9x_transmit(struct dm9x_driver_s *dm9x) * ****************************************************************************/ -static int dm9x_uiptxpoll(struct net_driver_s *dev) +static int dm9x_txpoll(struct net_driver_s *dev) { struct dm9x_driver_s *dm9x = (struct dm9x_driver_s *)dev->d_private; @@ -1086,7 +1086,7 @@ static void dm9x_txdone(struct dm9x_driver_s *dm9x) /* Then poll uIP for new XMIT data */ - (void)devif_poll(&dm9x->dm_dev, dm9x_uiptxpoll); + (void)devif_poll(&dm9x->dm_dev, dm9x_txpoll); } /**************************************************************************** @@ -1249,7 +1249,7 @@ static void dm9x_txtimeout(int argc, uint32_t arg, ...) /* Then poll uIP for new XMIT data */ - (void)devif_poll(&dm9x->dm_dev, dm9x_uiptxpoll); + (void)devif_poll(&dm9x->dm_dev, dm9x_txpoll); } /**************************************************************************** @@ -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)devif_timer(&dm9x->dm_dev, dm9x_uiptxpoll, DM6X_POLLHSEC); + (void)devif_timer(&dm9x->dm_dev, dm9x_txpoll, 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)devif_poll(&dm9x->dm_dev, dm9x_uiptxpoll); + (void)devif_poll(&dm9x->dm_dev, dm9x_txpoll); } } irqrestore(flags); diff --git a/nuttx/drivers/net/e1000.c b/nuttx/drivers/net/e1000.c index b800ca949..ce3fe13ce 100644 --- a/nuttx/drivers/net/e1000.c +++ b/nuttx/drivers/net/e1000.c @@ -146,7 +146,7 @@ static struct e1000_dev_head e1000_list = {0}; /* Common TX logic */ static int e1000_transmit(struct e1000_dev *e1000); -static int e1000_uiptxpoll(struct net_driver_s *dev); +static int e1000_txpoll(struct net_driver_s *dev); /* Interrupt handling */ @@ -453,7 +453,7 @@ static int e1000_transmit(struct e1000_dev *e1000) } /**************************************************************************** - * Function: e1000_uiptxpoll + * Function: e1000_txpoll * * Description: * The transmitter is available, check if uIP has any outgoing packets ready @@ -476,7 +476,7 @@ static int e1000_transmit(struct e1000_dev *e1000) * ****************************************************************************/ -static int e1000_uiptxpoll(struct net_driver_s *dev) +static int e1000_txpoll(struct net_driver_s *dev) { struct e1000_dev *e1000 = (struct e1000_dev *)dev->d_private; int tail = e1000->tx_ring.tail; @@ -641,7 +641,7 @@ static void e1000_txtimeout(int argc, uint32_t arg, ...) /* Then poll uIP for new XMIT data */ - (void)devif_poll(&e1000->netdev, e1000_uiptxpoll); + (void)devif_poll(&e1000->netdev, e1000_txpoll); } /**************************************************************************** @@ -681,7 +681,7 @@ static void e1000_polltimer(int argc, uint32_t arg, ...) * we will missing TCP time state updates? */ - (void)devif_timer(&e1000->netdev, e1000_uiptxpoll, E1000_POLLHSEC); + (void)devif_timer(&e1000->netdev, e1000_txpoll, 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)devif_poll(&e1000->netdev, e1000_uiptxpoll); + (void)devif_poll(&e1000->netdev, e1000_txpoll); } } @@ -938,7 +938,7 @@ static irqreturn_t e1000_interrupt_handler(int irq, void *dev_id) if (intr_cause & (1<<0)) { - devif_poll(&e1000->netdev, e1000_uiptxpoll); + devif_poll(&e1000->netdev, e1000_txpoll); } diff --git a/nuttx/drivers/net/enc28j60.c b/nuttx/drivers/net/enc28j60.c index 67cae3af2..25a0272e8 100644 --- a/nuttx/drivers/net/enc28j60.c +++ b/nuttx/drivers/net/enc28j60.c @@ -312,7 +312,7 @@ static void enc_wrphy(FAR struct enc_driver_s *priv, uint8_t phyaddr, /* Common TX logic */ static int enc_transmit(FAR struct enc_driver_s *priv); -static int enc_uiptxpoll(struct net_driver_s *dev); +static int enc_txpoll(struct net_driver_s *dev); /* Interrupt handling */ @@ -1163,7 +1163,7 @@ static int enc_transmit(FAR struct enc_driver_s *priv) } /**************************************************************************** - * Function: enc_uiptxpoll + * Function: enc_txpoll * * Description: * The transmitter is available, check if uIP has any outgoing packets ready @@ -1184,7 +1184,7 @@ static int enc_transmit(FAR struct enc_driver_s *priv) * ****************************************************************************/ -static int enc_uiptxpoll(struct net_driver_s *dev) +static int enc_txpoll(struct net_driver_s *dev) { FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private; @@ -1276,7 +1276,7 @@ static void enc_txif(FAR struct enc_driver_s *priv) /* Then poll uIP for new XMIT data */ - (void)devif_poll(&priv->dev, enc_uiptxpoll); + (void)devif_poll(&priv->dev, enc_txpoll); } /**************************************************************************** @@ -1835,7 +1835,7 @@ static void enc_toworker(FAR void *arg) /* Then poll uIP for new XMIT data */ - (void)devif_poll(&priv->dev, enc_uiptxpoll); + (void)devif_poll(&priv->dev, enc_txpoll); /* 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)devif_timer(&priv->dev, enc_uiptxpoll, ENC_POLLHSEC); + (void)devif_timer(&priv->dev, enc_txpoll, 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)devif_poll(&priv->dev, enc_uiptxpoll); + (void)devif_poll(&priv->dev, enc_txpoll); } } diff --git a/nuttx/drivers/net/encx24j600.c b/nuttx/drivers/net/encx24j600.c index 2665f9694..c3feb4918 100644 --- a/nuttx/drivers/net/encx24j600.c +++ b/nuttx/drivers/net/encx24j600.c @@ -328,7 +328,7 @@ static void enc_wrphy(FAR struct enc_driver_s *priv, uint8_t phyaddr, static int enc_txenqueue(FAR struct enc_driver_s *priv); static int enc_transmit(FAR struct enc_driver_s *priv); -static int enc_uiptxpoll(struct net_driver_s *dev); +static int enc_txpoll(struct net_driver_s *dev); /* Common RX logic */ @@ -1175,7 +1175,7 @@ static int enc_txenqueue(FAR struct enc_driver_s *priv) } /**************************************************************************** - * Function: enc_uiptxpoll + * Function: enc_txpoll * * Description: * Enqueues uIP packets if available. @@ -1196,7 +1196,7 @@ static int enc_txenqueue(FAR struct enc_driver_s *priv) * ****************************************************************************/ -static int enc_uiptxpoll(struct net_driver_s *dev) +static int enc_txpoll(struct net_driver_s *dev) { FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private; int ret = OK; @@ -1305,7 +1305,7 @@ static void enc_txif(FAR struct enc_driver_s *priv) /* Poll for uip packets */ - devif_poll(&priv->dev, enc_uiptxpoll); + devif_poll(&priv->dev, enc_txpoll); } else { @@ -2005,7 +2005,7 @@ static void enc_toworker(FAR void *arg) /* Then poll uIP for new XMIT data */ - (void)devif_poll(&priv->dev, enc_uiptxpoll); + (void)devif_poll(&priv->dev, enc_txpoll); /* Release uIP */ @@ -2095,7 +2095,7 @@ static void enc_pollworker(FAR void *arg) * in progress, we will missing TCP time state updates? */ - (void)devif_timer(&priv->dev, enc_uiptxpoll, ENC_POLLHSEC); + (void)devif_timer(&priv->dev, enc_txpoll, 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)devif_poll(&priv->dev, enc_uiptxpoll); + (void)devif_poll(&priv->dev, enc_txpoll); } } diff --git a/nuttx/drivers/net/skeleton.c b/nuttx/drivers/net/skeleton.c index a7ce5c68b..63ff38d6d 100644 --- a/nuttx/drivers/net/skeleton.c +++ b/nuttx/drivers/net/skeleton.c @@ -112,7 +112,7 @@ static struct skel_driver_s g_skel[CONFIG_skeleton_NINTERFACES]; /* Common TX logic */ static int skel_transmit(FAR struct skel_driver_s *skel); -static int skel_uiptxpoll(struct net_driver_s *dev); +static int skel_txpoll(struct net_driver_s *dev); /* Interrupt handling */ @@ -179,7 +179,7 @@ static int skel_transmit(FAR struct skel_driver_s *skel) } /**************************************************************************** - * Function: skel_uiptxpoll + * Function: skel_txpoll * * Description: * The transmitter is available, check if uIP has any outgoing packets ready @@ -202,7 +202,7 @@ static int skel_transmit(FAR struct skel_driver_s *skel) * ****************************************************************************/ -static int skel_uiptxpoll(struct net_driver_s *dev) +static int skel_txpoll(struct net_driver_s *dev) { FAR struct skel_driver_s *skel = (FAR struct skel_driver_s *)dev->d_private; @@ -323,7 +323,7 @@ static void skel_txdone(FAR struct skel_driver_s *skel) /* Then poll uIP for new XMIT data */ - (void)devif_poll(&skel->sk_dev, skel_uiptxpoll); + (void)devif_poll(&skel->sk_dev, skel_txpoll); } /**************************************************************************** @@ -394,7 +394,7 @@ static void skel_txtimeout(int argc, uint32_t arg, ...) /* Then poll uIP for new XMIT data */ - (void)devif_poll(&skel->sk_dev, skel_uiptxpoll); + (void)devif_poll(&skel->sk_dev, skel_txpoll); } /**************************************************************************** @@ -428,7 +428,7 @@ static void skel_polltimer(int argc, uint32_t arg, ...) * we will missing TCP time state updates? */ - (void)devif_timer(&skel->sk_dev, skel_uiptxpoll, skeleton_POLLHSEC); + (void)devif_timer(&skel->sk_dev, skel_txpoll, 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)devif_poll(&skel->sk_dev, skel_uiptxpoll); + (void)devif_poll(&skel->sk_dev, skel_txpoll); } irqrestore(flags); diff --git a/nuttx/drivers/net/slip.c b/nuttx/drivers/net/slip.c index a13233185..56a61d531 100644 --- a/nuttx/drivers/net/slip.c +++ b/nuttx/drivers/net/slip.c @@ -202,7 +202,7 @@ static void slip_semtake(FAR struct slip_driver_s *priv); static void slip_write(FAR struct slip_driver_s *priv, const uint8_t *buffer, int len); static void slip_putc(FAR struct slip_driver_s *priv, int ch); static int slip_transmit(FAR struct slip_driver_s *priv); -static int slip_uiptxpoll(struct net_driver_s *dev); +static int slip_txpoll(struct net_driver_s *dev); static void slip_txtask(int argc, char *argv[]); /* Packet receiver task */ @@ -398,7 +398,7 @@ static int slip_transmit(FAR struct slip_driver_s *priv) } /**************************************************************************** - * Function: slip_uiptxpoll + * Function: slip_txpoll * * Description: * Check if uIP has any outgoing packets ready to send. This is a @@ -419,7 +419,7 @@ static int slip_transmit(FAR struct slip_driver_s *priv) * ****************************************************************************/ -static int slip_uiptxpoll(struct net_driver_s *dev) +static int slip_txpoll(struct net_driver_s *dev) { FAR struct slip_driver_s *priv = (FAR struct slip_driver_s *)dev->d_private; @@ -495,7 +495,7 @@ static void slip_txtask(int argc, char *argv[]) flags = net_lock(); priv->dev.d_buf = priv->txbuf; - (void)devif_timer(&priv->dev, slip_uiptxpoll, SLIP_POLLHSEC); + (void)devif_timer(&priv->dev, slip_txpoll, SLIP_POLLHSEC); net_unlock(flags); slip_semgive(priv); } diff --git a/nuttx/drivers/net/vnet.c b/nuttx/drivers/net/vnet.c index d3db255e3..8817f6b90 100644 --- a/nuttx/drivers/net/vnet.c +++ b/nuttx/drivers/net/vnet.c @@ -119,7 +119,7 @@ static struct vnet_driver_s g_vnet[CONFIG_VNET_NINTERFACES]; /* Common TX logic */ static int vnet_transmit(FAR struct vnet_driver_s *vnet); -static int vnet_uiptxpoll(struct net_driver_s *dev); +static int vnet_txpoll(struct net_driver_s *dev); /* Interrupt handling */ @@ -198,7 +198,7 @@ static int vnet_transmit(FAR struct vnet_driver_s *vnet) } /**************************************************************************** - * Function: vnet_uiptxpoll + * Function: vnet_txpoll * * Description: * The transmitter is available, check if uIP has any outgoing packets ready @@ -221,7 +221,7 @@ static int vnet_transmit(FAR struct vnet_driver_s *vnet) * ****************************************************************************/ -static int vnet_uiptxpoll(struct net_driver_s *dev) +static int vnet_txpoll(struct net_driver_s *dev) { FAR struct vnet_driver_s *vnet = (FAR struct vnet_driver_s *)dev->d_private; @@ -345,7 +345,7 @@ static void vnet_txdone(FAR struct vnet_driver_s *vnet) /* Then poll uIP for new XMIT data */ - (void)devif_poll(&vnet->sk_dev, vnet_uiptxpoll); + (void)devif_poll(&vnet->sk_dev, vnet_txpoll); } /**************************************************************************** @@ -377,7 +377,7 @@ static void vnet_txtimeout(int argc, uint32_t arg, ...) /* Then poll uIP for new XMIT data */ - (void)devif_poll(&vnet->sk_dev, vnet_uiptxpoll); + (void)devif_poll(&vnet->sk_dev, vnet_txpoll); } /**************************************************************************** @@ -417,7 +417,7 @@ static void vnet_polltimer(int argc, uint32_t arg, ...) * we will missing TCP time state updates? */ - (void)devif_timer(&vnet->sk_dev, vnet_uiptxpoll, VNET_POLLHSEC); + (void)devif_timer(&vnet->sk_dev, vnet_txpoll, 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)devif_poll(&vnet->sk_dev, vnet_uiptxpoll); + (void)devif_poll(&vnet->sk_dev, vnet_txpoll); } out: -- cgit v1.2.3