summaryrefslogtreecommitdiff
path: root/nuttx/drivers/net/enc28j60.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/enc28j60.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/enc28j60.c')
-rw-r--r--nuttx/drivers/net/enc28j60.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/nuttx/drivers/net/enc28j60.c b/nuttx/drivers/net/enc28j60.c
index c657c18c9..52538e575 100644
--- a/nuttx/drivers/net/enc28j60.c
+++ b/nuttx/drivers/net/enc28j60.c
@@ -247,7 +247,7 @@ struct enc_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 */
@@ -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 uip_driver_s *dev);
+static int enc_uiptxpoll(struct net_driver_s *dev);
/* Interrupt handling */
@@ -335,12 +335,12 @@ static void enc_polltimer(int argc, uint32_t arg, ...);
/* NuttX callback functions */
-static int enc_ifup(struct uip_driver_s *dev);
-static int enc_ifdown(struct uip_driver_s *dev);
-static int enc_txavail(struct uip_driver_s *dev);
+static int enc_ifup(struct net_driver_s *dev);
+static int enc_ifdown(struct net_driver_s *dev);
+static int enc_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
-static int enc_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
-static int enc_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
+static int enc_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
+static int enc_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
/* Initialization */
@@ -1184,7 +1184,7 @@ static int enc_transmit(FAR struct enc_driver_s *priv)
*
****************************************************************************/
-static int enc_uiptxpoll(struct uip_driver_s *dev)
+static int enc_uiptxpoll(struct net_driver_s *dev)
{
FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;
@@ -1993,7 +1993,7 @@ static void enc_polltimer(int argc, uint32_t arg, ...)
*
****************************************************************************/
-static int enc_ifup(struct uip_driver_s *dev)
+static int enc_ifup(struct net_driver_s *dev)
{
FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;
int ret;
@@ -2063,7 +2063,7 @@ static int enc_ifup(struct uip_driver_s *dev)
*
****************************************************************************/
-static int enc_ifdown(struct uip_driver_s *dev)
+static int enc_ifdown(struct net_driver_s *dev)
{
FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;
irqstate_t flags;
@@ -2120,7 +2120,7 @@ static int enc_ifdown(struct uip_driver_s *dev)
*
****************************************************************************/
-static int enc_txavail(struct uip_driver_s *dev)
+static int enc_txavail(struct net_driver_s *dev)
{
FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;
irqstate_t flags;
@@ -2174,7 +2174,7 @@ static int enc_txavail(struct uip_driver_s *dev)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
-static int enc_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
+static int enc_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;
@@ -2212,7 +2212,7 @@ static int enc_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
-static int enc_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
+static int enc_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;