Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-25 18:27:56 +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
Documentation/NuttX.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Documentation/NuttX2-b.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Documentation/NuttX2.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Documentation/NuttX320.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Documentation/NuttXScreenShot.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

Documentation/NuttxPortingGuide.html
+2 -2
View File
@@ -2926,13 +2926,13 @@ void board_led_off(int led);
<p>
<b><code>include/nuttx/net/netdev.h</code></b>.
All structures and APIs needed to work with Ethernet drivers are provided in this header file.
The structure <code>struct uip_driver_s</code> defines the interface and is passed to uIP via
The structure <code>struct net_driver_s</code> defines the interface and is passed to uIP via
<code>netdev_register()</code>.
</p>
</li>
<li>
<p>
<b><code>int netdev_register(FAR struct uip_driver_s *dev);</code></b>.
<b><code>int netdev_register(FAR struct net_driver_s *dev);</code></b>.
Each Ethernet driver registers itself by calling <code>netdev_register()</code>.
</p>
</li>
Documentation/acronyms.txt
+43 -43
View File
@@ -1,43 +1,43 @@
AIC Advanced Interrupt Controller (Atmel SAM)
ADC Analog to Digital Conversion
ARP Address Resolution Protocol (networking)
BCH Block to Character
CAN Controller Area Network
DEVIF Device Interface (networking)
DAC Digital to Analog Conversion
DEV Device
DRAM Dynamic RAM
FAT File Allocation Table
FTL FLASH Translation Layer
I2C Inter-Integrated Circuit
I2S Inter IC Sound
ICMP Internet Control Message Protocol (networking)
IOB I/O Buffer (networking)
LIBC The "C" Library
MM Memory Management/Manager
MMC Multi-Media Card
MMCSD See MMC and SD
MTD Memory Technology Device
NFS Network File System
NETDEV Network Device (networking)
NSH NuttShell
NX NuttX, the NuttX Graphics server (graphics)
NXFFS NuttX Flash File System
NXWM The NuttX Window Manager (graphics)
PID Peripheral ID (Atmel SAM)
PWM Pulse Width Modulation
PKT "Raw" Packet socket (networking)
RAM Random Access Memory
SAIC Secure Advanced Interrupt Controller (Atmel SAM)
SD Secure Digital
SPI Serial Periperhal Interface
TCP Transmission Control Protocol (networking)
TSC Touchscreen Controller
TWI Two-Wire Interface
UDP User Datagram Protocol (networking)
UART Universal Asynchronous Receiver/Transmitter
USB Universal Serial Bus
USART Universal Synchronous/Asynchronous Receiver/Transmitter
WDT Watchdog Timer
AIC Advanced Interrupt Controller (Atmel SAM)
ADC Analog to Digital Conversion
ARP Address Resolution Protocol (networking)
BCH Block to Character
CAN Controller Area Network
DEVIF Device Interface (networking)
DAC Digital to Analog Conversion
DEV Device
DRAM Dynamic RAM
FAT File Allocation Table
FTL FLASH Translation Layer
I2C Inter-Integrated Circuit
I2S Inter IC Sound
ICMP Internet Control Message Protocol (networking)
IOB I/O Buffer (networking)
LIBC The "C" Library
MM Memory Management/Manager
MMC Multi-Media Card
MMCSD See MMC and SD
MTD Memory Technology Device
NFS Network File System
NETDEV Network Device (networking)
NSH NuttShell
NX NuttX, the NuttX Graphics server (graphics)
NXFFS NuttX Flash File System
NXWM The NuttX Window Manager (graphics)
PID Peripheral ID (Atmel SAM)
PWM Pulse Width Modulation
PKT "Raw" Packet socket (networking)
RAM Random Access Memory
SAIC Secure Advanced Interrupt Controller (Atmel SAM)
SD Secure Digital
SPI Serial Periperhal Interface
TCP Transmission Control Protocol (networking)
TSC Touchscreen Controller
TWI Two-Wire Interface
UDP User Datagram Protocol (networking)
UART Universal Asynchronous Receiver/Transmitter
USB Universal Serial Bus
USART Universal Synchronous/Asynchronous Receiver/Transmitter
WDT Watchdog Timer
arch/arm/src/c5471/c5471_ethernet.c
+16 -16
View File
@@ -330,7 +330,7 @@ struct c5471_driver_s
/* This holds the information visible to uIP/NuttX */
struct uip_driver_s c_dev; /* Interface understood by uIP */
struct net_driver_s c_dev; /* Interface understood by uIP */
};
/****************************************************************************
@@ -359,7 +359,7 @@ static inline void c5471_incrxcpu(struct c5471_driver_s *c5471);
/* Common TX logic */
static int c5471_transmit(struct c5471_driver_s *c5471);
static int c5471_uiptxpoll(struct uip_driver_s *dev);
static int c5471_uiptxpoll(struct net_driver_s *dev);
/* Interrupt handling */
@@ -380,12 +380,12 @@ static void c5471_txtimeout(int argc, uint32_t arg, ...);
/* NuttX callback functions */
static int c5471_ifup(struct uip_driver_s *dev);
static int c5471_ifdown(struct uip_driver_s *dev);
static int c5471_txavail(struct uip_driver_s *dev);
static int c5471_ifup(struct net_driver_s *dev);
static int c5471_ifdown(struct net_driver_s *dev);
static int c5471_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
static int c5471_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
static int c5471_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
static int c5471_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
static int c5471_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
/* Initialization functions */
@@ -844,7 +844,7 @@ static inline void c5471_incrxcpu(struct c5471_driver_s *c5471)
static int c5471_transmit(struct c5471_driver_s *c5471)
{
struct uip_driver_s *dev = &c5471->c_dev;
struct net_driver_s *dev = &c5471->c_dev;
volatile uint16_t *packetmem;
uint16_t framelen;
bool bfirstframe;
@@ -974,7 +974,7 @@ static int c5471_transmit(struct c5471_driver_s *c5471)
*
****************************************************************************/
static int c5471_uiptxpoll(struct uip_driver_s *dev)
static int c5471_uiptxpoll(struct net_driver_s *dev)
{
struct c5471_driver_s *c5471 = (struct c5471_driver_s *)dev->d_private;
@@ -1126,7 +1126,7 @@ static void c5471_rxstatus(struct c5471_driver_s *c5471)
static void c5471_receive(struct c5471_driver_s *c5471)
{
struct uip_driver_s *dev = &c5471->c_dev;
struct net_driver_s *dev = &c5471->c_dev;
uint16_t *packetmem;
bool bmore = true;
int packetlen = 0;
@@ -1580,7 +1580,7 @@ static void c5471_polltimer(int argc, uint32_t arg, ...)
*
****************************************************************************/
static int c5471_ifup(struct uip_driver_s *dev)
static int c5471_ifup(struct net_driver_s *dev)
{
struct c5471_driver_s *c5471 = (struct c5471_driver_s *)dev->d_private;
volatile uint32_t clearbits;
@@ -1640,7 +1640,7 @@ static int c5471_ifup(struct uip_driver_s *dev)
*
****************************************************************************/
static int c5471_ifdown(struct uip_driver_s *dev)
static int c5471_ifdown(struct net_driver_s *dev)
{
struct c5471_driver_s *c5471 = (struct c5471_driver_s *)dev->d_private;
irqstate_t flags;
@@ -1695,7 +1695,7 @@ static int c5471_ifdown(struct uip_driver_s *dev)
*
****************************************************************************/
static int c5471_txavail(struct uip_driver_s *dev)
static int c5471_txavail(struct net_driver_s *dev)
{
struct c5471_driver_s *c5471 = (struct c5471_driver_s *)dev->d_private;
irqstate_t flags;
@@ -1742,7 +1742,7 @@ static int c5471_txavail(struct uip_driver_s *dev)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int c5471_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
static int c5471_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct c5471_driver_s *priv = (FAR struct c5471_driver_s *)dev->d_private;
@@ -1772,7 +1772,7 @@ static int c5471_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int c5471_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
static int c5471_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct c5471_driver_s *priv = (FAR struct c5471_driver_s *)dev->d_private;
@@ -2066,7 +2066,7 @@ static void c5471_reset(struct c5471_driver_s *c5471)
static void c5471_macassign(struct c5471_driver_s *c5471)
{
struct uip_driver_s *dev = &c5471->c_dev;
struct net_driver_s *dev = &c5471->c_dev;
uint8_t *mptr = dev->d_mac.ether_addr_octet;
register uint32_t tmp;
arch/arm/src/kinetis/kinetis_enet.c
+13 -13
View File
@@ -178,7 +178,7 @@ struct kinetis_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 */
@@ -224,7 +224,7 @@ static inline uint16_t kinesis_swap16(uint16_t value);
static bool kinetics_txringfull(FAR struct kinetis_driver_s *priv);
static int kinetis_transmit(FAR struct kinetis_driver_s *priv);
static int kinetis_uiptxpoll(struct uip_driver_s *dev);
static int kinetis_uiptxpoll(struct net_driver_s *dev);
/* Interrupt handling */
@@ -239,12 +239,12 @@ static void kinetis_txtimeout(int argc, uint32_t arg, ...);
/* NuttX callback functions */
static int kinetis_ifup(struct uip_driver_s *dev);
static int kinetis_ifdown(struct uip_driver_s *dev);
static int kinetis_txavail(struct uip_driver_s *dev);
static int kinetis_ifup(struct net_driver_s *dev);
static int kinetis_ifdown(struct net_driver_s *dev);
static int kinetis_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
static int kinetis_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
static int kinetis_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
static int kinetis_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
static int kinetis_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
/* PHY/MII support */
@@ -434,7 +434,7 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv)
*
****************************************************************************/
static int kinetis_uiptxpoll(struct uip_driver_s *dev)
static int kinetis_uiptxpoll(struct net_driver_s *dev)
{
FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)dev->d_private;
@@ -783,7 +783,7 @@ static void kinetis_polltimer(int argc, uint32_t arg, ...)
*
****************************************************************************/
static int kinetis_ifup(struct uip_driver_s *dev)
static int kinetis_ifup(struct net_driver_s *dev)
{
FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)dev->d_private;
uint32_t regval;
@@ -896,7 +896,7 @@ static int kinetis_ifup(struct uip_driver_s *dev)
*
****************************************************************************/
static int kinetis_ifdown(struct uip_driver_s *dev)
static int kinetis_ifdown(struct net_driver_s *dev)
{
FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)dev->d_private;
irqstate_t flags;
@@ -948,7 +948,7 @@ static int kinetis_ifdown(struct uip_driver_s *dev)
*
****************************************************************************/
static int kinetis_txavail(struct uip_driver_s *dev)
static int kinetis_txavail(struct net_driver_s *dev)
{
FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)dev->d_private;
irqstate_t flags;
@@ -1000,7 +1000,7 @@ static int kinetis_txavail(struct uip_driver_s *dev)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int kinetis_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
static int kinetis_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)dev->d_private;
@@ -1029,7 +1029,7 @@ static int kinetis_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int kinetis_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
static int kinetis_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)dev->d_private;
arch/arm/src/lpc17xx/lpc17_ethernet.c
+13 -13
View File
@@ -281,7 +281,7 @@ struct lpc17_driver_s
/* This holds the information visible to uIP/NuttX */
struct uip_driver_s lp_dev; /* Interface understood by uIP */
struct net_driver_s lp_dev; /* Interface understood by uIP */
};
/****************************************************************************
@@ -325,7 +325,7 @@ static void lpc17_putreg(uint32_t val, uint32_t addr);
static int lpc17_txdesc(struct lpc17_driver_s *priv);
static int lpc17_transmit(struct lpc17_driver_s *priv);
static int lpc17_uiptxpoll(struct uip_driver_s *dev);
static int lpc17_uiptxpoll(struct net_driver_s *dev);
/* Interrupt handling */
@@ -341,12 +341,12 @@ static void lpc17_txtimeout(int argc, uint32_t arg, ...);
/* NuttX callback functions */
static int lpc17_ifup(struct uip_driver_s *dev);
static int lpc17_ifdown(struct uip_driver_s *dev);
static int lpc17_txavail(struct uip_driver_s *dev);
static int lpc17_ifup(struct net_driver_s *dev);
static int lpc17_ifdown(struct net_driver_s *dev);
static int lpc17_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
static int lpc17_addmac(struct uip_driver_s *dev, const uint8_t *mac);
static int lpc17_rmmac(struct uip_driver_s *dev, const uint8_t *mac);
static int lpc17_addmac(struct net_driver_s *dev, const uint8_t *mac);
static int lpc17_rmmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
/* Initialization functions */
@@ -666,7 +666,7 @@ static int lpc17_transmit(struct lpc17_driver_s *priv)
*
****************************************************************************/
static int lpc17_uiptxpoll(struct uip_driver_s *dev)
static int lpc17_uiptxpoll(struct net_driver_s *dev)
{
struct lpc17_driver_s *priv = (struct lpc17_driver_s *)dev->d_private;
int ret = OK;
@@ -1250,7 +1250,7 @@ static void lpc17_polltimer(int argc, uint32_t arg, ...)
*
****************************************************************************/
static int lpc17_ifup(struct uip_driver_s *dev)
static int lpc17_ifup(struct net_driver_s *dev)
{
struct lpc17_driver_s *priv = (struct lpc17_driver_s *)dev->d_private;
uint32_t regval;
@@ -1419,7 +1419,7 @@ static int lpc17_ifup(struct uip_driver_s *dev)
*
****************************************************************************/
static int lpc17_ifdown(struct uip_driver_s *dev)
static int lpc17_ifdown(struct net_driver_s *dev)
{
struct lpc17_driver_s *priv = (struct lpc17_driver_s *)dev->d_private;
irqstate_t flags;
@@ -1461,7 +1461,7 @@ static int lpc17_ifdown(struct uip_driver_s *dev)
*
****************************************************************************/
static int lpc17_txavail(struct uip_driver_s *dev)
static int lpc17_txavail(struct net_driver_s *dev)
{
struct lpc17_driver_s *priv = (struct lpc17_driver_s *)dev->d_private;
irqstate_t flags;
@@ -1509,7 +1509,7 @@ static int lpc17_txavail(struct uip_driver_s *dev)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int lpc17_addmac(struct uip_driver_s *dev, const uint8_t *mac)
static int lpc17_addmac(struct net_driver_s *dev, const uint8_t *mac)
{
struct lpc17_driver_s *priv = (struct lpc17_driver_s *)dev->d_private;
@@ -1539,7 +1539,7 @@ static int lpc17_addmac(struct uip_driver_s *dev, const uint8_t *mac)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int lpc17_rmmac(struct uip_driver_s *dev, const uint8_t *mac)
static int lpc17_rmmac(struct net_driver_s *dev, const uint8_t *mac)
{
struct lpc17_driver_s *priv = (struct lpc17_driver_s *)dev->d_private;
arch/arm/src/sam34/sam_emac.c
+19 -19
View File
@@ -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",
arch/arm/src/sama5/sam_emaca.c
+19 -19
View File
@@ -264,7 +264,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 */
@@ -350,7 +350,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 */
@@ -367,12 +367,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 */
@@ -700,7 +700,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;
uintptr_t virtaddr;
uint32_t regval;
@@ -818,7 +818,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;
@@ -873,7 +873,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.
@@ -913,7 +913,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;
uintptr_t physaddr;
@@ -1148,7 +1148,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.
@@ -1548,7 +1548,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.
@@ -1583,7 +1583,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;
@@ -1653,7 +1653,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;
@@ -1703,7 +1703,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;
@@ -1748,7 +1748,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;
@@ -1782,7 +1782,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;
@@ -2747,7 +2747,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",
arch/arm/src/sama5/sam_emacb.c
+19 -19
View File
@@ -387,7 +387,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 */
/* Constant and configured attributes of the EMAC */
@@ -438,7 +438,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 */
@@ -461,12 +461,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 */
@@ -1009,7 +1009,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;
uintptr_t virtaddr;
uint32_t regval;
@@ -1127,7 +1127,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;
@@ -1182,7 +1182,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.
@@ -1222,7 +1222,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;
uintptr_t physaddr;
@@ -1457,7 +1457,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.
@@ -1887,7 +1887,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.
@@ -1922,7 +1922,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;
@@ -1992,7 +1992,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;
@@ -2042,7 +2042,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;
@@ -2087,7 +2087,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;
@@ -2121,7 +2121,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;
@@ -3350,7 +3350,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",
arch/arm/src/sama5/sam_gmac.c
+19 -19
View File
@@ -190,7 +190,7 @@ struct sam_gmac_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 */
@@ -275,7 +275,7 @@ static void sam_buffer_free(struct sam_gmac_s *priv);
/* Common TX logic */
static int sam_transmit(struct sam_gmac_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_gmac_s *priv);
/* Interrupt handling */
@@ -292,12 +292,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 */
@@ -631,7 +631,7 @@ static void sam_buffer_free(struct sam_gmac_s *priv)
static int sam_transmit(struct sam_gmac_s *priv)
{
struct uip_driver_s *dev = &priv->dev;
struct net_driver_s *dev = &priv->dev;
volatile struct gmac_txdesc_s *txdesc;
uintptr_t virtaddr;
uint32_t regval;
@@ -750,7 +750,7 @@ static int sam_transmit(struct sam_gmac_s *priv)
*
****************************************************************************/
static int sam_uiptxpoll(struct uip_driver_s *dev)
static int sam_uiptxpoll(struct net_driver_s *dev)
{
struct sam_gmac_s *priv = (struct sam_gmac_s *)dev->d_private;
@@ -805,7 +805,7 @@ static int sam_uiptxpoll(struct uip_driver_s *dev)
static void sam_dopoll(struct sam_gmac_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.
@@ -845,7 +845,7 @@ static void sam_dopoll(struct sam_gmac_s *priv)
static int sam_recvframe(struct sam_gmac_s *priv)
{
volatile struct gmac_rxdesc_s *rxdesc;
struct uip_driver_s *dev;
struct net_driver_s *dev;
const uint8_t *src;
uint8_t *dest;
uintptr_t physaddr;
@@ -1078,7 +1078,7 @@ static int sam_recvframe(struct sam_gmac_s *priv)
static void sam_receive(struct sam_gmac_s *priv)
{
struct uip_driver_s *dev = &priv->dev;
struct net_driver_s *dev = &priv->dev;
/* Loop while while sam_recvframe() successfully retrieves valid
* GMAC frames.
@@ -1500,7 +1500,7 @@ static void sam_txtimeout(int argc, uint32_t arg, ...)
static void sam_polltimer(int argc, uint32_t arg, ...)
{
struct sam_gmac_s *priv = (struct sam_gmac_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.
@@ -1535,7 +1535,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_gmac_s *priv = (struct sam_gmac_s *)dev->d_private;
int ret;
@@ -1608,7 +1608,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_gmac_s *priv = (struct sam_gmac_s *)dev->d_private;
irqstate_t flags;
@@ -1658,7 +1658,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_gmac_s *priv = (struct sam_gmac_s *)dev->d_private;
irqstate_t flags;
@@ -1703,7 +1703,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_gmac_s *priv = (struct sam_gmac_s *)dev->d_private;
@@ -1737,7 +1737,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_gmac_s *priv = (struct sam_gmac_s *)dev->d_private;
@@ -2801,7 +2801,7 @@ static void sam_gmac_reset(struct sam_gmac_s *priv)
static void sam_macaddress(struct sam_gmac_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",
arch/arm/src/stm32/stm32_eth.c
+18 -18
View File
@@ -572,7 +572,7 @@ struct stm32_ethmac_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 */
@@ -627,7 +627,7 @@ static inline bool stm32_isfreebuffer(FAR struct stm32_ethmac_s *priv);
/* Common TX logic */
static int stm32_transmit(FAR struct stm32_ethmac_s *priv);
static int stm32_uiptxpoll(struct uip_driver_s *dev);
static int stm32_uiptxpoll(struct net_driver_s *dev);
static void stm32_dopoll(FAR struct stm32_ethmac_s *priv);
/* Interrupt handling */
@@ -650,12 +650,12 @@ static void stm32_txtimeout(int argc, uint32_t arg, ...);
/* NuttX callback functions */
static int stm32_ifup(struct uip_driver_s *dev);
static int stm32_ifdown(struct uip_driver_s *dev);
static int stm32_txavail(struct uip_driver_s *dev);
static int stm32_ifup(struct net_driver_s *dev);
static int stm32_ifdown(struct net_driver_s *dev);
static int stm32_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
static int stm32_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
static int stm32_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
static int stm32_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
static int stm32_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
/* Descriptor Initialization */
@@ -1159,7 +1159,7 @@ static int stm32_transmit(FAR struct stm32_ethmac_s *priv)
*
****************************************************************************/
static int stm32_uiptxpoll(struct uip_driver_s *dev)
static int stm32_uiptxpoll(struct net_driver_s *dev)
{
FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)dev->d_private;
@@ -1240,7 +1240,7 @@ static int stm32_uiptxpoll(struct uip_driver_s *dev)
static void stm32_dopoll(FAR struct stm32_ethmac_s *priv)
{
FAR struct uip_driver_s *dev = &priv->dev;
FAR struct net_driver_s *dev = &priv->dev;
/* Check if the next TX descriptor is owned by the Ethernet DMA or
* CPU. We cannot perform the TX poll if we are unable to accept
@@ -1503,7 +1503,7 @@ static int stm32_recvframe(FAR struct stm32_ethmac_s *priv)
if ((rxdesc->rdes0 & ETH_RDES0_ES) == 0)
{
struct uip_driver_s *dev = &priv->dev;
struct net_driver_s *dev = &priv->dev;
/* Get the Frame Length of the received packet: substruct 4
* bytes of the CRC
@@ -1587,7 +1587,7 @@ static int stm32_recvframe(FAR struct stm32_ethmac_s *priv)
static void stm32_receive(FAR struct stm32_ethmac_s *priv)
{
struct uip_driver_s *dev = &priv->dev;
struct net_driver_s *dev = &priv->dev;
/* Loop while while stm32_recvframe() successfully retrieves valid
* Ethernet frames.
@@ -1964,7 +1964,7 @@ static void stm32_txtimeout(int argc, uint32_t arg, ...)
static void stm32_polltimer(int argc, uint32_t arg, ...)
{
FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)arg;
FAR struct uip_driver_s *dev = &priv->dev;
FAR struct net_driver_s *dev = &priv->dev;
/* Check if the next TX descriptor is owned by the Ethernet DMA or CPU. We
* cannot perform the timer poll if we are unable to accept another packet
@@ -2031,7 +2031,7 @@ static void stm32_polltimer(int argc, uint32_t arg, ...)
*
****************************************************************************/
static int stm32_ifup(struct uip_driver_s *dev)
static int stm32_ifup(struct net_driver_s *dev)
{
FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)dev->d_private;
int ret;
@@ -2077,7 +2077,7 @@ static int stm32_ifup(struct uip_driver_s *dev)
*
****************************************************************************/
static int stm32_ifdown(struct uip_driver_s *dev)
static int stm32_ifdown(struct net_driver_s *dev)
{
FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)dev->d_private;
irqstate_t flags;
@@ -2127,7 +2127,7 @@ static int stm32_ifdown(struct uip_driver_s *dev)
*
****************************************************************************/
static int stm32_txavail(struct uip_driver_s *dev)
static int stm32_txavail(struct net_driver_s *dev)
{
FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)dev->d_private;
irqstate_t flags;
@@ -2216,7 +2216,7 @@ static uint32_t stm32_calcethcrc(const uint8_t *data, size_t length)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int stm32_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
static int stm32_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
uint32_t crc;
uint32_t hashindex;
@@ -2273,7 +2273,7 @@ static int stm32_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int stm32_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
static int stm32_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
uint32_t crc;
uint32_t hashindex;
@@ -3303,7 +3303,7 @@ static int stm32_macconfig(FAR struct stm32_ethmac_s *priv)
static void stm32_macaddress(FAR struct stm32_ethmac_s *priv)
{
FAR struct uip_driver_s *dev = &priv->dev;
FAR struct net_driver_s *dev = &priv->dev;
uint32_t regval;
nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
arch/arm/src/tiva/tiva_ethernet.c
+13 -13
View File
@@ -207,7 +207,7 @@ struct tiva_driver_s
/* This holds the information visible to uIP/NuttX */
struct uip_driver_s ld_dev; /* Interface understood by uIP */
struct net_driver_s ld_dev; /* Interface understood by uIP */
};
/****************************************************************************
@@ -238,7 +238,7 @@ static uint16_t tiva_phyread(struct tiva_driver_s *priv, int regaddr);
/* Common TX logic */
static int tiva_transmit(struct tiva_driver_s *priv);
static int tiva_uiptxpoll(struct uip_driver_s *dev);
static int tiva_uiptxpoll(struct net_driver_s *dev);
/* Interrupt handling */
@@ -253,12 +253,12 @@ static void tiva_txtimeout(int argc, uint32_t arg, ...);
/* NuttX callback functions */
static int tiva_ifup(struct uip_driver_s *dev);
static int tiva_ifdown(struct uip_driver_s *dev);
static int tiva_txavail(struct uip_driver_s *dev);
static int tiva_ifup(struct net_driver_s *dev);
static int tiva_ifdown(struct net_driver_s *dev);
static int tiva_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
static int tiva_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
static int tiva_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
static int tiva_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
static int tiva_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
/****************************************************************************
@@ -593,7 +593,7 @@ static int tiva_transmit(struct tiva_driver_s *priv)
*
****************************************************************************/
static int tiva_uiptxpoll(struct uip_driver_s *dev)
static int tiva_uiptxpoll(struct net_driver_s *dev)
{
struct tiva_driver_s *priv = (struct tiva_driver_s *)dev->d_private;
int ret = OK;
@@ -1024,7 +1024,7 @@ static void tiva_polltimer(int argc, uint32_t arg, ...)
*
****************************************************************************/
static int tiva_ifup(struct uip_driver_s *dev)
static int tiva_ifup(struct net_driver_s *dev)
{
struct tiva_driver_s *priv = (struct tiva_driver_s *)dev->d_private;
irqstate_t flags;
@@ -1180,7 +1180,7 @@ static int tiva_ifup(struct uip_driver_s *dev)
*
****************************************************************************/
static int tiva_ifdown(struct uip_driver_s *dev)
static int tiva_ifdown(struct net_driver_s *dev)
{
struct tiva_driver_s *priv = (struct tiva_driver_s *)dev->d_private;
irqstate_t flags;
@@ -1265,7 +1265,7 @@ static int tiva_ifdown(struct uip_driver_s *dev)
*
****************************************************************************/
static int tiva_txavail(struct uip_driver_s *dev)
static int tiva_txavail(struct net_driver_s *dev)
{
struct tiva_driver_s *priv = (struct tiva_driver_s *)dev->d_private;
irqstate_t flags;
@@ -1311,7 +1311,7 @@ static int tiva_txavail(struct uip_driver_s *dev)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int tiva_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
static int tiva_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct tiva_driver_s *priv = (FAR struct tiva_driver_s *)dev->d_private;
@@ -1341,7 +1341,7 @@ static int tiva_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int tiva_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
static int tiva_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct tiva_driver_s *priv = (FAR struct tiva_driver_s *)dev->d_private;
arch/hc/src/m9s12/m9s12_ethernet.c
+13 -13
View File
@@ -96,7 +96,7 @@ struct emac_driver_s
/* This holds the information visible to uIP/NuttX */
struct uip_driver_s d_dev; /* Interface understood by uIP */
struct net_driver_s d_dev; /* Interface understood by uIP */
};
/****************************************************************************
@@ -112,7 +112,7 @@ static struct emac_driver_s g_emac[CONFIG_HCS12_NINTERFACES];
/* Common TX logic */
static int emac_transmit(FAR struct emac_driver_s *priv);
static int emac_uiptxpoll(struct uip_driver_s *dev);
static int emac_uiptxpoll(struct net_driver_s *dev);
/* Interrupt handling */
@@ -127,12 +127,12 @@ static void emac_txtimeout(int argc, uint32_t arg, ...);
/* NuttX callback functions */
static int emac_ifup(struct uip_driver_s *dev);
static int emac_ifdown(struct uip_driver_s *dev);
static int emac_txavail(struct uip_driver_s *dev);
static int emac_ifup(struct net_driver_s *dev);
static int emac_ifdown(struct net_driver_s *dev);
static int emac_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
static int emac_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
static int emac_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
static int emac_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
static int emac_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
/****************************************************************************
@@ -202,7 +202,7 @@ static int emac_transmit(FAR struct emac_driver_s *priv)
*
****************************************************************************/
static int emac_uiptxpoll(struct uip_driver_s *dev)
static int emac_uiptxpoll(struct net_driver_s *dev)
{
FAR struct emac_driver_s *priv = (FAR struct emac_driver_s *)dev->d_private;
@@ -452,7 +452,7 @@ static void emac_polltimer(int argc, uint32_t arg, ...)
*
****************************************************************************/
static int emac_ifup(struct uip_driver_s *dev)
static int emac_ifup(struct net_driver_s *dev)
{
FAR struct emac_driver_s *priv = (FAR struct emac_driver_s *)dev->d_private;
@@ -489,7 +489,7 @@ static int emac_ifup(struct uip_driver_s *dev)
*
****************************************************************************/
static int emac_ifdown(struct uip_driver_s *dev)
static int emac_ifdown(struct net_driver_s *dev)
{
FAR struct emac_driver_s *priv = (FAR struct emac_driver_s *)dev->d_private;
irqstate_t flags;
@@ -535,7 +535,7 @@ static int emac_ifdown(struct uip_driver_s *dev)
*
****************************************************************************/
static int emac_txavail(struct uip_driver_s *dev)
static int emac_txavail(struct net_driver_s *dev)
{
FAR struct emac_driver_s *priv = (FAR struct emac_driver_s *)dev->d_private;
irqstate_t flags;
@@ -580,7 +580,7 @@ static int emac_txavail(struct uip_driver_s *dev)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int emac_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
static int emac_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct emac_driver_s *priv = (FAR struct emac_driver_s *)dev->d_private;
@@ -609,7 +609,7 @@ static int emac_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int emac_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
static int emac_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct emac_driver_s *priv = (FAR struct emac_driver_s *)dev->d_private;
arch/mips/src/pic32mx/pic32mx-ethernet.c
+13 -13
View File
@@ -353,7 +353,7 @@ struct pic32mx_driver_s
/* This holds the information visible to uIP/NuttX */
struct uip_driver_s pd_dev; /* Interface understood by uIP */
struct net_driver_s pd_dev; /* Interface understood by uIP */
/* Descriptors and packet buffers */
@@ -410,7 +410,7 @@ static struct pic32mx_rxdesc_s *pic32mx_rxdesc(struct pic32mx_driver_s *priv);
/* Common TX logic */
static int pic32mx_transmit(struct pic32mx_driver_s *priv);
static int pic32mx_uiptxpoll(struct uip_driver_s *dev);
static int pic32mx_uiptxpoll(struct net_driver_s *dev);
static void pic32mx_poll(struct pic32mx_driver_s *priv);
static void pic32mx_timerpoll(struct pic32mx_driver_s *priv);
@@ -428,12 +428,12 @@ static void pic32mx_txtimeout(int argc, uint32_t arg, ...);
/* NuttX callback functions */
static int pic32mx_ifup(struct uip_driver_s *dev);
static int pic32mx_ifdown(struct uip_driver_s *dev);
static int pic32mx_txavail(struct uip_driver_s *dev);
static int pic32mx_ifup(struct net_driver_s *dev);
static int pic32mx_ifdown(struct net_driver_s *dev);
static int pic32mx_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
static int pic32mx_addmac(struct uip_driver_s *dev, const uint8_t *mac);
static int pic32mx_rmmac(struct uip_driver_s *dev, const uint8_t *mac);
static int pic32mx_addmac(struct net_driver_s *dev, const uint8_t *mac);
static int pic32mx_rmmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
/* PHY initialization functions */
@@ -1132,7 +1132,7 @@ static int pic32mx_transmit(struct pic32mx_driver_s *priv)
*
****************************************************************************/
static int pic32mx_uiptxpoll(struct uip_driver_s *dev)
static int pic32mx_uiptxpoll(struct net_driver_s *dev)
{
struct pic32mx_driver_s *priv = (struct pic32mx_driver_s *)dev->d_private;
int ret = OK;
@@ -1864,7 +1864,7 @@ static void pic32mx_polltimer(int argc, uint32_t arg, ...)
*
****************************************************************************/
static int pic32mx_ifup(struct uip_driver_s *dev)
static int pic32mx_ifup(struct net_driver_s *dev)
{
struct pic32mx_driver_s *priv = (struct pic32mx_driver_s *)dev->d_private;
uint32_t regval;
@@ -2166,7 +2166,7 @@ static int pic32mx_ifup(struct uip_driver_s *dev)
*
****************************************************************************/
static int pic32mx_ifdown(struct uip_driver_s *dev)
static int pic32mx_ifdown(struct net_driver_s *dev)
{
struct pic32mx_driver_s *priv = (struct pic32mx_driver_s *)dev->d_private;
irqstate_t flags;
@@ -2212,7 +2212,7 @@ static int pic32mx_ifdown(struct uip_driver_s *dev)
*
****************************************************************************/
static int pic32mx_txavail(struct uip_driver_s *dev)
static int pic32mx_txavail(struct net_driver_s *dev)
{
struct pic32mx_driver_s *priv = (struct pic32mx_driver_s *)dev->d_private;
irqstate_t flags;
@@ -2262,7 +2262,7 @@ static int pic32mx_txavail(struct uip_driver_s *dev)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int pic32mx_addmac(struct uip_driver_s *dev, const uint8_t *mac)
static int pic32mx_addmac(struct net_driver_s *dev, const uint8_t *mac)
{
struct pic32mx_driver_s *priv = (struct pic32mx_driver_s *)dev->d_private;
@@ -2292,7 +2292,7 @@ static int pic32mx_addmac(struct uip_driver_s *dev, const uint8_t *mac)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int pic32mx_rmmac(struct uip_driver_s *dev, const uint8_t *mac)
static int pic32mx_rmmac(struct net_driver_s *dev, const uint8_t *mac)
{
struct pic32mx_driver_s *priv = (struct pic32mx_driver_s *)dev->d_private;
arch/sim/src/up_uipdriver.c
+2 -2
View File
@@ -84,7 +84,7 @@ struct timer
****************************************************************************/
static struct timer g_periodic_timer;
static struct uip_driver_s g_sim_dev;
static struct net_driver_s g_sim_dev;
/****************************************************************************
* Private Functions
@@ -115,7 +115,7 @@ static inline int up_comparemac(uint8_t *paddr1, struct ether_addr *paddr2)
}
#endif
static int sim_uiptxpoll(struct uip_driver_s *dev)
static int sim_uiptxpoll(struct net_driver_s *dev)
{
/* If the polling resulted in data that should be sent out on the network,
* the field d_len is set to a value > 0.
arch/z80/src/common/up_internal.h
+1 -1
View File
@@ -208,7 +208,7 @@ void up_timerhook(void);
int up_netinitialize(void);
void up_netuninitialize(void);
# ifdef CONFIG_ARCH_MCFILTER
int up_multicastfilter(FAR struct uip_driver_s *dev, FAR uint8_t *mac, bool enable);
int up_multicastfilter(FAR struct net_driver_s *dev, FAR uint8_t *mac, bool enable);
# else
# define up_multicastfilter(dev, mac, enable)
# endif
arch/z80/src/ez80/ez80_emac.c
+14 -14
View File
@@ -319,7 +319,7 @@ struct ez80emac_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 */
};
/****************************************************************************
@@ -355,7 +355,7 @@ static void ez80emac_machash(FAR uint8_t *mac, int *ndx, int *bitno)
/* TX/RX logic */
static int ez80emac_transmit(struct ez80emac_driver_s *priv);
static int ez80emac_uiptxpoll(struct uip_driver_s *dev);
static int ez80emac_uiptxpoll(struct net_driver_s *dev);
static inline FAR struct ez80emac_desc_s *ez80emac_rwp(void);
static inline FAR struct ez80emac_desc_s *ez80emac_rrp(void);
@@ -374,12 +374,12 @@ static void ez80emac_txtimeout(int argc, uint32_t arg, ...);
/* NuttX callback functions */
static int ez80emac_ifup(struct uip_driver_s *dev);
static int ez80emac_ifdown(struct uip_driver_s *dev);
static int ez80emac_txavail(struct uip_driver_s *dev);
static int ez80emac_ifup(struct net_driver_s *dev);
static int ez80emac_ifdown(struct net_driver_s *dev);
static int ez80emac_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
static int ez80emac_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
static int ez80emac_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac);
static int ez80emac_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
static int ez80emac_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
/* Initialization */
@@ -1064,7 +1064,7 @@ static int ez80emac_transmit(struct ez80emac_driver_s *priv)
*
****************************************************************************/
static int ez80emac_uiptxpoll(struct uip_driver_s *dev)
static int ez80emac_uiptxpoll(struct net_driver_s *dev)
{
struct ez80emac_driver_s *priv = (struct ez80emac_driver_s *)dev->d_private;
int ret = 0;
@@ -1628,7 +1628,7 @@ static void ez80emac_polltimer(int argc, uint32_t arg, ...)
*
****************************************************************************/
static int ez80emac_ifup(FAR struct uip_driver_s *dev)
static int ez80emac_ifup(FAR struct net_driver_s *dev)
{
FAR struct ez80emac_driver_s *priv = (FAR struct ez80emac_driver_s *)dev->d_private;
uint8_t regval;
@@ -1723,7 +1723,7 @@ static int ez80emac_ifup(FAR struct uip_driver_s *dev)
*
****************************************************************************/
static int ez80emac_ifdown(struct uip_driver_s *dev)
static int ez80emac_ifdown(struct net_driver_s *dev)
{
struct ez80emac_driver_s *priv = (struct ez80emac_driver_s *)dev->d_private;
irqstate_t flags;
@@ -1775,7 +1775,7 @@ static int ez80emac_ifdown(struct uip_driver_s *dev)
*
****************************************************************************/
static int ez80emac_txavail(struct uip_driver_s *dev)
static int ez80emac_txavail(struct net_driver_s *dev)
{
struct ez80emac_driver_s *priv = (struct ez80emac_driver_s *)dev->d_private;
irqstate_t flags;
@@ -1817,7 +1817,7 @@ static int ez80emac_txavail(struct uip_driver_s *dev)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int ez80emac_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
static int ez80emac_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct ez80emac_driver_s *priv = (FAR struct ez80emac_driver_s *)dev->d_private;
@@ -1847,7 +1847,7 @@ static int ez80emac_addmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static int ez80emac_rmmac(struct uip_driver_s *dev, FAR const uint8_t *mac)
static int ez80emac_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct ez80emac_driver_s *priv = (FAR struct ez80emac_driver_s *)dev->d_private;
@@ -2173,7 +2173,7 @@ errout:
****************************************************************************/
#ifdef CONFIG_ARCH_MCFILTER
int up_multicastfilter(FAR struct uip_driver_s *dev, FAR uint8_t *mac, bool enable)
int up_multicastfilter(FAR struct net_driver_s *dev, FAR uint8_t *mac, bool enable)
{
FAR struct ez80emac_driver_s *priv = (FAR struct ez80emac_driver_s *)dev->priv;
uint8_t regval;
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;
include/nuttx/net/arp.h
+3 -3
View File
@@ -134,7 +134,7 @@ void arp_init(void);
****************************************************************************/
#ifdef CONFIG_NET_ARP_IPIN
void arp_ipin(struct uip_driver_s *dev);
void arp_ipin(struct net_driver_s *dev);
#else
# define arp_ipin(dev)
#endif
@@ -152,7 +152,7 @@ void arp_ipin(struct uip_driver_s *dev);
*
****************************************************************************/
void arp_arpin(struct uip_driver_s *dev);
void arp_arpin(struct net_driver_s *dev);
/****************************************************************************
* Name: arp_arpin
@@ -171,7 +171,7 @@ void arp_arpin(struct uip_driver_s *dev);
*
****************************************************************************/
void arp_out(struct uip_driver_s *dev);
void arp_out(struct net_driver_s *dev);
/****************************************************************************
* Function: arp_timer_init
include/nuttx/net/cs89x0.h
+1 -1
View File
@@ -110,7 +110,7 @@ struct cs89x0_driver_s
/* This holds the information visible to uIP/NuttX */
struct uip_driver_s cs_dev; /* Interface understood by uIP */
struct net_driver_s cs_dev; /* Interface understood by uIP */
/* Driver statistics */
include/nuttx/net/igmp.h
+3 -3
View File
@@ -247,10 +247,10 @@ EXTERN uip_ipaddr_t g_allrouters;
*
****************************************************************************/
void igmp_devinit(FAR struct uip_driver_s *dev);
int igmp_joingroup(FAR struct uip_driver_s *dev,
void igmp_devinit(FAR struct net_driver_s *dev);
int igmp_joingroup(FAR struct net_driver_s *dev,
FAR const struct in_addr *grpaddr);
int igmp_leavegroup(FAR struct uip_driver_s *dev,
int igmp_leavegroup(FAR struct net_driver_s *dev,
FAR const struct in_addr *grpaddr);
#undef EXTERN
include/nuttx/net/net.h
+4 -4
View File
@@ -125,8 +125,8 @@ struct socketlist
/* Callback from netdev_foreach() */
struct uip_driver_s; /* Forward reference. Defined in nuttx/net/netdev.h */
typedef int (*netdev_callback_t)(FAR struct uip_driver_s *dev, void *arg);
struct net_driver_s; /* Forward reference. Defined in nuttx/net/netdev.h */
typedef int (*netdev_callback_t)(FAR struct net_driver_s *dev, void *arg);
/****************************************************************************
* Public Data
@@ -294,12 +294,12 @@ int net_vfcntl(int sockfd, int cmd, va_list ap);
* addresses
*/
int netdev_register(FAR struct uip_driver_s *dev);
int netdev_register(FAR struct net_driver_s *dev);
/* netdev-unregister.c *********************************************************/
/* Unregister a network device driver. */
int netdev_unregister(FAR struct uip_driver_s *dev);
int netdev_unregister(FAR struct net_driver_s *dev);
/* net_foreach.c ************************************************************/
/* Enumerates all registered network devices */
include/nuttx/net/netdev.h
+18 -18
View File
@@ -73,14 +73,14 @@
* of this structure.
*/
struct uip_driver_s
struct net_driver_s
{
/* This link is used to maintain a single-linked list of ethernet drivers.
* Must be the first field in the structure due to blink type casting.
*/
#if CONFIG_NSOCKET_DESCRIPTORS > 0
FAR struct uip_driver_s *flink;
FAR struct net_driver_s *flink;
/* This is the name of network device assigned when netdev_register was called.
* This name is only used to support socket ioctl lookups by device name
@@ -177,15 +177,15 @@ struct uip_driver_s
/* Driver callbacks */
int (*d_ifup)(struct uip_driver_s *dev);
int (*d_ifdown)(struct uip_driver_s *dev);
int (*d_txavail)(struct uip_driver_s *dev);
int (*d_ifup)(struct net_driver_s *dev);
int (*d_ifdown)(struct net_driver_s *dev);
int (*d_txavail)(struct net_driver_s *dev);
#ifdef CONFIG_NET_RXAVAIL
int (*d_rxavail)(struct uip_driver_s *dev);
int (*d_rxavail)(struct net_driver_s *dev);
#endif
#ifdef CONFIG_NET_IGMP
int (*d_addmac)(struct uip_driver_s *dev, FAR const uint8_t *mac);
int (*d_rmmac)(struct uip_driver_s *dev, FAR const uint8_t *mac);
int (*d_addmac)(struct net_driver_s *dev, FAR const uint8_t *mac);
int (*d_rmmac)(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
#ifdef CONFIG_NETDEV_PHY_IOCTL
int (*d_ioctl)(int cmd, struct mii_ioctl_data *req);
@@ -263,7 +263,7 @@ struct uip_driver_s
* }
*/
int uip_input(struct uip_driver_s *dev);
int uip_input(struct net_driver_s *dev);
/* Polling of connections
*
@@ -315,9 +315,9 @@ int uip_input(struct uip_driver_s *dev);
* }
*/
typedef int (*uip_poll_callback_t)(struct uip_driver_s *dev);
int uip_poll(struct uip_driver_s *dev, uip_poll_callback_t callback);
int uip_timer(struct uip_driver_s *dev, uip_poll_callback_t callback, int hsec);
typedef int (*uip_poll_callback_t)(struct net_driver_s *dev);
int uip_poll(struct net_driver_s *dev, uip_poll_callback_t callback);
int uip_timer(struct net_driver_s *dev, uip_poll_callback_t callback, int hsec);
/* Carrier detection
* Call netdev_carrier_on when the carrier has become available and the device
@@ -327,8 +327,8 @@ int uip_timer(struct uip_driver_s *dev, uip_poll_callback_t callback, int hsec);
* into non operational state.
*/
int netdev_carrier_on(FAR struct uip_driver_s *dev);
int netdev_carrier_off(FAR struct uip_driver_s *dev);
int netdev_carrier_on(FAR struct net_driver_s *dev);
int netdev_carrier_off(FAR struct net_driver_s *dev);
/* By defining UIP_ARCH_CHKSUM, the architecture can replace up_incr32
* with hardware assisted solutions.
@@ -375,7 +375,7 @@ uint16_t uip_chksum(uint16_t *buf, uint16_t len);
* buffer.
*/
uint16_t uip_ipchksum(struct uip_driver_s *dev);
uint16_t uip_ipchksum(struct net_driver_s *dev);
/* Calculate the TCP checksum of the packet in d_buf and d_appdata.
*
@@ -390,8 +390,8 @@ uint16_t uip_ipchksum(struct uip_driver_s *dev);
* to by d_appdata.
*/
uint16_t tcp_chksum(struct uip_driver_s *dev);
uint16_t udp_chksum(struct uip_driver_s *dev);
uint16_t icmp_chksum(struct uip_driver_s *dev, int len);
uint16_t tcp_chksum(struct net_driver_s *dev);
uint16_t udp_chksum(struct net_driver_s *dev);
uint16_t icmp_chksum(struct net_driver_s *dev, int len);
#endif /* __INCLUDE_NUTTX_NET_NETDEV_H */
include/nuttx/net/pkt.h
+2 -2
View File
@@ -98,7 +98,7 @@ FAR struct pkt_conn_s *pkt_alloc(void);
*/
void pkt_free(FAR struct pkt_conn_s *conn);
void pkt_poll(FAR struct uip_driver_s *dev, FAR struct pkt_conn_s *conn);
int pkt_input(FAR struct uip_driver_s *dev);
void pkt_poll(FAR struct net_driver_s *dev, FAR struct pkt_conn_s *conn);
int pkt_input(FAR struct net_driver_s *dev);
#endif /* __INCLUDE_NUTTX_NET_PKT_H */
include/nuttx/net/tcp.h
+1 -1
View File
@@ -161,7 +161,7 @@
* file pointers) for the connection.
*/
struct uip_driver_s; /* Forward reference */
struct net_driver_s; /* Forward reference */
struct uip_callback_s; /* Forward reference */
struct tcp_backlog_s; /* Forward reference */
include/nuttx/net/udp.h
+1 -1
View File
@@ -69,7 +69,7 @@
/* Representation of a uIP UDP connection */
struct uip_driver_s; /* Forward reference */
struct net_driver_s; /* Forward reference */
struct uip_callback_s; /* Forward reference */
struct udp_conn_s
{
include/nuttx/net/uip.h
+2 -2
View File
@@ -217,11 +217,11 @@ struct uip_ip_hdr
* are and are not handled by the callback.
*/
struct uip_driver_s; /* Forward reference */
struct net_driver_s; /* Forward reference */
struct uip_callback_s
{
FAR struct uip_callback_s *flink;
uint16_t (*event)(struct uip_driver_s *dev, void *pvconn, void *pvpriv, uint16_t flags);
uint16_t (*event)(struct net_driver_s *dev, void *pvconn, void *pvpriv, uint16_t flags);
void *priv;
uint16_t flags;
};
net/README.txt
+38 -38
View File
@@ -1,38 +1,38 @@
README
======
Directory Structure
===================
nuttx/
|
`- net/
|
+- arp - Address resolution protocol
+- devif - Stack/device interface layer
+- icmp - Internet Control Message Protocol
+- iob - I/O buffering logic
+- netdev - Socket network device interface
+- pkt - "Raw" packet socket support
+- socket - BSD socket interface
+- route - Routing table support
+- tcp - Transmission Control Protocol
+- udp - User Datagram Protocol
`- utils - Miscellaneous utility functions
+-------------------------------------------------------------+
| Application layer |
+-------------------------------------------------------------+
+-------------------------------------------------------------+
| Socket layer (socket/) |
+-------------------------------------------------------------+
+------------++-----------------------------------------------+
| Network || Protocol stacks (arp, icmp, pkt, tcp, udp) |
| Device |+-----------------------------------------------+
| Interface |+---------------------------------++------------+
| (netdev/) ||Network Device Interface (devif/)|| Utilities |
+------------++---------------------------------++------------+
+-------------------------------------------------------------+
| Network Device Drivers |
+-------------------------------------------------------------+
README
======
Directory Structure
===================
nuttx/
|
`- net/
|
+- arp - Address resolution protocol
+- devif - Stack/device interface layer
+- icmp - Internet Control Message Protocol
+- iob - I/O buffering logic
+- netdev - Socket network device interface
+- pkt - "Raw" packet socket support
+- socket - BSD socket interface
+- route - Routing table support
+- tcp - Transmission Control Protocol
+- udp - User Datagram Protocol
`- utils - Miscellaneous utility functions
+-------------------------------------------------------------+
| Application layer |
+-------------------------------------------------------------+
+-------------------------------------------------------------+
| Socket layer (socket/) |
+-------------------------------------------------------------+
+------------++-----------------------------------------------+
| Network || Protocol stacks (arp, icmp, pkt, tcp, udp) |
| Device |+-----------------------------------------------+
| Interface |+---------------------------------++------------+
| (netdev/) ||Network Device Interface (devif/)|| Utilities |
+------------++---------------------------------++------------+
+-------------------------------------------------------------+
| Network Device Drivers |
+-------------------------------------------------------------+
net/arp/arp_inout.c
+3 -3
View File
@@ -195,7 +195,7 @@ static void arp_dump(struct arp_hdr_s *arp)
*/
#ifdef CONFIG_NET_ARP_IPIN
void arp_ipin(struct uip_driver_s *dev)
void arp_ipin(struct net_driver_s *dev)
{
in_addr_t srcipaddr;
@@ -232,7 +232,7 @@ void arp_ipin(struct uip_driver_s *dev)
* variable d_len.
*/
void arp_arpin(struct uip_driver_s *dev)
void arp_arpin(struct net_driver_s *dev)
{
struct arp_hdr_s *parp = ARPBUF;
in_addr_t ipaddr;
@@ -321,7 +321,7 @@ void arp_arpin(struct uip_driver_s *dev)
* buffer, and the length of the packet is in the field d_len.
*/
void arp_out(struct uip_driver_s *dev)
void arp_out(struct net_driver_s *dev)
{
const struct arp_entry *tabptr = NULL;
struct arp_hdr_s *parp = ARPBUF;
net/connect.c
+2 -2
View File
@@ -80,7 +80,7 @@ static inline int psock_setup_callbacks(FAR struct socket *psock,
FAR struct tcp_connect_s *pstate);
static inline void psock_teardown_callbacks(FAR struct tcp_connect_s *pstate,
int status);
static uint16_t psock_connect_interrupt(FAR struct uip_driver_s *dev,
static uint16_t psock_connect_interrupt(FAR struct net_driver_s *dev,
FAR void *pvconn, FAR void *pvpriv,
uint16_t flags);
#ifdef CONFIG_NET_IPv6
@@ -181,7 +181,7 @@ static inline void psock_teardown_callbacks(FAR struct tcp_connect_s *pstate,
****************************************************************************/
#ifdef CONFIG_NET_TCP
static uint16_t psock_connect_interrupt(FAR struct uip_driver_s *dev,
static uint16_t psock_connect_interrupt(FAR struct net_driver_s *dev,
FAR void *pvconn, FAR void *pvpriv,
uint16_t flags)
{
net/getsockname.c
+1 -1
View File
@@ -100,7 +100,7 @@
int getsockname(int sockfd, FAR struct sockaddr *addr, FAR socklen_t *addrlen)
{
FAR struct socket *psock = sockfd_socket(sockfd);
FAR struct uip_driver_s *dev;
FAR struct net_driver_s *dev;
#if defined(CONFIG_NET_TCP) || defined(CONFIG_NET_UDP)
#ifdef CONFIG_NET_IPv6
net/icmp/icmp.h
+3 -3
View File
@@ -72,18 +72,18 @@ extern "C"
/* Defined in icmp_input.c **************************************************/
void icmp_input(FAR struct uip_driver_s *dev);
void icmp_input(FAR struct net_driver_s *dev);
/* Defined in icmp_poll.c ***************************************************/
#ifdef CONFIG_NET_ICMP_PING
void icmp_poll(FAR struct uip_driver_s *dev);
void icmp_poll(FAR struct net_driver_s *dev);
#endif /* CONFIG_NET_ICMP_PING */
/* Defined in icmp_send.c ***************************************************/
#ifdef CONFIG_NET_ICMP_PING
void icmp_send(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *destaddr);
void icmp_send(FAR struct net_driver_s *dev, FAR uip_ipaddr_t *destaddr);
#endif /* CONFIG_NET_ICMP_PING */
#undef EXTERN
net/icmp/icmp_input.c
+1 -1
View File
@@ -103,7 +103,7 @@ FAR struct uip_callback_s *g_echocallback = NULL;
*
****************************************************************************/
void icmp_input(FAR struct uip_driver_s *dev)
void icmp_input(FAR struct net_driver_s *dev)
{
FAR struct icmp_iphdr_s *picmp = ICMPBUF;
net/icmp/icmp_ping.c
+1 -1
View File
@@ -152,7 +152,7 @@ static inline int ping_timeout(FAR struct icmp_ping_s *pstate)
*
****************************************************************************/
static uint16_t ping_interrupt(FAR struct uip_driver_s *dev, FAR void *conn,
static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
FAR void *pvpriv, uint16_t flags)
{
FAR struct icmp_ping_s *pstate = (struct icmp_ping_s *)pvpriv;
net/icmp/icmp_poll.c
+1 -1
View File
@@ -86,7 +86,7 @@
*
****************************************************************************/
void icmp_poll(FAR struct uip_driver_s *dev)
void icmp_poll(FAR struct net_driver_s *dev)
{
/* Setup for the application callback */
net/icmp/icmp_send.c
+1 -1
View File
@@ -89,7 +89,7 @@
*
****************************************************************************/
void icmp_send(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *destaddr)
void icmp_send(FAR struct net_driver_s *dev, FAR uip_ipaddr_t *destaddr)
{
FAR struct icmp_iphdr_s *picmp = ICMPBUF;
net/igmp/igmp.h
+9 -9
View File
@@ -76,18 +76,18 @@ void igmp_initialize(void);
/* Defined in igmp_input.c **************************************************/
void igmp_input(struct uip_driver_s *dev);
void igmp_input(struct net_driver_s *dev);
/* Defined in igmp_group.c **************************************************/
void igmp_grpinit(void);
FAR struct igmp_group_s *igmp_grpalloc(FAR struct uip_driver_s *dev,
FAR struct igmp_group_s *igmp_grpalloc(FAR struct net_driver_s *dev,
FAR const uip_ipaddr_t *addr);
FAR struct igmp_group_s *igmp_grpfind(FAR struct uip_driver_s *dev,
FAR struct igmp_group_s *igmp_grpfind(FAR struct net_driver_s *dev,
FAR const uip_ipaddr_t *addr);
FAR struct igmp_group_s *igmp_grpallocfind(FAR struct uip_driver_s *dev,
FAR struct igmp_group_s *igmp_grpallocfind(FAR struct net_driver_s *dev,
FAR const uip_ipaddr_t *addr);
void igmp_grpfree(FAR struct uip_driver_s *dev,
void igmp_grpfree(FAR struct net_driver_s *dev,
FAR struct igmp_group_s *group);
/* Defined in igmp_msg.c ****************************************************/
@@ -97,11 +97,11 @@ void igmp_waitmsg(FAR struct igmp_group_s *group, uint8_t msgid);
/* Defined in igmp_poll.c ***************************************************/
void igmp_poll(FAR struct uip_driver_s *dev);
void igmp_poll(FAR struct net_driver_s *dev);
/* Defined in igmp_send.c ***************************************************/
void igmp_send(FAR struct uip_driver_s *dev, FAR struct igmp_group_s *group,
void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group,
FAR uip_ipaddr_t *dest);
/* Defined in igmp_timer.c **************************************************/
@@ -113,8 +113,8 @@ bool igmp_cmptimer(FAR struct igmp_group_s *group, int maxticks);
/* Defined in igmp_mcastmac *************************************************/
void igmp_addmcastmac(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *ip);
void igmp_removemcastmac(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *ip);
void igmp_addmcastmac(FAR struct net_driver_s *dev, FAR uip_ipaddr_t *ip);
void igmp_removemcastmac(FAR struct net_driver_s *dev, FAR uip_ipaddr_t *ip);
#undef EXTERN
#ifdef __cplusplus
net/igmp/igmp_group.c
+4 -4
View File
@@ -219,7 +219,7 @@ void igmp_grpinit(void)
*
****************************************************************************/
FAR struct igmp_group_s *igmp_grpalloc(FAR struct uip_driver_s *dev,
FAR struct igmp_group_s *igmp_grpalloc(FAR struct net_driver_s *dev,
FAR const uip_ipaddr_t *addr)
{
FAR struct igmp_group_s *group;
@@ -282,7 +282,7 @@ FAR struct igmp_group_s *igmp_grpalloc(FAR struct uip_driver_s *dev,
*
****************************************************************************/
FAR struct igmp_group_s *igmp_grpfind(FAR struct uip_driver_s *dev,
FAR struct igmp_group_s *igmp_grpfind(FAR struct net_driver_s *dev,
FAR const uip_ipaddr_t *addr)
{
FAR struct igmp_group_s *group;
@@ -323,7 +323,7 @@ FAR struct igmp_group_s *igmp_grpfind(FAR struct uip_driver_s *dev,
*
****************************************************************************/
FAR struct igmp_group_s *igmp_grpallocfind(FAR struct uip_driver_s *dev,
FAR struct igmp_group_s *igmp_grpallocfind(FAR struct net_driver_s *dev,
FAR const uip_ipaddr_t *addr)
{
FAR struct igmp_group_s *group = igmp_grpfind(dev, addr);
@@ -349,7 +349,7 @@ FAR struct igmp_group_s *igmp_grpallocfind(FAR struct uip_driver_s *dev,
*
****************************************************************************/
void igmp_grpfree(FAR struct uip_driver_s *dev, FAR struct igmp_group_s *group)
void igmp_grpfree(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group)
{
net_lock_t flags;
net/igmp/igmp_initialize.c
+1 -1
View File
@@ -103,7 +103,7 @@ void igmp_initialize(void)
*
****************************************************************************/
void igmp_devinit(struct uip_driver_s *dev)
void igmp_devinit(struct net_driver_s *dev)
{
nvdbg("IGMP initializing dev %p\n", dev);
DEBUGASSERT(dev->grplist.head == NULL);

Some files were not shown because too many files have changed in this diff Show More