From e4990dda4d5891c4477e6351578e05f438874c0f Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 27 Jun 2014 16:48:12 -0600 Subject: [PATCH] Rename uip_driver_s net_driver_s --- arch/arm/src/c5471/c5471_ethernet.c | 32 ++++++++++---------- arch/arm/src/kinetis/kinetis_enet.c | 26 ++++++++-------- arch/arm/src/lpc17xx/lpc17_ethernet.c | 26 ++++++++-------- arch/arm/src/sam34/sam_emac.c | 38 ++++++++++++------------ arch/arm/src/sama5/sam_emaca.c | 38 ++++++++++++------------ arch/arm/src/sama5/sam_emacb.c | 38 ++++++++++++------------ arch/arm/src/sama5/sam_gmac.c | 38 ++++++++++++------------ arch/arm/src/stm32/stm32_eth.c | 36 +++++++++++----------- arch/arm/src/tiva/tiva_ethernet.c | 26 ++++++++-------- arch/hc/src/m9s12/m9s12_ethernet.c | 26 ++++++++-------- arch/mips/src/pic32mx/pic32mx-ethernet.c | 26 ++++++++-------- arch/sim/src/up_uipdriver.c | 4 +-- arch/z80/src/common/up_internal.h | 2 +- arch/z80/src/ez80/ez80_emac.c | 28 ++++++++--------- 14 files changed, 192 insertions(+), 192 deletions(-) diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c index 8220d606b1..eace9d8d00 100644 --- a/arch/arm/src/c5471/c5471_ethernet.c +++ b/arch/arm/src/c5471/c5471_ethernet.c @@ -330,7 +330,7 @@ struct c5471_driver_s /* This holds the information visible to uIP/NuttX */ - struct uip_driver_s c_dev; /* Interface understood by uIP */ + struct net_driver_s c_dev; /* Interface understood by uIP */ }; /**************************************************************************** @@ -359,7 +359,7 @@ static inline void c5471_incrxcpu(struct c5471_driver_s *c5471); /* Common TX logic */ static int c5471_transmit(struct c5471_driver_s *c5471); -static int c5471_uiptxpoll(struct uip_driver_s *dev); +static int c5471_uiptxpoll(struct net_driver_s *dev); /* Interrupt handling */ @@ -380,12 +380,12 @@ static void c5471_txtimeout(int argc, uint32_t arg, ...); /* NuttX callback functions */ -static int c5471_ifup(struct uip_driver_s *dev); -static int c5471_ifdown(struct uip_driver_s *dev); -static int c5471_txavail(struct uip_driver_s *dev); +static int c5471_ifup(struct net_driver_s *dev); +static int c5471_ifdown(struct net_driver_s *dev); +static int c5471_txavail(struct net_driver_s *dev); #ifdef CONFIG_NET_IGMP -static int c5471_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac); -static int c5471_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac); +static int c5471_addmac(struct net_driver_s *dev, FAR const uint8_t *mac); +static int c5471_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac); #endif /* Initialization functions */ @@ -844,7 +844,7 @@ static inline void c5471_incrxcpu(struct c5471_driver_s *c5471) static int c5471_transmit(struct c5471_driver_s *c5471) { - struct uip_driver_s *dev = &c5471->c_dev; + struct net_driver_s *dev = &c5471->c_dev; volatile uint16_t *packetmem; uint16_t framelen; bool bfirstframe; @@ -974,7 +974,7 @@ static int c5471_transmit(struct c5471_driver_s *c5471) * ****************************************************************************/ -static int c5471_uiptxpoll(struct uip_driver_s *dev) +static int c5471_uiptxpoll(struct net_driver_s *dev) { struct c5471_driver_s *c5471 = (struct c5471_driver_s *)dev->d_private; @@ -1126,7 +1126,7 @@ static void c5471_rxstatus(struct c5471_driver_s *c5471) static void c5471_receive(struct c5471_driver_s *c5471) { - struct uip_driver_s *dev = &c5471->c_dev; + struct net_driver_s *dev = &c5471->c_dev; uint16_t *packetmem; bool bmore = true; int packetlen = 0; @@ -1580,7 +1580,7 @@ static void c5471_polltimer(int argc, uint32_t arg, ...) * ****************************************************************************/ -static int c5471_ifup(struct uip_driver_s *dev) +static int c5471_ifup(struct net_driver_s *dev) { struct c5471_driver_s *c5471 = (struct c5471_driver_s *)dev->d_private; volatile uint32_t clearbits; @@ -1640,7 +1640,7 @@ static int c5471_ifup(struct uip_driver_s *dev) * ****************************************************************************/ -static int c5471_ifdown(struct uip_driver_s *dev) +static int c5471_ifdown(struct net_driver_s *dev) { struct c5471_driver_s *c5471 = (struct c5471_driver_s *)dev->d_private; irqstate_t flags; @@ -1695,7 +1695,7 @@ static int c5471_ifdown(struct uip_driver_s *dev) * ****************************************************************************/ -static int c5471_txavail(struct uip_driver_s *dev) +static int c5471_txavail(struct net_driver_s *dev) { struct c5471_driver_s *c5471 = (struct c5471_driver_s *)dev->d_private; irqstate_t flags; @@ -1742,7 +1742,7 @@ static int c5471_txavail(struct uip_driver_s *dev) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int c5471_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac) +static int c5471_addmac(struct net_driver_s *dev, FAR const uint8_t *mac) { FAR struct c5471_driver_s *priv = (FAR struct c5471_driver_s *)dev->d_private; @@ -1772,7 +1772,7 @@ static int c5471_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int c5471_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac) +static int c5471_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac) { FAR struct c5471_driver_s *priv = (FAR struct c5471_driver_s *)dev->d_private; @@ -2066,7 +2066,7 @@ static void c5471_reset(struct c5471_driver_s *c5471) static void c5471_macassign(struct c5471_driver_s *c5471) { - struct uip_driver_s *dev = &c5471->c_dev; + struct net_driver_s *dev = &c5471->c_dev; uint8_t *mptr = dev->d_mac.ether_addr_octet; register uint32_t tmp; diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c index 6b5a7ef009..92c411453f 100644 --- a/arch/arm/src/kinetis/kinetis_enet.c +++ b/arch/arm/src/kinetis/kinetis_enet.c @@ -178,7 +178,7 @@ struct kinetis_driver_s /* This holds the information visible to uIP/NuttX */ - struct uip_driver_s dev; /* Interface understood by uIP */ + struct net_driver_s dev; /* Interface understood by uIP */ /* Statistics */ @@ -224,7 +224,7 @@ static inline uint16_t kinesis_swap16(uint16_t value); static bool kinetics_txringfull(FAR struct kinetis_driver_s *priv); static int kinetis_transmit(FAR struct kinetis_driver_s *priv); -static int kinetis_uiptxpoll(struct uip_driver_s *dev); +static int kinetis_uiptxpoll(struct net_driver_s *dev); /* Interrupt handling */ @@ -239,12 +239,12 @@ static void kinetis_txtimeout(int argc, uint32_t arg, ...); /* NuttX callback functions */ -static int kinetis_ifup(struct uip_driver_s *dev); -static int kinetis_ifdown(struct uip_driver_s *dev); -static int kinetis_txavail(struct uip_driver_s *dev); +static int kinetis_ifup(struct net_driver_s *dev); +static int kinetis_ifdown(struct net_driver_s *dev); +static int kinetis_txavail(struct net_driver_s *dev); #ifdef CONFIG_NET_IGMP -static int kinetis_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac); -static int kinetis_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac); +static int kinetis_addmac(struct net_driver_s *dev, FAR const uint8_t *mac); +static int kinetis_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac); #endif /* PHY/MII support */ @@ -434,7 +434,7 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv) * ****************************************************************************/ -static int kinetis_uiptxpoll(struct uip_driver_s *dev) +static int kinetis_uiptxpoll(struct net_driver_s *dev) { FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)dev->d_private; @@ -783,7 +783,7 @@ static void kinetis_polltimer(int argc, uint32_t arg, ...) * ****************************************************************************/ -static int kinetis_ifup(struct uip_driver_s *dev) +static int kinetis_ifup(struct net_driver_s *dev) { FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)dev->d_private; uint32_t regval; @@ -896,7 +896,7 @@ static int kinetis_ifup(struct uip_driver_s *dev) * ****************************************************************************/ -static int kinetis_ifdown(struct uip_driver_s *dev) +static int kinetis_ifdown(struct net_driver_s *dev) { FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)dev->d_private; irqstate_t flags; @@ -948,7 +948,7 @@ static int kinetis_ifdown(struct uip_driver_s *dev) * ****************************************************************************/ -static int kinetis_txavail(struct uip_driver_s *dev) +static int kinetis_txavail(struct net_driver_s *dev) { FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)dev->d_private; irqstate_t flags; @@ -1000,7 +1000,7 @@ static int kinetis_txavail(struct uip_driver_s *dev) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int kinetis_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac) +static int kinetis_addmac(struct net_driver_s *dev, FAR const uint8_t *mac) { FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)dev->d_private; @@ -1029,7 +1029,7 @@ static int kinetis_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int kinetis_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac) +static int kinetis_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac) { FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)dev->d_private; diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c index f52ba65727..3712d91bde 100644 --- a/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -281,7 +281,7 @@ struct lpc17_driver_s /* This holds the information visible to uIP/NuttX */ - struct uip_driver_s lp_dev; /* Interface understood by uIP */ + struct net_driver_s lp_dev; /* Interface understood by uIP */ }; /**************************************************************************** @@ -325,7 +325,7 @@ static void lpc17_putreg(uint32_t val, uint32_t addr); static int lpc17_txdesc(struct lpc17_driver_s *priv); static int lpc17_transmit(struct lpc17_driver_s *priv); -static int lpc17_uiptxpoll(struct uip_driver_s *dev); +static int lpc17_uiptxpoll(struct net_driver_s *dev); /* Interrupt handling */ @@ -341,12 +341,12 @@ static void lpc17_txtimeout(int argc, uint32_t arg, ...); /* NuttX callback functions */ -static int lpc17_ifup(struct uip_driver_s *dev); -static int lpc17_ifdown(struct uip_driver_s *dev); -static int lpc17_txavail(struct uip_driver_s *dev); +static int lpc17_ifup(struct net_driver_s *dev); +static int lpc17_ifdown(struct net_driver_s *dev); +static int lpc17_txavail(struct net_driver_s *dev); #ifdef CONFIG_NET_IGMP -static int lpc17_addmac(struct uip_driver_s *dev, const uint8_t *mac); -static int lpc17_rmmac(struct uip_driver_s *dev, const uint8_t *mac); +static int lpc17_addmac(struct net_driver_s *dev, const uint8_t *mac); +static int lpc17_rmmac(struct net_driver_s *dev, const uint8_t *mac); #endif /* Initialization functions */ @@ -666,7 +666,7 @@ static int lpc17_transmit(struct lpc17_driver_s *priv) * ****************************************************************************/ -static int lpc17_uiptxpoll(struct uip_driver_s *dev) +static int lpc17_uiptxpoll(struct net_driver_s *dev) { struct lpc17_driver_s *priv = (struct lpc17_driver_s *)dev->d_private; int ret = OK; @@ -1250,7 +1250,7 @@ static void lpc17_polltimer(int argc, uint32_t arg, ...) * ****************************************************************************/ -static int lpc17_ifup(struct uip_driver_s *dev) +static int lpc17_ifup(struct net_driver_s *dev) { struct lpc17_driver_s *priv = (struct lpc17_driver_s *)dev->d_private; uint32_t regval; @@ -1419,7 +1419,7 @@ static int lpc17_ifup(struct uip_driver_s *dev) * ****************************************************************************/ -static int lpc17_ifdown(struct uip_driver_s *dev) +static int lpc17_ifdown(struct net_driver_s *dev) { struct lpc17_driver_s *priv = (struct lpc17_driver_s *)dev->d_private; irqstate_t flags; @@ -1461,7 +1461,7 @@ static int lpc17_ifdown(struct uip_driver_s *dev) * ****************************************************************************/ -static int lpc17_txavail(struct uip_driver_s *dev) +static int lpc17_txavail(struct net_driver_s *dev) { struct lpc17_driver_s *priv = (struct lpc17_driver_s *)dev->d_private; irqstate_t flags; @@ -1509,7 +1509,7 @@ static int lpc17_txavail(struct uip_driver_s *dev) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int lpc17_addmac(struct uip_driver_s *dev, const uint8_t *mac) +static int lpc17_addmac(struct net_driver_s *dev, const uint8_t *mac) { struct lpc17_driver_s *priv = (struct lpc17_driver_s *)dev->d_private; @@ -1539,7 +1539,7 @@ static int lpc17_addmac(struct uip_driver_s *dev, const uint8_t *mac) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int lpc17_rmmac(struct uip_driver_s *dev, const uint8_t *mac) +static int lpc17_rmmac(struct net_driver_s *dev, const uint8_t *mac) { struct lpc17_driver_s *priv = (struct lpc17_driver_s *)dev->d_private; diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c index e5d527b074..58ed1e7be4 100644 --- a/arch/arm/src/sam34/sam_emac.c +++ b/arch/arm/src/sam34/sam_emac.c @@ -259,7 +259,7 @@ struct sam_emac_s /* This holds the information visible to uIP/NuttX */ - struct uip_driver_s dev; /* Interface understood by uIP */ + struct net_driver_s dev; /* Interface understood by uIP */ /* Used to track transmit and receive descriptors */ @@ -345,7 +345,7 @@ static void sam_buffer_free(struct sam_emac_s *priv); /* Common TX logic */ static int sam_transmit(struct sam_emac_s *priv); -static int sam_uiptxpoll(struct uip_driver_s *dev); +static int sam_uiptxpoll(struct net_driver_s *dev); static void sam_dopoll(struct sam_emac_s *priv); /* Interrupt handling */ @@ -362,12 +362,12 @@ static void sam_txtimeout(int argc, uint32_t arg, ...); /* NuttX callback functions */ -static int sam_ifup(struct uip_driver_s *dev); -static int sam_ifdown(struct uip_driver_s *dev); -static int sam_txavail(struct uip_driver_s *dev); +static int sam_ifup(struct net_driver_s *dev); +static int sam_ifdown(struct net_driver_s *dev); +static int sam_txavail(struct net_driver_s *dev); #ifdef CONFIG_NET_IGMP -static int sam_addmac(struct uip_driver_s *dev, const uint8_t *mac); -static int sam_rmmac(struct uip_driver_s *dev, const uint8_t *mac); +static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac); +static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac); #endif /* PHY Initialization */ @@ -695,7 +695,7 @@ static void sam_buffer_free(struct sam_emac_s *priv) static int sam_transmit(struct sam_emac_s *priv) { - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; volatile struct emac_txdesc_s *txdesc; uint32_t regval; uint32_t status; @@ -808,7 +808,7 @@ static int sam_transmit(struct sam_emac_s *priv) * ****************************************************************************/ -static int sam_uiptxpoll(struct uip_driver_s *dev) +static int sam_uiptxpoll(struct net_driver_s *dev) { struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; @@ -863,7 +863,7 @@ static int sam_uiptxpoll(struct uip_driver_s *dev) static void sam_dopoll(struct sam_emac_s *priv) { - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; /* Check if the there are any free TX descriptors. We cannot perform the * TX poll if we do not have buffering for another packet. @@ -903,7 +903,7 @@ static void sam_dopoll(struct sam_emac_s *priv) static int sam_recvframe(struct sam_emac_s *priv) { struct emac_rxdesc_s *rxdesc; - struct uip_driver_s *dev; + struct net_driver_s *dev; const uint8_t *src; uint8_t *dest; uint32_t rxndx; @@ -1108,7 +1108,7 @@ static int sam_recvframe(struct sam_emac_s *priv) static void sam_receive(struct sam_emac_s *priv) { - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; /* Loop while while sam_recvframe() successfully retrieves valid * EMAC frames. @@ -1507,7 +1507,7 @@ static void sam_txtimeout(int argc, uint32_t arg, ...) static void sam_polltimer(int argc, uint32_t arg, ...) { struct sam_emac_s *priv = (struct sam_emac_s *)arg; - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; /* Check if the there are any free TX descriptors. We cannot perform the * TX poll if we do not have buffering for another packet. @@ -1542,7 +1542,7 @@ static void sam_polltimer(int argc, uint32_t arg, ...) * ****************************************************************************/ -static int sam_ifup(struct uip_driver_s *dev) +static int sam_ifup(struct net_driver_s *dev) { struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; int ret; @@ -1612,7 +1612,7 @@ static int sam_ifup(struct uip_driver_s *dev) * ****************************************************************************/ -static int sam_ifdown(struct uip_driver_s *dev) +static int sam_ifdown(struct net_driver_s *dev) { struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; irqstate_t flags; @@ -1662,7 +1662,7 @@ static int sam_ifdown(struct uip_driver_s *dev) * ****************************************************************************/ -static int sam_txavail(struct uip_driver_s *dev) +static int sam_txavail(struct net_driver_s *dev) { struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; irqstate_t flags; @@ -1707,7 +1707,7 @@ static int sam_txavail(struct uip_driver_s *dev) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int sam_addmac(struct uip_driver_s *dev, const uint8_t *mac) +static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac) { struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; @@ -1741,7 +1741,7 @@ static int sam_addmac(struct uip_driver_s *dev, const uint8_t *mac) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int sam_rmmac(struct uip_driver_s *dev, const uint8_t *mac) +static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac) { struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; @@ -2697,7 +2697,7 @@ static void sam_emac_reset(struct sam_emac_s *priv) static void sam_macaddress(struct sam_emac_s *priv) { - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; uint32_t regval; nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c index 77d1fc742c..3ec595cdf7 100644 --- a/arch/arm/src/sama5/sam_emaca.c +++ b/arch/arm/src/sama5/sam_emaca.c @@ -264,7 +264,7 @@ struct sam_emac_s /* This holds the information visible to uIP/NuttX */ - struct uip_driver_s dev; /* Interface understood by uIP */ + struct net_driver_s dev; /* Interface understood by uIP */ /* Used to track transmit and receive descriptors */ @@ -350,7 +350,7 @@ static void sam_buffer_free(struct sam_emac_s *priv); /* Common TX logic */ static int sam_transmit(struct sam_emac_s *priv); -static int sam_uiptxpoll(struct uip_driver_s *dev); +static int sam_uiptxpoll(struct net_driver_s *dev); static void sam_dopoll(struct sam_emac_s *priv); /* Interrupt handling */ @@ -367,12 +367,12 @@ static void sam_txtimeout(int argc, uint32_t arg, ...); /* NuttX callback functions */ -static int sam_ifup(struct uip_driver_s *dev); -static int sam_ifdown(struct uip_driver_s *dev); -static int sam_txavail(struct uip_driver_s *dev); +static int sam_ifup(struct net_driver_s *dev); +static int sam_ifdown(struct net_driver_s *dev); +static int sam_txavail(struct net_driver_s *dev); #ifdef CONFIG_NET_IGMP -static int sam_addmac(struct uip_driver_s *dev, const uint8_t *mac); -static int sam_rmmac(struct uip_driver_s *dev, const uint8_t *mac); +static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac); +static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac); #endif /* PHY Initialization */ @@ -700,7 +700,7 @@ static void sam_buffer_free(struct sam_emac_s *priv) static int sam_transmit(struct sam_emac_s *priv) { - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; volatile struct emac_txdesc_s *txdesc; uintptr_t virtaddr; uint32_t regval; @@ -818,7 +818,7 @@ static int sam_transmit(struct sam_emac_s *priv) * ****************************************************************************/ -static int sam_uiptxpoll(struct uip_driver_s *dev) +static int sam_uiptxpoll(struct net_driver_s *dev) { struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; @@ -873,7 +873,7 @@ static int sam_uiptxpoll(struct uip_driver_s *dev) static void sam_dopoll(struct sam_emac_s *priv) { - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; /* Check if the there are any free TX descriptors. We cannot perform the * TX poll if we do not have buffering for another packet. @@ -913,7 +913,7 @@ static void sam_dopoll(struct sam_emac_s *priv) static int sam_recvframe(struct sam_emac_s *priv) { struct emac_rxdesc_s *rxdesc; - struct uip_driver_s *dev; + struct net_driver_s *dev; const uint8_t *src; uint8_t *dest; uintptr_t physaddr; @@ -1148,7 +1148,7 @@ static int sam_recvframe(struct sam_emac_s *priv) static void sam_receive(struct sam_emac_s *priv) { - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; /* Loop while while sam_recvframe() successfully retrieves valid * EMAC frames. @@ -1548,7 +1548,7 @@ static void sam_txtimeout(int argc, uint32_t arg, ...) static void sam_polltimer(int argc, uint32_t arg, ...) { struct sam_emac_s *priv = (struct sam_emac_s *)arg; - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; /* Check if the there are any free TX descriptors. We cannot perform the * TX poll if we do not have buffering for another packet. @@ -1583,7 +1583,7 @@ static void sam_polltimer(int argc, uint32_t arg, ...) * ****************************************************************************/ -static int sam_ifup(struct uip_driver_s *dev) +static int sam_ifup(struct net_driver_s *dev) { struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; int ret; @@ -1653,7 +1653,7 @@ static int sam_ifup(struct uip_driver_s *dev) * ****************************************************************************/ -static int sam_ifdown(struct uip_driver_s *dev) +static int sam_ifdown(struct net_driver_s *dev) { struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; irqstate_t flags; @@ -1703,7 +1703,7 @@ static int sam_ifdown(struct uip_driver_s *dev) * ****************************************************************************/ -static int sam_txavail(struct uip_driver_s *dev) +static int sam_txavail(struct net_driver_s *dev) { struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; irqstate_t flags; @@ -1748,7 +1748,7 @@ static int sam_txavail(struct uip_driver_s *dev) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int sam_addmac(struct uip_driver_s *dev, const uint8_t *mac) +static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac) { struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; @@ -1782,7 +1782,7 @@ static int sam_addmac(struct uip_driver_s *dev, const uint8_t *mac) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int sam_rmmac(struct uip_driver_s *dev, const uint8_t *mac) +static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac) { struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; @@ -2747,7 +2747,7 @@ static void sam_emac_reset(struct sam_emac_s *priv) static void sam_macaddress(struct sam_emac_s *priv) { - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; uint32_t regval; nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c index 7df889bad1..70f505b8b9 100644 --- a/arch/arm/src/sama5/sam_emacb.c +++ b/arch/arm/src/sama5/sam_emacb.c @@ -387,7 +387,7 @@ struct sam_emac_s /* This holds the information visible to uIP/NuttX */ - struct uip_driver_s dev; /* Interface understood by uIP */ + struct net_driver_s dev; /* Interface understood by uIP */ /* Constant and configured attributes of the EMAC */ @@ -438,7 +438,7 @@ static void sam_buffer_free(struct sam_emac_s *priv); /* Common TX logic */ static int sam_transmit(struct sam_emac_s *priv); -static int sam_uiptxpoll(struct uip_driver_s *dev); +static int sam_uiptxpoll(struct net_driver_s *dev); static void sam_dopoll(struct sam_emac_s *priv); /* Interrupt handling */ @@ -461,12 +461,12 @@ static void sam_txtimeout(int argc, uint32_t arg, ...); /* NuttX callback functions */ -static int sam_ifup(struct uip_driver_s *dev); -static int sam_ifdown(struct uip_driver_s *dev); -static int sam_txavail(struct uip_driver_s *dev); +static int sam_ifup(struct net_driver_s *dev); +static int sam_ifdown(struct net_driver_s *dev); +static int sam_txavail(struct net_driver_s *dev); #ifdef CONFIG_NET_IGMP -static int sam_addmac(struct uip_driver_s *dev, const uint8_t *mac); -static int sam_rmmac(struct uip_driver_s *dev, const uint8_t *mac); +static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac); +static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac); #endif /* PHY Initialization */ @@ -1009,7 +1009,7 @@ static void sam_buffer_free(struct sam_emac_s *priv) static int sam_transmit(struct sam_emac_s *priv) { - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; volatile struct emac_txdesc_s *txdesc; uintptr_t virtaddr; uint32_t regval; @@ -1127,7 +1127,7 @@ static int sam_transmit(struct sam_emac_s *priv) * ****************************************************************************/ -static int sam_uiptxpoll(struct uip_driver_s *dev) +static int sam_uiptxpoll(struct net_driver_s *dev) { struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; @@ -1182,7 +1182,7 @@ static int sam_uiptxpoll(struct uip_driver_s *dev) static void sam_dopoll(struct sam_emac_s *priv) { - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; /* Check if the there are any free TX descriptors. We cannot perform the * TX poll if we do not have buffering for another packet. @@ -1222,7 +1222,7 @@ static void sam_dopoll(struct sam_emac_s *priv) static int sam_recvframe(struct sam_emac_s *priv) { struct emac_rxdesc_s *rxdesc; - struct uip_driver_s *dev; + struct net_driver_s *dev; const uint8_t *src; uint8_t *dest; uintptr_t physaddr; @@ -1457,7 +1457,7 @@ static int sam_recvframe(struct sam_emac_s *priv) static void sam_receive(struct sam_emac_s *priv) { - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; /* Loop while while sam_recvframe() successfully retrieves valid * EMAC frames. @@ -1887,7 +1887,7 @@ static void sam_txtimeout(int argc, uint32_t arg, ...) static void sam_polltimer(int argc, uint32_t arg, ...) { struct sam_emac_s *priv = (struct sam_emac_s *)arg; - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; /* Check if the there are any free TX descriptors. We cannot perform the * TX poll if we do not have buffering for another packet. @@ -1922,7 +1922,7 @@ static void sam_polltimer(int argc, uint32_t arg, ...) * ****************************************************************************/ -static int sam_ifup(struct uip_driver_s *dev) +static int sam_ifup(struct net_driver_s *dev) { struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; int ret; @@ -1992,7 +1992,7 @@ static int sam_ifup(struct uip_driver_s *dev) * ****************************************************************************/ -static int sam_ifdown(struct uip_driver_s *dev) +static int sam_ifdown(struct net_driver_s *dev) { struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; irqstate_t flags; @@ -2042,7 +2042,7 @@ static int sam_ifdown(struct uip_driver_s *dev) * ****************************************************************************/ -static int sam_txavail(struct uip_driver_s *dev) +static int sam_txavail(struct net_driver_s *dev) { struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; irqstate_t flags; @@ -2087,7 +2087,7 @@ static int sam_txavail(struct uip_driver_s *dev) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int sam_addmac(struct uip_driver_s *dev, const uint8_t *mac) +static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac) { struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; @@ -2121,7 +2121,7 @@ static int sam_addmac(struct uip_driver_s *dev, const uint8_t *mac) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int sam_rmmac(struct uip_driver_s *dev, const uint8_t *mac) +static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac) { struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; @@ -3350,7 +3350,7 @@ static void sam_emac_reset(struct sam_emac_s *priv) static void sam_macaddress(struct sam_emac_s *priv) { - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; uint32_t regval; nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c index f30b527261..2c2d0415a0 100644 --- a/arch/arm/src/sama5/sam_gmac.c +++ b/arch/arm/src/sama5/sam_gmac.c @@ -190,7 +190,7 @@ struct sam_gmac_s /* This holds the information visible to uIP/NuttX */ - struct uip_driver_s dev; /* Interface understood by uIP */ + struct net_driver_s dev; /* Interface understood by uIP */ /* Used to track transmit and receive descriptors */ @@ -275,7 +275,7 @@ static void sam_buffer_free(struct sam_gmac_s *priv); /* Common TX logic */ static int sam_transmit(struct sam_gmac_s *priv); -static int sam_uiptxpoll(struct uip_driver_s *dev); +static int sam_uiptxpoll(struct net_driver_s *dev); static void sam_dopoll(struct sam_gmac_s *priv); /* Interrupt handling */ @@ -292,12 +292,12 @@ static void sam_txtimeout(int argc, uint32_t arg, ...); /* NuttX callback functions */ -static int sam_ifup(struct uip_driver_s *dev); -static int sam_ifdown(struct uip_driver_s *dev); -static int sam_txavail(struct uip_driver_s *dev); +static int sam_ifup(struct net_driver_s *dev); +static int sam_ifdown(struct net_driver_s *dev); +static int sam_txavail(struct net_driver_s *dev); #ifdef CONFIG_NET_IGMP -static int sam_addmac(struct uip_driver_s *dev, const uint8_t *mac); -static int sam_rmmac(struct uip_driver_s *dev, const uint8_t *mac); +static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac); +static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac); #endif /* PHY Initialization */ @@ -631,7 +631,7 @@ static void sam_buffer_free(struct sam_gmac_s *priv) static int sam_transmit(struct sam_gmac_s *priv) { - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; volatile struct gmac_txdesc_s *txdesc; uintptr_t virtaddr; uint32_t regval; @@ -750,7 +750,7 @@ static int sam_transmit(struct sam_gmac_s *priv) * ****************************************************************************/ -static int sam_uiptxpoll(struct uip_driver_s *dev) +static int sam_uiptxpoll(struct net_driver_s *dev) { struct sam_gmac_s *priv = (struct sam_gmac_s *)dev->d_private; @@ -805,7 +805,7 @@ static int sam_uiptxpoll(struct uip_driver_s *dev) static void sam_dopoll(struct sam_gmac_s *priv) { - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; /* Check if the there are any free TX descriptors. We cannot perform the * TX poll if we do not have buffering for another packet. @@ -845,7 +845,7 @@ static void sam_dopoll(struct sam_gmac_s *priv) static int sam_recvframe(struct sam_gmac_s *priv) { volatile struct gmac_rxdesc_s *rxdesc; - struct uip_driver_s *dev; + struct net_driver_s *dev; const uint8_t *src; uint8_t *dest; uintptr_t physaddr; @@ -1078,7 +1078,7 @@ static int sam_recvframe(struct sam_gmac_s *priv) static void sam_receive(struct sam_gmac_s *priv) { - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; /* Loop while while sam_recvframe() successfully retrieves valid * GMAC frames. @@ -1500,7 +1500,7 @@ static void sam_txtimeout(int argc, uint32_t arg, ...) static void sam_polltimer(int argc, uint32_t arg, ...) { struct sam_gmac_s *priv = (struct sam_gmac_s *)arg; - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; /* Check if the there are any free TX descriptors. We cannot perform the * TX poll if we do not have buffering for another packet. @@ -1535,7 +1535,7 @@ static void sam_polltimer(int argc, uint32_t arg, ...) * ****************************************************************************/ -static int sam_ifup(struct uip_driver_s *dev) +static int sam_ifup(struct net_driver_s *dev) { struct sam_gmac_s *priv = (struct sam_gmac_s *)dev->d_private; int ret; @@ -1608,7 +1608,7 @@ static int sam_ifup(struct uip_driver_s *dev) * ****************************************************************************/ -static int sam_ifdown(struct uip_driver_s *dev) +static int sam_ifdown(struct net_driver_s *dev) { struct sam_gmac_s *priv = (struct sam_gmac_s *)dev->d_private; irqstate_t flags; @@ -1658,7 +1658,7 @@ static int sam_ifdown(struct uip_driver_s *dev) * ****************************************************************************/ -static int sam_txavail(struct uip_driver_s *dev) +static int sam_txavail(struct net_driver_s *dev) { struct sam_gmac_s *priv = (struct sam_gmac_s *)dev->d_private; irqstate_t flags; @@ -1703,7 +1703,7 @@ static int sam_txavail(struct uip_driver_s *dev) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int sam_addmac(struct uip_driver_s *dev, const uint8_t *mac) +static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac) { struct sam_gmac_s *priv = (struct sam_gmac_s *)dev->d_private; @@ -1737,7 +1737,7 @@ static int sam_addmac(struct uip_driver_s *dev, const uint8_t *mac) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int sam_rmmac(struct uip_driver_s *dev, const uint8_t *mac) +static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac) { struct sam_gmac_s *priv = (struct sam_gmac_s *)dev->d_private; @@ -2801,7 +2801,7 @@ static void sam_gmac_reset(struct sam_gmac_s *priv) static void sam_macaddress(struct sam_gmac_s *priv) { - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; uint32_t regval; nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c index 0d86cd605a..a17d140db4 100644 --- a/arch/arm/src/stm32/stm32_eth.c +++ b/arch/arm/src/stm32/stm32_eth.c @@ -572,7 +572,7 @@ struct stm32_ethmac_s /* This holds the information visible to uIP/NuttX */ - struct uip_driver_s dev; /* Interface understood by uIP */ + struct net_driver_s dev; /* Interface understood by uIP */ /* Used to track transmit and receive descriptors */ @@ -627,7 +627,7 @@ static inline bool stm32_isfreebuffer(FAR struct stm32_ethmac_s *priv); /* Common TX logic */ static int stm32_transmit(FAR struct stm32_ethmac_s *priv); -static int stm32_uiptxpoll(struct uip_driver_s *dev); +static int stm32_uiptxpoll(struct net_driver_s *dev); static void stm32_dopoll(FAR struct stm32_ethmac_s *priv); /* Interrupt handling */ @@ -650,12 +650,12 @@ static void stm32_txtimeout(int argc, uint32_t arg, ...); /* NuttX callback functions */ -static int stm32_ifup(struct uip_driver_s *dev); -static int stm32_ifdown(struct uip_driver_s *dev); -static int stm32_txavail(struct uip_driver_s *dev); +static int stm32_ifup(struct net_driver_s *dev); +static int stm32_ifdown(struct net_driver_s *dev); +static int stm32_txavail(struct net_driver_s *dev); #ifdef CONFIG_NET_IGMP -static int stm32_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac); -static int stm32_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac); +static int stm32_addmac(struct net_driver_s *dev, FAR const uint8_t *mac); +static int stm32_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac); #endif /* Descriptor Initialization */ @@ -1159,7 +1159,7 @@ static int stm32_transmit(FAR struct stm32_ethmac_s *priv) * ****************************************************************************/ -static int stm32_uiptxpoll(struct uip_driver_s *dev) +static int stm32_uiptxpoll(struct net_driver_s *dev) { FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)dev->d_private; @@ -1240,7 +1240,7 @@ static int stm32_uiptxpoll(struct uip_driver_s *dev) static void stm32_dopoll(FAR struct stm32_ethmac_s *priv) { - FAR struct uip_driver_s *dev = &priv->dev; + FAR struct net_driver_s *dev = &priv->dev; /* Check if the next TX descriptor is owned by the Ethernet DMA or * CPU. We cannot perform the TX poll if we are unable to accept @@ -1503,7 +1503,7 @@ static int stm32_recvframe(FAR struct stm32_ethmac_s *priv) if ((rxdesc->rdes0 & ETH_RDES0_ES) == 0) { - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; /* Get the Frame Length of the received packet: substruct 4 * bytes of the CRC @@ -1587,7 +1587,7 @@ static int stm32_recvframe(FAR struct stm32_ethmac_s *priv) static void stm32_receive(FAR struct stm32_ethmac_s *priv) { - struct uip_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; /* Loop while while stm32_recvframe() successfully retrieves valid * Ethernet frames. @@ -1964,7 +1964,7 @@ static void stm32_txtimeout(int argc, uint32_t arg, ...) static void stm32_polltimer(int argc, uint32_t arg, ...) { FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)arg; - FAR struct uip_driver_s *dev = &priv->dev; + FAR struct net_driver_s *dev = &priv->dev; /* Check if the next TX descriptor is owned by the Ethernet DMA or CPU. We * cannot perform the timer poll if we are unable to accept another packet @@ -2031,7 +2031,7 @@ static void stm32_polltimer(int argc, uint32_t arg, ...) * ****************************************************************************/ -static int stm32_ifup(struct uip_driver_s *dev) +static int stm32_ifup(struct net_driver_s *dev) { FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)dev->d_private; int ret; @@ -2077,7 +2077,7 @@ static int stm32_ifup(struct uip_driver_s *dev) * ****************************************************************************/ -static int stm32_ifdown(struct uip_driver_s *dev) +static int stm32_ifdown(struct net_driver_s *dev) { FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)dev->d_private; irqstate_t flags; @@ -2127,7 +2127,7 @@ static int stm32_ifdown(struct uip_driver_s *dev) * ****************************************************************************/ -static int stm32_txavail(struct uip_driver_s *dev) +static int stm32_txavail(struct net_driver_s *dev) { FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)dev->d_private; irqstate_t flags; @@ -2216,7 +2216,7 @@ static uint32_t stm32_calcethcrc(const uint8_t *data, size_t length) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int stm32_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac) +static int stm32_addmac(struct net_driver_s *dev, FAR const uint8_t *mac) { uint32_t crc; uint32_t hashindex; @@ -2273,7 +2273,7 @@ static int stm32_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int stm32_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac) +static int stm32_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac) { uint32_t crc; uint32_t hashindex; @@ -3303,7 +3303,7 @@ static int stm32_macconfig(FAR struct stm32_ethmac_s *priv) static void stm32_macaddress(FAR struct stm32_ethmac_s *priv) { - FAR struct uip_driver_s *dev = &priv->dev; + FAR struct net_driver_s *dev = &priv->dev; uint32_t regval; nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", diff --git a/arch/arm/src/tiva/tiva_ethernet.c b/arch/arm/src/tiva/tiva_ethernet.c index adb9a8312e..773e6cbb3a 100644 --- a/arch/arm/src/tiva/tiva_ethernet.c +++ b/arch/arm/src/tiva/tiva_ethernet.c @@ -207,7 +207,7 @@ struct tiva_driver_s /* This holds the information visible to uIP/NuttX */ - struct uip_driver_s ld_dev; /* Interface understood by uIP */ + struct net_driver_s ld_dev; /* Interface understood by uIP */ }; /**************************************************************************** @@ -238,7 +238,7 @@ static uint16_t tiva_phyread(struct tiva_driver_s *priv, int regaddr); /* Common TX logic */ static int tiva_transmit(struct tiva_driver_s *priv); -static int tiva_uiptxpoll(struct uip_driver_s *dev); +static int tiva_uiptxpoll(struct net_driver_s *dev); /* Interrupt handling */ @@ -253,12 +253,12 @@ static void tiva_txtimeout(int argc, uint32_t arg, ...); /* NuttX callback functions */ -static int tiva_ifup(struct uip_driver_s *dev); -static int tiva_ifdown(struct uip_driver_s *dev); -static int tiva_txavail(struct uip_driver_s *dev); +static int tiva_ifup(struct net_driver_s *dev); +static int tiva_ifdown(struct net_driver_s *dev); +static int tiva_txavail(struct net_driver_s *dev); #ifdef CONFIG_NET_IGMP -static int tiva_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac); -static int tiva_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac); +static int tiva_addmac(struct net_driver_s *dev, FAR const uint8_t *mac); +static int tiva_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac); #endif /**************************************************************************** @@ -593,7 +593,7 @@ static int tiva_transmit(struct tiva_driver_s *priv) * ****************************************************************************/ -static int tiva_uiptxpoll(struct uip_driver_s *dev) +static int tiva_uiptxpoll(struct net_driver_s *dev) { struct tiva_driver_s *priv = (struct tiva_driver_s *)dev->d_private; int ret = OK; @@ -1024,7 +1024,7 @@ static void tiva_polltimer(int argc, uint32_t arg, ...) * ****************************************************************************/ -static int tiva_ifup(struct uip_driver_s *dev) +static int tiva_ifup(struct net_driver_s *dev) { struct tiva_driver_s *priv = (struct tiva_driver_s *)dev->d_private; irqstate_t flags; @@ -1180,7 +1180,7 @@ static int tiva_ifup(struct uip_driver_s *dev) * ****************************************************************************/ -static int tiva_ifdown(struct uip_driver_s *dev) +static int tiva_ifdown(struct net_driver_s *dev) { struct tiva_driver_s *priv = (struct tiva_driver_s *)dev->d_private; irqstate_t flags; @@ -1265,7 +1265,7 @@ static int tiva_ifdown(struct uip_driver_s *dev) * ****************************************************************************/ -static int tiva_txavail(struct uip_driver_s *dev) +static int tiva_txavail(struct net_driver_s *dev) { struct tiva_driver_s *priv = (struct tiva_driver_s *)dev->d_private; irqstate_t flags; @@ -1311,7 +1311,7 @@ static int tiva_txavail(struct uip_driver_s *dev) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int tiva_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac) +static int tiva_addmac(struct net_driver_s *dev, FAR const uint8_t *mac) { FAR struct tiva_driver_s *priv = (FAR struct tiva_driver_s *)dev->d_private; @@ -1341,7 +1341,7 @@ static int tiva_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int tiva_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac) +static int tiva_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac) { FAR struct tiva_driver_s *priv = (FAR struct tiva_driver_s *)dev->d_private; diff --git a/arch/hc/src/m9s12/m9s12_ethernet.c b/arch/hc/src/m9s12/m9s12_ethernet.c index 759c2819db..6d572503bf 100644 --- a/arch/hc/src/m9s12/m9s12_ethernet.c +++ b/arch/hc/src/m9s12/m9s12_ethernet.c @@ -96,7 +96,7 @@ struct emac_driver_s /* This holds the information visible to uIP/NuttX */ - struct uip_driver_s d_dev; /* Interface understood by uIP */ + struct net_driver_s d_dev; /* Interface understood by uIP */ }; /**************************************************************************** @@ -112,7 +112,7 @@ static struct emac_driver_s g_emac[CONFIG_HCS12_NINTERFACES]; /* Common TX logic */ static int emac_transmit(FAR struct emac_driver_s *priv); -static int emac_uiptxpoll(struct uip_driver_s *dev); +static int emac_uiptxpoll(struct net_driver_s *dev); /* Interrupt handling */ @@ -127,12 +127,12 @@ static void emac_txtimeout(int argc, uint32_t arg, ...); /* NuttX callback functions */ -static int emac_ifup(struct uip_driver_s *dev); -static int emac_ifdown(struct uip_driver_s *dev); -static int emac_txavail(struct uip_driver_s *dev); +static int emac_ifup(struct net_driver_s *dev); +static int emac_ifdown(struct net_driver_s *dev); +static int emac_txavail(struct net_driver_s *dev); #ifdef CONFIG_NET_IGMP -static int emac_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac); -static int emac_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac); +static int emac_addmac(struct net_driver_s *dev, FAR const uint8_t *mac); +static int emac_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac); #endif /**************************************************************************** @@ -202,7 +202,7 @@ static int emac_transmit(FAR struct emac_driver_s *priv) * ****************************************************************************/ -static int emac_uiptxpoll(struct uip_driver_s *dev) +static int emac_uiptxpoll(struct net_driver_s *dev) { FAR struct emac_driver_s *priv = (FAR struct emac_driver_s *)dev->d_private; @@ -452,7 +452,7 @@ static void emac_polltimer(int argc, uint32_t arg, ...) * ****************************************************************************/ -static int emac_ifup(struct uip_driver_s *dev) +static int emac_ifup(struct net_driver_s *dev) { FAR struct emac_driver_s *priv = (FAR struct emac_driver_s *)dev->d_private; @@ -489,7 +489,7 @@ static int emac_ifup(struct uip_driver_s *dev) * ****************************************************************************/ -static int emac_ifdown(struct uip_driver_s *dev) +static int emac_ifdown(struct net_driver_s *dev) { FAR struct emac_driver_s *priv = (FAR struct emac_driver_s *)dev->d_private; irqstate_t flags; @@ -535,7 +535,7 @@ static int emac_ifdown(struct uip_driver_s *dev) * ****************************************************************************/ -static int emac_txavail(struct uip_driver_s *dev) +static int emac_txavail(struct net_driver_s *dev) { FAR struct emac_driver_s *priv = (FAR struct emac_driver_s *)dev->d_private; irqstate_t flags; @@ -580,7 +580,7 @@ static int emac_txavail(struct uip_driver_s *dev) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int emac_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac) +static int emac_addmac(struct net_driver_s *dev, FAR const uint8_t *mac) { FAR struct emac_driver_s *priv = (FAR struct emac_driver_s *)dev->d_private; @@ -609,7 +609,7 @@ static int emac_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int emac_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac) +static int emac_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac) { FAR struct emac_driver_s *priv = (FAR struct emac_driver_s *)dev->d_private; diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c index 6288e6b527..808aba4cec 100644 --- a/arch/mips/src/pic32mx/pic32mx-ethernet.c +++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c @@ -353,7 +353,7 @@ struct pic32mx_driver_s /* This holds the information visible to uIP/NuttX */ - struct uip_driver_s pd_dev; /* Interface understood by uIP */ + struct net_driver_s pd_dev; /* Interface understood by uIP */ /* Descriptors and packet buffers */ @@ -410,7 +410,7 @@ static struct pic32mx_rxdesc_s *pic32mx_rxdesc(struct pic32mx_driver_s *priv); /* Common TX logic */ static int pic32mx_transmit(struct pic32mx_driver_s *priv); -static int pic32mx_uiptxpoll(struct uip_driver_s *dev); +static int pic32mx_uiptxpoll(struct net_driver_s *dev); static void pic32mx_poll(struct pic32mx_driver_s *priv); static void pic32mx_timerpoll(struct pic32mx_driver_s *priv); @@ -428,12 +428,12 @@ static void pic32mx_txtimeout(int argc, uint32_t arg, ...); /* NuttX callback functions */ -static int pic32mx_ifup(struct uip_driver_s *dev); -static int pic32mx_ifdown(struct uip_driver_s *dev); -static int pic32mx_txavail(struct uip_driver_s *dev); +static int pic32mx_ifup(struct net_driver_s *dev); +static int pic32mx_ifdown(struct net_driver_s *dev); +static int pic32mx_txavail(struct net_driver_s *dev); #ifdef CONFIG_NET_IGMP -static int pic32mx_addmac(struct uip_driver_s *dev, const uint8_t *mac); -static int pic32mx_rmmac(struct uip_driver_s *dev, const uint8_t *mac); +static int pic32mx_addmac(struct net_driver_s *dev, const uint8_t *mac); +static int pic32mx_rmmac(struct net_driver_s *dev, const uint8_t *mac); #endif /* PHY initialization functions */ @@ -1132,7 +1132,7 @@ static int pic32mx_transmit(struct pic32mx_driver_s *priv) * ****************************************************************************/ -static int pic32mx_uiptxpoll(struct uip_driver_s *dev) +static int pic32mx_uiptxpoll(struct net_driver_s *dev) { struct pic32mx_driver_s *priv = (struct pic32mx_driver_s *)dev->d_private; int ret = OK; @@ -1864,7 +1864,7 @@ static void pic32mx_polltimer(int argc, uint32_t arg, ...) * ****************************************************************************/ -static int pic32mx_ifup(struct uip_driver_s *dev) +static int pic32mx_ifup(struct net_driver_s *dev) { struct pic32mx_driver_s *priv = (struct pic32mx_driver_s *)dev->d_private; uint32_t regval; @@ -2166,7 +2166,7 @@ static int pic32mx_ifup(struct uip_driver_s *dev) * ****************************************************************************/ -static int pic32mx_ifdown(struct uip_driver_s *dev) +static int pic32mx_ifdown(struct net_driver_s *dev) { struct pic32mx_driver_s *priv = (struct pic32mx_driver_s *)dev->d_private; irqstate_t flags; @@ -2212,7 +2212,7 @@ static int pic32mx_ifdown(struct uip_driver_s *dev) * ****************************************************************************/ -static int pic32mx_txavail(struct uip_driver_s *dev) +static int pic32mx_txavail(struct net_driver_s *dev) { struct pic32mx_driver_s *priv = (struct pic32mx_driver_s *)dev->d_private; irqstate_t flags; @@ -2262,7 +2262,7 @@ static int pic32mx_txavail(struct uip_driver_s *dev) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int pic32mx_addmac(struct uip_driver_s *dev, const uint8_t *mac) +static int pic32mx_addmac(struct net_driver_s *dev, const uint8_t *mac) { struct pic32mx_driver_s *priv = (struct pic32mx_driver_s *)dev->d_private; @@ -2292,7 +2292,7 @@ static int pic32mx_addmac(struct uip_driver_s *dev, const uint8_t *mac) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int pic32mx_rmmac(struct uip_driver_s *dev, const uint8_t *mac) +static int pic32mx_rmmac(struct net_driver_s *dev, const uint8_t *mac) { struct pic32mx_driver_s *priv = (struct pic32mx_driver_s *)dev->d_private; diff --git a/arch/sim/src/up_uipdriver.c b/arch/sim/src/up_uipdriver.c index 9693bc0d21..340b9ebf23 100644 --- a/arch/sim/src/up_uipdriver.c +++ b/arch/sim/src/up_uipdriver.c @@ -84,7 +84,7 @@ struct timer ****************************************************************************/ static struct timer g_periodic_timer; -static struct uip_driver_s g_sim_dev; +static struct net_driver_s g_sim_dev; /**************************************************************************** * Private Functions @@ -115,7 +115,7 @@ static inline int up_comparemac(uint8_t *paddr1, struct ether_addr *paddr2) } #endif -static int sim_uiptxpoll(struct uip_driver_s *dev) +static int sim_uiptxpoll(struct net_driver_s *dev) { /* If the polling resulted in data that should be sent out on the network, * the field d_len is set to a value > 0. diff --git a/arch/z80/src/common/up_internal.h b/arch/z80/src/common/up_internal.h index a4fe041bcd..c65a5226e4 100644 --- a/arch/z80/src/common/up_internal.h +++ b/arch/z80/src/common/up_internal.h @@ -208,7 +208,7 @@ void up_timerhook(void); int up_netinitialize(void); void up_netuninitialize(void); # ifdef CONFIG_ARCH_MCFILTER -int up_multicastfilter(FAR struct uip_driver_s *dev, FAR uint8_t *mac, bool enable); +int up_multicastfilter(FAR struct net_driver_s *dev, FAR uint8_t *mac, bool enable); # else # define up_multicastfilter(dev, mac, enable) # endif diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c index 8b343c5c00..68de2457e1 100644 --- a/arch/z80/src/ez80/ez80_emac.c +++ b/arch/z80/src/ez80/ez80_emac.c @@ -319,7 +319,7 @@ struct ez80emac_driver_s /* This holds the information visible to uIP/NuttX */ - struct uip_driver_s dev; /* Interface understood by uIP */ + struct net_driver_s dev; /* Interface understood by uIP */ }; /**************************************************************************** @@ -355,7 +355,7 @@ static void ez80emac_machash(FAR uint8_t *mac, int *ndx, int *bitno) /* TX/RX logic */ static int ez80emac_transmit(struct ez80emac_driver_s *priv); -static int ez80emac_uiptxpoll(struct uip_driver_s *dev); +static int ez80emac_uiptxpoll(struct net_driver_s *dev); static inline FAR struct ez80emac_desc_s *ez80emac_rwp(void); static inline FAR struct ez80emac_desc_s *ez80emac_rrp(void); @@ -374,12 +374,12 @@ static void ez80emac_txtimeout(int argc, uint32_t arg, ...); /* NuttX callback functions */ -static int ez80emac_ifup(struct uip_driver_s *dev); -static int ez80emac_ifdown(struct uip_driver_s *dev); -static int ez80emac_txavail(struct uip_driver_s *dev); +static int ez80emac_ifup(struct net_driver_s *dev); +static int ez80emac_ifdown(struct net_driver_s *dev); +static int ez80emac_txavail(struct net_driver_s *dev); #ifdef CONFIG_NET_IGMP -static int ez80emac_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac); -static int ez80emac_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac); +static int ez80emac_addmac(struct net_driver_s *dev, FAR const uint8_t *mac); +static int ez80emac_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac); #endif /* Initialization */ @@ -1064,7 +1064,7 @@ static int ez80emac_transmit(struct ez80emac_driver_s *priv) * ****************************************************************************/ -static int ez80emac_uiptxpoll(struct uip_driver_s *dev) +static int ez80emac_uiptxpoll(struct net_driver_s *dev) { struct ez80emac_driver_s *priv = (struct ez80emac_driver_s *)dev->d_private; int ret = 0; @@ -1628,7 +1628,7 @@ static void ez80emac_polltimer(int argc, uint32_t arg, ...) * ****************************************************************************/ -static int ez80emac_ifup(FAR struct uip_driver_s *dev) +static int ez80emac_ifup(FAR struct net_driver_s *dev) { FAR struct ez80emac_driver_s *priv = (FAR struct ez80emac_driver_s *)dev->d_private; uint8_t regval; @@ -1723,7 +1723,7 @@ static int ez80emac_ifup(FAR struct uip_driver_s *dev) * ****************************************************************************/ -static int ez80emac_ifdown(struct uip_driver_s *dev) +static int ez80emac_ifdown(struct net_driver_s *dev) { struct ez80emac_driver_s *priv = (struct ez80emac_driver_s *)dev->d_private; irqstate_t flags; @@ -1775,7 +1775,7 @@ static int ez80emac_ifdown(struct uip_driver_s *dev) * ****************************************************************************/ -static int ez80emac_txavail(struct uip_driver_s *dev) +static int ez80emac_txavail(struct net_driver_s *dev) { struct ez80emac_driver_s *priv = (struct ez80emac_driver_s *)dev->d_private; irqstate_t flags; @@ -1817,7 +1817,7 @@ static int ez80emac_txavail(struct uip_driver_s *dev) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int ez80emac_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac) +static int ez80emac_addmac(struct net_driver_s *dev, FAR const uint8_t *mac) { FAR struct ez80emac_driver_s *priv = (FAR struct ez80emac_driver_s *)dev->d_private; @@ -1847,7 +1847,7 @@ static int ez80emac_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int ez80emac_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac) +static int ez80emac_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac) { FAR struct ez80emac_driver_s *priv = (FAR struct ez80emac_driver_s *)dev->d_private; @@ -2173,7 +2173,7 @@ errout: ****************************************************************************/ #ifdef CONFIG_ARCH_MCFILTER -int up_multicastfilter(FAR struct uip_driver_s *dev, FAR uint8_t *mac, bool enable) +int up_multicastfilter(FAR struct net_driver_s *dev, FAR uint8_t *mac, bool enable) { FAR struct ez80emac_driver_s *priv = (FAR struct ez80emac_driver_s *)dev->priv; uint8_t regval;