Skip to content

Commit

Permalink
Rename uip_driver_s net_driver_s
Browse files Browse the repository at this point in the history
  • Loading branch information
@gregory-nutt
gregory-nutt committed Jun 27, 2014
1 parent 2f27c1e commit fce2a79
Show file tree
Hide file tree
Showing 103 changed files with 565 additions and 564 deletions.
Binary file modified Documentation/NuttX.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Documentation/NuttX2-b.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Documentation/NuttX2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Documentation/NuttX320.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Documentation/NuttXScreenShot.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions Documentation/NuttxPortingGuide.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2926,13 +2926,13 @@ <h3><a name="ethdrivers">6.3.1 Ethernet Device Drivers</a></h3>
<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>
Expand Down
86 changes: 43 additions & 43 deletions Documentation/acronyms.txt
View file
Original file line number Diff line number Diff line change
@@ -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


32 changes: 16 additions & 16 deletions arch/arm/src/c5471/c5471_ethernet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
};

/****************************************************************************
Expand Down Expand Up @@ -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 */

Expand All @@ -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 */
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down
26 changes: 13 additions & 13 deletions arch/arm/src/kinetis/kinetis_enet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down Expand Up @@ -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 */

Expand All @@ -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 */
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down
26 changes: 13 additions & 13 deletions arch/arm/src/lpc17xx/lpc17_ethernet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
};

/****************************************************************************
Expand Down Expand Up @@ -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 */

Expand All @@ -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 */
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down
Loading

0 comments on commit fce2a79

Please sign in to comment.