diff options
Diffstat (limited to 'nuttx/arch/arm/src/sam34/sam_emac.c')
| -rw-r--r-- | nuttx/arch/arm/src/sam34/sam_emac.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/nuttx/arch/arm/src/sam34/sam_emac.c b/nuttx/arch/arm/src/sam34/sam_emac.c index e5d527b07..58ed1e7be 100644 --- a/nuttx/arch/arm/src/sam34/sam_emac.c +++ b/nuttx/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", |