From 79ca2de3b252f4e29bf31392e4b5f52b0d512e6d Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 28 Jun 2014 19:01:37 -0600 Subject: Update RTL driver in misc/drivers --- misc/drivers/rtl8187x/rtl8187x.c | 50 ++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/misc/drivers/rtl8187x/rtl8187x.c b/misc/drivers/rtl8187x/rtl8187x.c index cad4c3b9c..d056a7750 100644 --- a/misc/drivers/rtl8187x/rtl8187x.c +++ b/misc/drivers/rtl8187x/rtl8187x.c @@ -233,7 +233,7 @@ struct rtl8187x_state_s /* This holds the information visible to uIP/NuttX */ - struct uip_driver_s ethdev; /* Interface understood by uIP */ + struct net_driver_s ethdev; /* Interface understood by uIP */ FAR uint8_t *txbuffer; /* The allocated TX I/O buffer */ FAR uint8_t *rxbuffer; /* The allocated RX I/O buffer */ }; @@ -318,7 +318,7 @@ static void rtl8187x_write(FAR struct rtl8187x_state_s *priv, uint8_t addr, /* TX logic */ static int rtl8187x_transmit(FAR struct rtl8187x_state_s *priv); -static int rtl8187x_uiptxpoll(struct uip_driver_s *dev); +static int rtl8187x_uiptxpoll(struct net_driver_s *dev); static void rtl8187x_txpollwork(FAR void *arg); static void rtl8187x_txpolltimer(int argc, uint32_t arg, ...); @@ -331,12 +331,12 @@ static void rtl8187x_rxpolltimer(int argc, uint32_t arg, ...); /* Network callback functions */ -static int rtl8187x_ifup(struct uip_driver_s *dev); -static int rtl8187x_ifdown(struct uip_driver_s *dev); -static int rtl8187x_txavail(struct uip_driver_s *dev); +static int rtl8187x_ifup(struct net_driver_s *dev); +static int rtl8187x_ifdown(struct net_driver_s *dev); +static int rtl8187x_txavail(struct net_driver_s *dev); #ifdef CONFIG_NET_IGMP -static int rtl8187x_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac); -static int rtl8187x_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac); +static int rtl8187x_addmac(struct net_driver_s *dev, FAR const uint8_t *mac); +static int rtl8187x_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac); #endif /* EEPROM support */ @@ -1946,11 +1946,11 @@ static int rtl8187x_transmit(FAR struct rtl8187x_state_s *priv) * Assumptions: * Never called from an interrupt handler. The polling process was * initiated by a normal thread (possibly the worker thread). The initiator - * has called uip_lock() to assure that we have exclusive access to uIP. + * has called net_lock() to assure that we have exclusive access to uIP. * ****************************************************************************/ -static int rtl8187x_uiptxpoll(struct uip_driver_s *dev) +static int rtl8187x_uiptxpoll(struct net_driver_s *dev) { FAR struct rtl8187x_state_s *priv = (FAR struct rtl8187x_state_s *)dev->d_private; @@ -1998,13 +1998,13 @@ static void rtl8187x_txpollwork(FAR void *arg) if (!priv->disconnected && priv->bifup) { - uip_lock_t lock; + net_lock_t lock; uint32_t now; uint32_t hsecs; /* Get exclusive access to uIP */ - lock = uip_lock(); + lock = net_lock(); /* Estimate the elapsed time in hsecs since the last poll */ @@ -2019,7 +2019,7 @@ static void rtl8187x_txpollwork(FAR void *arg) priv->ethdev.d_buf = &priv->txbuffer[SIZEOF_TXDESC]; (void)uip_timer(&priv->ethdev, rtl8187x_uiptxpoll, (int)hsecs); - uip_unlock(lock); + net_unlock(lock); } } @@ -2223,12 +2223,12 @@ static inline int rtl8187x_receive(FAR struct rtl8187x_state_s *priv, static inline void rtl8187x_rxdispatch(FAR struct rtl8187x_state_s *priv, unsigned int pktlen) { - FAR struct uip_eth_hdr *ethhdr = (FAR struct uip_eth_hdr *)priv->rxbuffer; - uip_lock_t lock; + FAR struct eth_hdr_s *ethhdr = (FAR struct eth_hdr_s *)priv->rxbuffer; + net_lock_t lock; /* Get exclusive access to uIP */ - lock = uip_lock(); + lock = net_lock(); priv->ethdev.d_buf = priv->rxbuffer; priv->ethdev.d_len = pktlen; @@ -2241,7 +2241,7 @@ static inline void rtl8187x_rxdispatch(FAR struct rtl8187x_state_s *priv, #endif { RTL8187X_STATS(priv, rxippackets); - uip_arp_ipin(&priv->ethdev); + arp_ipin(&priv->ethdev); uip_input(&priv->ethdev); /* If the above function invocation resulted in data that should be @@ -2274,7 +2274,7 @@ static inline void rtl8187x_rxdispatch(FAR struct rtl8187x_state_s *priv, RTL8187X_STATS(priv, rxdropped); } - uip_unlock(lock); + net_unlock(lock); } /**************************************************************************** @@ -2414,7 +2414,7 @@ static void rtl8187x_rxpolltimer(int argc, uint32_t arg, ...) * ****************************************************************************/ -static int rtl8187x_ifup(struct uip_driver_s *dev) +static int rtl8187x_ifup(struct net_driver_s *dev) { FAR struct rtl8187x_state_s *priv = (FAR struct rtl8187x_state_s *)dev->d_private; int ret; @@ -2461,7 +2461,7 @@ static int rtl8187x_ifup(struct uip_driver_s *dev) * ****************************************************************************/ -static int rtl8187x_ifdown(struct uip_driver_s *dev) +static int rtl8187x_ifdown(struct net_driver_s *dev) { FAR struct rtl8187x_state_s *priv = (FAR struct rtl8187x_state_s *)dev->d_private; irqstate_t flags; @@ -2505,7 +2505,7 @@ static int rtl8187x_ifdown(struct uip_driver_s *dev) * ****************************************************************************/ -static int rtl8187x_txavail(struct uip_driver_s *dev) +static int rtl8187x_txavail(struct net_driver_s *dev) { FAR struct rtl8187x_state_s *priv = (FAR struct rtl8187x_state_s *)dev->d_private; @@ -2513,17 +2513,17 @@ static int rtl8187x_txavail(struct uip_driver_s *dev) if (priv->bifup) { - uip_lock_t lock; + net_lock_t lock; /* If so, then poll uIP for new XMIT data. Pass the offset address * into the txbuffer, reserving space for the TX descriptor at the * beginning of the buffer. */ - lock = uip_lock(); + lock = net_lock(); priv->ethdev.d_buf = &priv->txbuffer[SIZEOF_TXDESC]; (void)uip_poll(&priv->ethdev, rtl8187x_uiptxpoll); - uip_unlock(lock); + net_unlock(lock); } return OK; @@ -2548,7 +2548,7 @@ static int rtl8187x_txavail(struct uip_driver_s *dev) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int rtl8187x_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac) +static int rtl8187x_addmac(struct net_driver_s *dev, FAR const uint8_t *mac) { FAR struct rtl8187x_state_s *priv = (FAR struct rtl8187x_state_s *)dev->d_private; @@ -2577,7 +2577,7 @@ static int rtl8187x_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac) ****************************************************************************/ #ifdef CONFIG_NET_IGMP -static int rtl8187x_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac) +static int rtl8187x_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac) { FAR struct rtl8187x_state_s *priv = (FAR struct rtl8187x_state_s *)dev->d_private; -- cgit v1.2.3