Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 03:45:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename uip_driver_s net_driver_s

Browse Source
This commit is contained in:
Gregory Nutt
2014-06-27 16:48:12 -06:00
parent 2f27c1ee5b
commit fce2a79abd
103 changed files with 565 additions and 564 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/cs89x0.c
+12 -12
View File
@@ -116,7 +116,7 @@ static void cs89x0_putppreg(struct cs89x0_driver_s *cs89x0, int addr,
/* Common TX logic */
static int cs89x0_transmit(struct cs89x0_driver_s *cs89x0);
static int cs89x0_uiptxpoll(struct uip_driver_s *dev);
static int cs89x0_uiptxpoll(struct net_driver_s *dev);
/* Interrupt handling */
@@ -134,12 +134,12 @@ static void cs89x0_txtimeout(int argc, uint32_t arg, ...);
/* NuttX callback functions */
static int cs89x0_ifup(struct uip_driver_s *dev);
static int cs89x0_ifdown(struct uip_driver_s *dev);
static int cs89x0_txavail(struct uip_driver_s *dev);
static int cs89x0_ifup(struct net_driver_s *dev);
static int cs89x0_ifdown(struct net_driver_s *dev);
static int cs89x0_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
static int cs89x0_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
static int cs89x0_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
static int cs89x0_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
static int cs89x0_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
/****************************************************************************
@@ -327,7 +327,7 @@ static int cs89x0_transmit(struct cs89x0_driver_s *cs89x0)
*
****************************************************************************/
static int cs89x0_uiptxpoll(struct uip_driver_s *dev)
static int cs89x0_uiptxpoll(struct net_driver_s *dev)
{
struct cs89x0_driver_s *cs89x0 = (struct cs89x0_driver_s *)dev->d_private;
@@ -716,7 +716,7 @@ static void cs89x0_polltimer(int argc, uint32_t arg, ...)
*
****************************************************************************/
static int cs89x0_ifup(struct uip_driver_s *dev)
static int cs89x0_ifup(struct net_driver_s *dev)
{
struct cs89x0_driver_s *cs89x0 = (struct cs89x0_driver_s *)dev->d_private;
@@ -754,7 +754,7 @@ static int cs89x0_ifup(struct uip_driver_s *dev)
*
****************************************************************************/
static int cs89x0_ifdown(struct uip_driver_s *dev)
static int cs89x0_ifdown(struct net_driver_s *dev)
{
struct cs89x0_driver_s *cs89x0 = (struct cs89x0_driver_s *)dev->d_private;
irqstate_t flags;
@@ -795,7 +795,7 @@ static int cs89x0_ifdown(struct uip_driver_s *dev)
*
****************************************************************************/
static int cs89x0_txavail(struct uip_driver_s *dev)
static int cs89x0_txavail(struct net_driver_s *dev)
{
struct cs89x0_driver_s *cs89x0 = (struct cs89x0_driver_s *)dev->d_private;
irqstate_t flags;
@@ -837,7 +837,7 @@ static int cs89x0_txavail(struct uip_driver_s *dev)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int cs89x0_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
static int cs89x0_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct cs89x0_driver_s *priv = (FAR struct cs89x0_driver_s *)dev->d_private;
@@ -867,7 +867,7 @@ static int cs89x0_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int cs89x0_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
static int cs89x0_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct cs89x0_driver_s *priv = (FAR struct cs89x0_driver_s *)dev->d_private;
drivers/net/dm90x0.c
+13 -13
View File
@@ -322,7 +322,7 @@ struct dm9x_driver_s
/* This holds the information visible to uIP/NuttX */
struct uip_driver_s dm_dev;
struct net_driver_s dm_dev;
};
/****************************************************************************
@@ -376,7 +376,7 @@ static bool dm9x_rxchecksumready(uint8_t);
/* Common TX logic */
static int dm9x_transmit(struct dm9x_driver_s *dm9x);
static int dm9x_uiptxpoll(struct uip_driver_s *dev);
static int dm9x_uiptxpoll(struct net_driver_s *dev);
/* Interrupt handling */
@@ -391,12 +391,12 @@ static void dm9x_txtimeout(int argc, uint32_t arg, ...);
/* NuttX callback functions */
static int dm9x_ifup(struct uip_driver_s *dev);
static int dm9x_ifdown(struct uip_driver_s *dev);
static int dm9x_txavail(struct uip_driver_s *dev);
static int dm9x_ifup(struct net_driver_s *dev);
static int dm9x_ifdown(struct net_driver_s *dev);
static int dm9x_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
static int dm9x_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
static int dm9x_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
static int dm9x_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
static int dm9x_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
/* Initialization functions */
@@ -839,7 +839,7 @@ static int dm9x_transmit(struct dm9x_driver_s *dm9x)
*
****************************************************************************/
static int dm9x_uiptxpoll(struct uip_driver_s *dev)
static int dm9x_uiptxpoll(struct net_driver_s *dev)
{
struct dm9x_driver_s *dm9x = (struct dm9x_driver_s *)dev->d_private;
@@ -1360,7 +1360,7 @@ static inline void dm9x_phymode(struct dm9x_driver_s *dm9x)
*
****************************************************************************/
static int dm9x_ifup(struct uip_driver_s *dev)
static int dm9x_ifup(struct net_driver_s *dev)
{
struct dm9x_driver_s *dm9x = (struct dm9x_driver_s *)dev->d_private;
uint8_t netstatus;
@@ -1425,7 +1425,7 @@ static int dm9x_ifup(struct uip_driver_s *dev)
*
****************************************************************************/
static int dm9x_ifdown(struct uip_driver_s *dev)
static int dm9x_ifdown(struct net_driver_s *dev)
{
struct dm9x_driver_s *dm9x = (struct dm9x_driver_s *)dev->d_private;
irqstate_t flags;
@@ -1478,7 +1478,7 @@ static int dm9x_ifdown(struct uip_driver_s *dev)
*
****************************************************************************/
static int dm9x_txavail(struct uip_driver_s *dev)
static int dm9x_txavail(struct net_driver_s *dev)
{
struct dm9x_driver_s *dm9x = (struct dm9x_driver_s *)dev->d_private;
irqstate_t flags;
@@ -1525,7 +1525,7 @@ static int dm9x_txavail(struct uip_driver_s *dev)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int dm9x_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
static int dm9x_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct dm9x_driver_s *priv = (FAR struct dm9x_driver_s *)dev->d_private;
@@ -1555,7 +1555,7 @@ static int dm9x_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int dm9x_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
static int dm9x_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct dm9x_driver_s *priv = (FAR struct dm9x_driver_s *)dev->d_private;
drivers/net/e1000.c
+13 -13
View File
@@ -125,7 +125,7 @@ struct e1000_dev
/* This holds the information visible to uIP/NuttX */
struct uip_driver_s uip_dev; /* Interface understood by uIP */
struct net_driver_s uip_dev; /* Interface understood by uIP */
};
struct e1000_dev_head
@@ -146,7 +146,7 @@ static struct e1000_dev_head e1000_list = {0};
/* Common TX logic */
static int e1000_transmit(struct e1000_dev *e1000);
static int e1000_uiptxpoll(struct uip_driver_s *dev);
static int e1000_uiptxpoll(struct net_driver_s *dev);
/* Interrupt handling */
@@ -159,12 +159,12 @@ static void e1000_txtimeout(int argc, uint32_t arg, ...);
/* NuttX callback functions */
static int e1000_ifup(struct uip_driver_s *dev);
static int e1000_ifdown(struct uip_driver_s *dev);
static int e1000_txavail(struct uip_driver_s *dev);
static int e1000_ifup(struct net_driver_s *dev);
static int e1000_ifdown(struct net_driver_s *dev);
static int e1000_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
static int e1000_addmac(struct uip_driver_s *dev, const uint8_t *mac);
static int e1000_rmmac(struct uip_driver_s *dev, const uint8_t *mac);
static int e1000_addmac(struct net_driver_s *dev, const uint8_t *mac);
static int e1000_rmmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
/****************************************************************************
@@ -476,7 +476,7 @@ static int e1000_transmit(struct e1000_dev *e1000)
*
****************************************************************************/
static int e1000_uiptxpoll(struct uip_driver_s *dev)
static int e1000_uiptxpoll(struct net_driver_s *dev)
{
struct e1000_dev *e1000 = (struct e1000_dev *)dev->d_private;
int tail = e1000->tx_ring.tail;
@@ -705,7 +705,7 @@ static void e1000_polltimer(int argc, uint32_t arg, ...)
*
****************************************************************************/
static int e1000_ifup(struct uip_driver_s *dev)
static int e1000_ifup(struct net_driver_s *dev)
{
struct e1000_dev *e1000 = (struct e1000_dev *)dev->d_private;
@@ -749,7 +749,7 @@ static int e1000_ifup(struct uip_driver_s *dev)
*
****************************************************************************/
static int e1000_ifdown(struct uip_driver_s *dev)
static int e1000_ifdown(struct net_driver_s *dev)
{
struct e1000_dev *e1000 = (struct e1000_dev *)dev->d_private;
irqstate_t flags;
@@ -799,7 +799,7 @@ static int e1000_ifdown(struct uip_driver_s *dev)
*
****************************************************************************/
static int e1000_txavail(struct uip_driver_s *dev)
static int e1000_txavail(struct net_driver_s *dev)
{
struct e1000_dev *e1000 = (struct e1000_dev *)dev->d_private;
int tail = e1000->tx_ring.tail;
@@ -846,7 +846,7 @@ static int e1000_txavail(struct uip_driver_s *dev)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int e1000_addmac(struct uip_driver_s *dev, const uint8_t *mac)
static int e1000_addmac(struct net_driver_s *dev, const uint8_t *mac)
{
/* Add the MAC address to the hardware multicast routing table */
@@ -873,7 +873,7 @@ static int e1000_addmac(struct uip_driver_s *dev, const uint8_t *mac)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int e1000_rmmac(struct uip_driver_s *dev, const uint8_t *mac)
static int e1000_rmmac(struct net_driver_s *dev, const uint8_t *mac)
{
/* Add the MAC address to the hardware multicast routing table */
drivers/net/enc28j60.c
+13 -13
View File
@@ -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;
drivers/net/encx24j600.c
+15 -15
View File
@@ -260,7 +260,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 */
@@ -328,7 +328,7 @@ static void enc_wrphy(FAR struct enc_driver_s *priv, uint8_t phyaddr,
static int enc_txenqueue(FAR struct enc_driver_s *priv);
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);
/* Common RX logic */
@@ -355,13 +355,13 @@ 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_rxavail(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);
static int enc_rxavail(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 */
@@ -1196,7 +1196,7 @@ static int enc_txenqueue(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;
int ret = OK;
@@ -2165,7 +2165,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;
@@ -2239,7 +2239,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;
@@ -2297,7 +2297,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;
@@ -2352,7 +2352,7 @@ static int enc_txavail(struct uip_driver_s *dev)
*
****************************************************************************/
static int enc_rxavail(struct uip_driver_s *dev)
static int enc_rxavail(struct net_driver_s *dev)
{
FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;
@@ -2384,7 +2384,7 @@ static int enc_rxavail(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;
@@ -2422,7 +2422,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;
drivers/net/skeleton.c
+13 -13
View File
@@ -96,7 +96,7 @@ struct skel_driver_s
/* This holds the information visible to uIP/NuttX */
struct uip_driver_s sk_dev; /* Interface understood by uIP */
struct net_driver_s sk_dev; /* Interface understood by uIP */
};
/****************************************************************************
@@ -112,7 +112,7 @@ static struct skel_driver_s g_skel[CONFIG_skeleton_NINTERFACES];
/* Common TX logic */
static int skel_transmit(FAR struct skel_driver_s *skel);
static int skel_uiptxpoll(struct uip_driver_s *dev);
static int skel_uiptxpoll(struct net_driver_s *dev);
/* Interrupt handling */
@@ -127,12 +127,12 @@ static void skel_txtimeout(int argc, uint32_t arg, ...);
/* NuttX callback functions */
static int skel_ifup(struct uip_driver_s *dev);
static int skel_ifdown(struct uip_driver_s *dev);
static int skel_txavail(struct uip_driver_s *dev);
static int skel_ifup(struct net_driver_s *dev);
static int skel_ifdown(struct net_driver_s *dev);
static int skel_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
static int skel_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
static int skel_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
static int skel_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
static int skel_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
/****************************************************************************
@@ -202,7 +202,7 @@ static int skel_transmit(FAR struct skel_driver_s *skel)
*
****************************************************************************/
static int skel_uiptxpoll(struct uip_driver_s *dev)
static int skel_uiptxpoll(struct net_driver_s *dev)
{
FAR struct skel_driver_s *skel = (FAR struct skel_driver_s *)dev->d_private;
@@ -452,7 +452,7 @@ static void skel_polltimer(int argc, uint32_t arg, ...)
*
****************************************************************************/
static int skel_ifup(struct uip_driver_s *dev)
static int skel_ifup(struct net_driver_s *dev)
{
FAR struct skel_driver_s *skel = (FAR struct skel_driver_s *)dev->d_private;
@@ -489,7 +489,7 @@ static int skel_ifup(struct uip_driver_s *dev)
*
****************************************************************************/
static int skel_ifdown(struct uip_driver_s *dev)
static int skel_ifdown(struct net_driver_s *dev)
{
FAR struct skel_driver_s *skel = (FAR struct skel_driver_s *)dev->d_private;
irqstate_t flags;
@@ -535,7 +535,7 @@ static int skel_ifdown(struct uip_driver_s *dev)
*
****************************************************************************/
static int skel_txavail(struct uip_driver_s *dev)
static int skel_txavail(struct net_driver_s *dev)
{
FAR struct skel_driver_s *skel = (FAR struct skel_driver_s *)dev->d_private;
irqstate_t flags;
@@ -580,7 +580,7 @@ static int skel_txavail(struct uip_driver_s *dev)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int skel_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
static int skel_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct skel_driver_s *skel = (FAR struct skel_driver_s *)dev->d_private;
@@ -609,7 +609,7 @@ static int skel_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int skel_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
static int skel_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct skel_driver_s *skel = (FAR struct skel_driver_s *)dev->d_private;
drivers/net/slip.c
+13 -13
View File
@@ -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;
drivers/net/vnet.c
+13 -13
View File
@@ -103,7 +103,7 @@ struct vnet_driver_s
/* This holds the information visible to uIP/NuttX */
struct rgmp_vnet *vnet;
struct uip_driver_s sk_dev; /* Interface understood by uIP */
struct net_driver_s sk_dev; /* Interface understood by uIP */
};
/****************************************************************************
@@ -119,7 +119,7 @@ static struct vnet_driver_s g_vnet[CONFIG_VNET_NINTERFACES];
/* Common TX logic */
static int vnet_transmit(FAR struct vnet_driver_s *vnet);
static int vnet_uiptxpoll(struct uip_driver_s *dev);
static int vnet_uiptxpoll(struct net_driver_s *dev);
/* Interrupt handling */
@@ -132,12 +132,12 @@ static void vnet_txtimeout(int argc, uint32_t arg, ...);
/* NuttX callback functions */
static int vnet_ifup(struct uip_driver_s *dev);
static int vnet_ifdown(struct uip_driver_s *dev);
static int vnet_txavail(struct uip_driver_s *dev);
static int vnet_ifup(struct net_driver_s *dev);
static int vnet_ifdown(struct net_driver_s *dev);
static int vnet_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
static int vnet_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
static int vnet_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
static int vnet_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
static int vnet_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
/****************************************************************************
@@ -221,7 +221,7 @@ static int vnet_transmit(FAR struct vnet_driver_s *vnet)
*
****************************************************************************/
static int vnet_uiptxpoll(struct uip_driver_s *dev)
static int vnet_uiptxpoll(struct net_driver_s *dev)
{
FAR struct vnet_driver_s *vnet = (FAR struct vnet_driver_s *)dev->d_private;
@@ -441,7 +441,7 @@ static void vnet_polltimer(int argc, uint32_t arg, ...)
*
****************************************************************************/
static int vnet_ifup(struct uip_driver_s *dev)
static int vnet_ifup(struct net_driver_s *dev)
{
FAR struct vnet_driver_s *vnet = (FAR struct vnet_driver_s *)dev->d_private;
@@ -475,7 +475,7 @@ static int vnet_ifup(struct uip_driver_s *dev)
*
****************************************************************************/
static int vnet_ifdown(struct uip_driver_s *dev)
static int vnet_ifdown(struct net_driver_s *dev)
{
FAR struct vnet_driver_s *vnet = (FAR struct vnet_driver_s *)dev->d_private;
irqstate_t flags;
@@ -520,7 +520,7 @@ static int vnet_ifdown(struct uip_driver_s *dev)
*
****************************************************************************/
static int vnet_txavail(struct uip_driver_s *dev)
static int vnet_txavail(struct net_driver_s *dev)
{
FAR struct vnet_driver_s *vnet = (FAR struct vnet_driver_s *)dev->d_private;
irqstate_t flags;
@@ -572,7 +572,7 @@ out:
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int vnet_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
static int vnet_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct vnet_driver_s *vnet = (FAR struct vnet_driver_s *)dev->d_private;
@@ -601,7 +601,7 @@ static int vnet_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int vnet_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
static int vnet_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct vnet_driver_s *vnet = (FAR struct vnet_driver_s *)dev->d_private;