summaryrefslogtreecommitdiff
path: root/nuttx/drivers/net/slip.c
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-06-27 16:48:12 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-06-27 16:48:12 -0600
commit2829ffe832cb656645f8eb3378ace9d402dce2ff (patch)
tree357f44cb6d6b7ae85160befe6f8ed3ac326840b9 /nuttx/drivers/net/slip.c
parent92d9a84d48e4abfadcb12c1bd6e6f510a49e2a1f (diff)
downloadpx4-nuttx-2829ffe832cb656645f8eb3378ace9d402dce2ff.tar.gz
px4-nuttx-2829ffe832cb656645f8eb3378ace9d402dce2ff.tar.bz2
px4-nuttx-2829ffe832cb656645f8eb3378ace9d402dce2ff.zip
Rename uip_driver_s net_driver_s
Diffstat (limited to 'nuttx/drivers/net/slip.c')
-rw-r--r--nuttx/drivers/net/slip.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/nuttx/drivers/net/slip.c b/nuttx/drivers/net/slip.c
index c1d669183..1a4873e77 100644
--- a/nuttx/drivers/net/slip.c
+++ b/nuttx/drivers/net/slip.c
@@ -176,7 +176,7 @@ struct slip_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 */
uint8_t rxbuf[CONFIG_NET_BUFSIZE + 2];
uint8_t txbuf[CONFIG_NET_BUFSIZE + 2];
};
@@ -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 uip_driver_s *dev);
+static int slip_uiptxpoll(struct net_driver_s *dev);
static void slip_txtask(int argc, char *argv[]);
/* Packet receiver task */
@@ -213,12 +213,12 @@ static int slip_rxtask(int argc, char *argv[]);
/* NuttX callback functions */
-static int slip_ifup(struct uip_driver_s *dev);
-static int slip_ifdown(struct uip_driver_s *dev);
-static int slip_txavail(struct uip_driver_s *dev);
+static int slip_ifup(struct net_driver_s *dev);
+static int slip_ifdown(struct net_driver_s *dev);
+static int slip_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
-static int slip_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
-static int slip_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
+static int slip_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
+static int slip_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
/****************************************************************************
@@ -419,7 +419,7 @@ static int slip_transmit(FAR struct slip_driver_s *priv)
*
****************************************************************************/
-static int slip_uiptxpoll(struct uip_driver_s *dev)
+static int slip_uiptxpoll(struct net_driver_s *dev)
{
FAR struct slip_driver_s *priv = (FAR struct slip_driver_s *)dev->d_private;
@@ -760,7 +760,7 @@ static int slip_rxtask(int argc, char *argv[])
*
****************************************************************************/
-static int slip_ifup(struct uip_driver_s *dev)
+static int slip_ifup(struct net_driver_s *dev)
{
FAR struct slip_driver_s *priv = (FAR struct slip_driver_s *)dev->d_private;
@@ -790,7 +790,7 @@ static int slip_ifup(struct uip_driver_s *dev)
*
****************************************************************************/
-static int slip_ifdown(struct uip_driver_s *dev)
+static int slip_ifdown(struct net_driver_s *dev)
{
FAR struct slip_driver_s *priv = (FAR struct slip_driver_s *)dev->d_private;
@@ -816,7 +816,7 @@ static int slip_ifdown(struct uip_driver_s *dev)
*
****************************************************************************/
-static int slip_txavail(struct uip_driver_s *dev)
+static int slip_txavail(struct net_driver_s *dev)
{
FAR struct slip_driver_s *priv = (FAR struct slip_driver_s *)dev->d_private;
@@ -851,7 +851,7 @@ static int slip_txavail(struct uip_driver_s *dev)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
-static int slip_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
+static int slip_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct slip_driver_s *priv = (FAR struct slip_driver_s *)dev->d_private;
@@ -880,7 +880,7 @@ static int slip_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
-static int slip_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
+static int slip_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct slip_driver_s *priv = (FAR struct slip_driver_s *)dev->d_private;