Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 08:36:24 +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
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);
net/igmp/igmp_input.c
+1 -1
View File
@@ -113,7 +113,7 @@
*
****************************************************************************/
void igmp_input(struct uip_driver_s *dev)
void igmp_input(struct net_driver_s *dev)
{
FAR struct igmp_group_s *group;
uip_ipaddr_t destipaddr;
net/igmp/igmp_join.c
+1 -1
View File
@@ -122,7 +122,7 @@
*
****************************************************************************/
int igmp_joingroup(struct uip_driver_s *dev, FAR const struct in_addr *grpaddr)
int igmp_joingroup(struct net_driver_s *dev, FAR const struct in_addr *grpaddr)
{
struct igmp_group_s *group;
net/igmp/igmp_leave.c
+1 -1
View File
@@ -129,7 +129,7 @@
*
****************************************************************************/
int igmp_leavegroup(struct uip_driver_s *dev, FAR const struct in_addr *grpaddr)
int igmp_leavegroup(struct net_driver_s *dev, FAR const struct in_addr *grpaddr)
{
struct igmp_group_s *group;
net_lock_t flags;
net/igmp/igmp_mcastmac.c
+2 -2
View File
@@ -99,7 +99,7 @@ static void uip_mcastmac(uip_ipaddr_t *ip, FAR uint8_t *mac)
*
****************************************************************************/
void igmp_addmcastmac(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)
{
uint8_t mcastmac[6];
@@ -119,7 +119,7 @@ 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_removemcastmac(FAR struct net_driver_s *dev, FAR uip_ipaddr_t *ip)
{
uint8_t mcastmac[6];
net/igmp/igmp_poll.c
+2 -2
View File
@@ -79,7 +79,7 @@
*
****************************************************************************/
static inline void uip_schedsend(FAR struct uip_driver_s *dev, FAR struct igmp_group_s *group)
static inline void uip_schedsend(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group)
{
uip_ipaddr_t *dest;
@@ -142,7 +142,7 @@ static inline void uip_schedsend(FAR struct uip_driver_s *dev, FAR struct igmp_g
*
****************************************************************************/
void igmp_poll(FAR struct uip_driver_s *dev)
void igmp_poll(FAR struct net_driver_s *dev)
{
FAR struct igmp_group_s *group;
net/igmp/igmp_send.c
+1 -1
View File
@@ -120,7 +120,7 @@ static uint16_t igmp_chksum(FAR uint8_t *buffer, int buflen)
*
****************************************************************************/
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 *destipaddr)
{
nllvdbg("msgid: %02x destipaddr: %08x\n", group->msgid, (int)*destipaddr);
net/net_close.c
+1 -1
View File
@@ -153,7 +153,7 @@ static inline int close_timeout(FAR struct tcp_close_s *pstate)
****************************************************************************/
#ifdef CONFIG_NET_TCP
static uint16_t netclose_interrupt(FAR struct uip_driver_s *dev,
static uint16_t netclose_interrupt(FAR struct net_driver_s *dev,
FAR void *pvconn, FAR void *pvpriv,
uint16_t flags)
{
net/net_poll.c
+1 -1
View File
@@ -113,7 +113,7 @@ struct net_poll_s
****************************************************************************/
#ifdef HAVE_NETPOLL
static uint16_t poll_interrupt(FAR struct uip_driver_s *dev, FAR void *conn,
static uint16_t poll_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
FAR void *pvpriv, uint16_t flags)
{
FAR struct net_poll_s *info = (FAR struct net_poll_s *)pvpriv;
net/net_sendfile.c
+2 -2
View File
@@ -144,7 +144,7 @@ static inline int sendfile_timeout(FAR struct sendfile_s *pstate)
}
#endif /* CONFIG_NET_SOCKOPTS && !CONFIG_DISABLE_CLOCK */
static uint16_t ack_interrupt(FAR struct uip_driver_s *dev, FAR void *pvconn,
static uint16_t ack_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn,
FAR void *pvpriv, uint16_t flags)
{
FAR struct sendfile_s *pstate = (FAR struct sendfile_s *)pvpriv;
@@ -223,7 +223,7 @@ static uint16_t ack_interrupt(FAR struct uip_driver_s *dev, FAR void *pvconn,
*
****************************************************************************/
static uint16_t sendfile_interrupt(FAR struct uip_driver_s *dev, FAR void *pvconn,
static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn,
FAR void *pvpriv, uint16_t flags)
{
FAR struct tcp_conn_s *conn = (FAR struct tcp_conn_s*)pvconn;
net/netdev/netdev.h
+3 -3
View File
@@ -70,7 +70,7 @@ extern "C"
/* List of registered Ethernet device drivers */
#if CONFIG_NSOCKET_DESCRIPTORS > 0
EXTERN struct uip_driver_s *g_netdevices;
EXTERN struct net_driver_s *g_netdevices;
#endif
/****************************************************************************
@@ -88,13 +88,13 @@ void netdev_semgive(void);
/* netdev_findbyname.c *******************************************************/
#if CONFIG_NSOCKET_DESCRIPTORS > 0
FAR struct uip_driver_s *netdev_findbyname(FAR const char *ifname);
FAR struct net_driver_s *netdev_findbyname(FAR const char *ifname);
#endif
/* netdev_findbyaddr.c *******************************************************/
#if CONFIG_NSOCKET_DESCRIPTORS > 0
FAR struct uip_driver_s *netdev_findbyaddr(const uip_ipaddr_t addr);
FAR struct net_driver_s *netdev_findbyaddr(const uip_ipaddr_t addr);
#endif
/* netdev_txnotify.c *********************************************************/
net/netdev/netdev_carrier.c
+2 -2
View File
@@ -94,7 +94,7 @@
*
****************************************************************************/
int netdev_carrier_on(FAR struct uip_driver_s *dev)
int netdev_carrier_on(FAR struct net_driver_s *dev)
{
if (dev)
{
@@ -120,7 +120,7 @@ int netdev_carrier_on(FAR struct uip_driver_s *dev)
*
****************************************************************************/
int netdev_carrier_off(FAR struct uip_driver_s *dev)
int netdev_carrier_off(FAR struct net_driver_s *dev)
{
if (dev)
{
net/netdev/netdev_count.c
+1 -1
View File
@@ -91,7 +91,7 @@
int netdev_count(void)
{
struct uip_driver_s *dev;
struct net_driver_s *dev;
int ndev;
netdev_semtake();
net/netdev/netdev_findbyaddr.c
+4 -4
View File
@@ -94,9 +94,9 @@
*
****************************************************************************/
static FAR struct uip_driver_s *netdev_finddevice(const uip_ipaddr_t addr)
static FAR struct net_driver_s *netdev_finddevice(const uip_ipaddr_t addr)
{
struct uip_driver_s *dev;
struct net_driver_s *dev;
/* Examine each registered network device */
@@ -147,9 +147,9 @@ static FAR struct uip_driver_s *netdev_finddevice(const uip_ipaddr_t addr)
*
****************************************************************************/
FAR struct uip_driver_s *netdev_findbyaddr(const uip_ipaddr_t addr)
FAR struct net_driver_s *netdev_findbyaddr(const uip_ipaddr_t addr)
{
struct uip_driver_s *dev;
struct net_driver_s *dev;
#ifdef CONFIG_NET_ROUTE
uip_ipaddr_t router;
int ret;
net/netdev/netdev_findbyname.c
+2 -2
View File
@@ -90,9 +90,9 @@
*
****************************************************************************/
FAR struct uip_driver_s *netdev_findbyname(const char *ifname)
FAR struct net_driver_s *netdev_findbyname(const char *ifname)
{
struct uip_driver_s *dev;
struct net_driver_s *dev;
if (ifname)
{
netdev_semtake();
net/netdev/netdev_foreach.c
+1 -1
View File
@@ -93,7 +93,7 @@
int netdev_foreach(netdev_callback_t callback, void *arg)
{
struct uip_driver_s *dev;
struct net_driver_s *dev;
int ret = 0;
if (callback)
net/netdev/netdev_ioctl.c
+6 -6
View File
@@ -143,7 +143,7 @@ static void ioctl_setipaddr(FAR uip_ipaddr_t *outaddr, FAR const void *inaddr)
*
****************************************************************************/
static void ioctl_ifup(FAR struct uip_driver_s *dev)
static void ioctl_ifup(FAR struct net_driver_s *dev)
{
/* Make sure that the device supports the d_ifup() method */
@@ -165,7 +165,7 @@ static void ioctl_ifup(FAR struct uip_driver_s *dev)
}
}
static void ioctl_ifdown(FAR struct uip_driver_s *dev)
static void ioctl_ifdown(FAR struct net_driver_s *dev)
{
/* Make sure that the device supports the d_ifdown() method */
@@ -201,7 +201,7 @@ static void ioctl_ifdown(FAR struct uip_driver_s *dev)
*
****************************************************************************/
static FAR struct uip_driver_s *netdev_ifrdev(FAR struct ifreq *req)
static FAR struct net_driver_s *netdev_ifrdev(FAR struct ifreq *req)
{
if (!req)
{
@@ -236,7 +236,7 @@ static FAR struct uip_driver_s *netdev_ifrdev(FAR struct ifreq *req)
static int netdev_ifrioctl(FAR struct socket *psock, int cmd,
FAR struct ifreq *req)
{
FAR struct uip_driver_s *dev;
FAR struct net_driver_s *dev;
int ret = -EINVAL;
nvdbg("cmd: %d\n", cmd);
@@ -463,7 +463,7 @@ static int netdev_ifrioctl(FAR struct socket *psock, int cmd,
****************************************************************************/
#ifdef CONFIG_NET_IGMP
static FAR struct uip_driver_s *netdev_imsfdev(FAR struct ip_msfilter *imsf)
static FAR struct net_driver_s *netdev_imsfdev(FAR struct ip_msfilter *imsf)
{
if (!imsf)
{
@@ -500,7 +500,7 @@ static FAR struct uip_driver_s *netdev_imsfdev(FAR struct ip_msfilter *imsf)
static int netdev_imsfioctl(FAR struct socket *psock, int cmd,
FAR struct ip_msfilter *imsf)
{
FAR struct uip_driver_s *dev;
FAR struct net_driver_s *dev;
int ret = -EINVAL;
nvdbg("cmd: %d\n", cmd);
net/netdev/netdev_register.c
+2 -2
View File
@@ -81,7 +81,7 @@ static int g_next_devnum = 0;
/* List of registered ethernet device drivers */
struct uip_driver_s *g_netdevices = NULL;
struct net_driver_s *g_netdevices = NULL;
/****************************************************************************
* Private Functions
@@ -109,7 +109,7 @@ struct uip_driver_s *g_netdevices = NULL;
*
****************************************************************************/
int netdev_register(FAR struct uip_driver_s *dev)
int netdev_register(FAR struct net_driver_s *dev)
{
if (dev)
{
net/netdev/netdev_rxnotify.c
+1 -1
View File
@@ -96,7 +96,7 @@ void netdev_rxnotify(const uip_ipaddr_t raddr)
/* Find the device driver that serves the subnet of the remote address */
struct uip_driver_s *dev = netdev_findbyaddr(raddr);
struct net_driver_s *dev = netdev_findbyaddr(raddr);
if (dev && dev->d_rxavail)
{
net/netdev/netdev_txnotify.c
+1 -1
View File
@@ -95,7 +95,7 @@ void netdev_txnotify(const uip_ipaddr_t raddr)
{
/* Find the device driver that serves the subnet of the remote address */
struct uip_driver_s *dev = netdev_findbyaddr(raddr);
struct net_driver_s *dev = netdev_findbyaddr(raddr);
if (dev && dev->d_txavail)
{
net/netdev/netdev_unregister.c
+3 -3
View File
@@ -103,10 +103,10 @@
*
****************************************************************************/
int netdev_unregister(FAR struct uip_driver_s *dev)
int netdev_unregister(FAR struct net_driver_s *dev)
{
struct uip_driver_s *prev;
struct uip_driver_s *curr;
struct net_driver_s *prev;
struct net_driver_s *curr;
if (dev)
{
net/pkt/pkt.h
+2 -2
View File
@@ -83,14 +83,14 @@ struct pkt_conn_s *uip_nextpktconn(FAR struct pkt_conn_s *conn);
/* Defined in pkt_callback.c ************************************************/
uint16_t pkt_callback(FAR struct uip_driver_s *dev,
uint16_t pkt_callback(FAR struct net_driver_s *dev,
FAR struct pkt_conn_s *conn, uint16_t flags);
/* Defined in pkt_input.c ***************************************************/
/* Defined in pkt_poll.c ****************************************************/
void pkt_poll(FAR struct uip_driver_s *dev, FAR struct pkt_conn_s *conn);
void pkt_poll(FAR struct net_driver_s *dev, FAR struct pkt_conn_s *conn);
/****************************************************************************
* Function: psock_pkt_send
net/pkt/pkt_callback.c
+1 -1
View File
@@ -77,7 +77,7 @@
*
****************************************************************************/
uint16_t pkt_callback(FAR struct uip_driver_s *dev,
uint16_t pkt_callback(FAR struct net_driver_s *dev,
FAR struct pkt_conn_s *conn, uint16_t flags)
{
nllvdbg("flags: %04x\n", flags);
net/pkt/pkt_input.c
+1 -1
View File
@@ -97,7 +97,7 @@
*
****************************************************************************/
int pkt_input(struct uip_driver_s *dev)
int pkt_input(struct net_driver_s *dev)
{
FAR struct pkt_conn_s *conn;
FAR struct eth_hdr_s *pbuf = (struct eth_hdr_s *)dev->d_buf;
net/pkt/pkt_poll.c
+1 -1
View File
@@ -94,7 +94,7 @@
*
****************************************************************************/
void pkt_poll(FAR struct uip_driver_s *dev, FAR struct pkt_conn_s *conn)
void pkt_poll(FAR struct net_driver_s *dev, FAR struct pkt_conn_s *conn)
{
nlldbg("IN\n");
net/pkt/pkt_send.c
+2 -2
View File
@@ -90,7 +90,7 @@ struct send_s
* Function: psock_send_interrupt
****************************************************************************/
static uint16_t psock_send_interrupt(FAR struct uip_driver_s *dev,
static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
FAR void *pvconn,
FAR void *pvpriv, uint16_t flags)
{
@@ -246,7 +246,7 @@ ssize_t psock_pkt_send(FAR struct socket *psock, FAR const void *buf,
state.snd_cb = pkt_callbackalloc(conn);
if (state.snd_cb)
{
FAR struct uip_driver_s *dev;
FAR struct net_driver_s *dev;
/* Set up the callback in the connection */
net/recvfrom.c
+10 -10
View File
@@ -122,7 +122,7 @@ struct recvfrom_s
****************************************************************************/
#if defined(CONFIG_NET_UDP) || defined(CONFIG_NET_TCP)
static size_t recvfrom_newdata(FAR struct uip_driver_s *dev,
static size_t recvfrom_newdata(FAR struct net_driver_s *dev,
FAR struct recvfrom_s *pstate)
{
size_t recvlen;
@@ -172,7 +172,7 @@ static size_t recvfrom_newdata(FAR struct uip_driver_s *dev,
****************************************************************************/
#ifdef CONFIG_NET_PKT
static void recvfrom_newpktdata(FAR struct uip_driver_s *dev,
static void recvfrom_newpktdata(FAR struct net_driver_s *dev,
FAR struct recvfrom_s *pstate)
{
size_t recvlen;
@@ -218,7 +218,7 @@ static void recvfrom_newpktdata(FAR struct uip_driver_s *dev,
****************************************************************************/
#ifdef CONFIG_NET_TCP
static inline void recvfrom_newtcpdata(FAR struct uip_driver_s *dev,
static inline void recvfrom_newtcpdata(FAR struct net_driver_s *dev,
FAR struct recvfrom_s *pstate)
{
/* Take as much data from the packet as we can */
@@ -290,7 +290,7 @@ static inline void recvfrom_newtcpdata(FAR struct uip_driver_s *dev,
****************************************************************************/
#ifdef CONFIG_NET_UDP
static inline void recvfrom_newudpdata(FAR struct uip_driver_s *dev,
static inline void recvfrom_newudpdata(FAR struct net_driver_s *dev,
FAR struct recvfrom_s *pstate)
{
/* Take as much data from the packet as we can */
@@ -472,7 +472,7 @@ static int recvfrom_timeout(struct recvfrom_s *pstate)
****************************************************************************/
#ifdef CONFIG_NET_PKT
static inline void recvfrom_pktsender(FAR struct uip_driver_s *dev,
static inline void recvfrom_pktsender(FAR struct net_driver_s *dev,
FAR struct recvfrom_s *pstate)
{
}
@@ -492,7 +492,7 @@ static inline void recvfrom_pktsender(FAR struct uip_driver_s *dev,
****************************************************************************/
#ifdef CONFIG_NET_PKT
static uint16_t recvfrom_pktinterrupt(FAR struct uip_driver_s *dev,
static uint16_t recvfrom_pktinterrupt(FAR struct net_driver_s *dev,
FAR void *conn, FAR void *pvpriv,
uint16_t flags)
{
@@ -560,7 +560,7 @@ static uint16_t recvfrom_pktinterrupt(FAR struct uip_driver_s *dev,
****************************************************************************/
#ifdef CONFIG_NET_TCP
static inline void recvfrom_tcpsender(FAR struct uip_driver_s *dev,
static inline void recvfrom_tcpsender(FAR struct net_driver_s *dev,
FAR struct recvfrom_s *pstate)
{
#ifdef CONFIG_NET_IPv6
@@ -604,7 +604,7 @@ static inline void recvfrom_tcpsender(FAR struct uip_driver_s *dev,
****************************************************************************/
#ifdef CONFIG_NET_TCP
static uint16_t recvfrom_tcpinterrupt(FAR struct uip_driver_s *dev,
static uint16_t recvfrom_tcpinterrupt(FAR struct net_driver_s *dev,
FAR void *conn, FAR void *pvpriv,
uint16_t flags)
{
@@ -807,7 +807,7 @@ static uint16_t recvfrom_tcpinterrupt(FAR struct uip_driver_s *dev,
****************************************************************************/
#ifdef CONFIG_NET_UDP
static inline void recvfrom_udpsender(struct uip_driver_s *dev, struct recvfrom_s *pstate)
static inline void recvfrom_udpsender(struct net_driver_s *dev, struct recvfrom_s *pstate)
{
#ifdef CONFIG_NET_IPv6
FAR struct sockaddr_in6 *infrom = pstate->rf_from;
@@ -850,7 +850,7 @@ static inline void recvfrom_udpsender(struct uip_driver_s *dev, struct recvfrom_
****************************************************************************/
#ifdef CONFIG_NET_UDP
static uint16_t recvfrom_udpinterrupt(struct uip_driver_s *dev, void *pvconn,
static uint16_t recvfrom_udpinterrupt(struct net_driver_s *dev, void *pvconn,
void *pvpriv, uint16_t flags)
{
struct recvfrom_s *pstate = (struct recvfrom_s *)pvpriv;
net/route/netdev_router.c
+4 -4
View File
@@ -57,7 +57,7 @@
struct route_devmatch_s
{
FAR struct uip_driver_s *dev; /* The route must use this device */
FAR struct net_driver_s *dev; /* The route must use this device */
uip_ipaddr_t target; /* The target IP address on an external network to match */
uip_ipaddr_t router; /* The IP address of the router on one of our networks*/
};
@@ -84,7 +84,7 @@ struct route_devmatch_s
static int net_devmatch(FAR struct net_route_s *route, FAR void *arg)
{
FAR struct route_devmatch_s *match = (FAR struct route_devmatch_s *)arg;
FAR struct uip_driver_s *dev = match->dev;
FAR struct net_driver_s *dev = match->dev;
/* To match, (1) the masked target addresses must be the same, and (2) the
* router address must like on the network provided by the device.
@@ -133,10 +133,10 @@ static int net_devmatch(FAR struct net_route_s *route, FAR void *arg)
****************************************************************************/
#ifdef CONFIG_NET_IPv6
void netdev_router(FAR struct uip_driver_s *dev, uip_ipaddr_t target,
void netdev_router(FAR struct net_driver_s *dev, uip_ipaddr_t target,
uip_ipaddr_t router)
#else
void netdev_router(FAR struct uip_driver_s *dev, uip_ipaddr_t target,
void netdev_router(FAR struct net_driver_s *dev, uip_ipaddr_t target,
FAR uip_ipaddr_t *router)
#endif
{
net/route/route.h
+3 -3
View File
@@ -229,13 +229,13 @@ int net_router(uip_ipaddr_t target, FAR uip_ipaddr_t *router);
*
****************************************************************************/
struct uip_driver_s;
struct net_driver_s;
#ifdef CONFIG_NET_IPv6
void netdev_router(FAR struct uip_driver_s *dev, uip_ipaddr_t target,
void netdev_router(FAR struct net_driver_s *dev, uip_ipaddr_t target,
uip_ipaddr_t router);
#else
void netdev_router(FAR struct uip_driver_s *dev, uip_ipaddr_t target,
void netdev_router(FAR struct net_driver_s *dev, uip_ipaddr_t target,
FAR uip_ipaddr_t *router);
#endif
net/sendto.c
+1 -1
View File
@@ -163,7 +163,7 @@ static inline int send_timeout(FAR struct sendto_s *pstate)
****************************************************************************/
#ifdef CONFIG_NET_UDP
static uint16_t sendto_interrupt(struct uip_driver_s *dev, void *conn,
static uint16_t sendto_interrupt(struct net_driver_s *dev, void *conn,
void *pvpriv, uint16_t flags)
{
FAR struct sendto_s *pstate = (FAR struct sendto_s *)pvpriv;
net/tcp/tcp.h
+10 -10
View File
@@ -90,42 +90,42 @@ void tcp_nextsequence(void);
/* Defined in tcp_poll.c ****************************************************/
void tcp_poll(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn);
void tcp_poll(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn);
/* Defined in tcp_timer.c ***************************************************/
void tcp_timer(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
void tcp_timer(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
int hsec);
/* Defined in tcp_listen.c **************************************************/
void tcp_listeninit(void);
bool tcp_islistener(uint16_t port);
int tcp_accept_connection(FAR struct uip_driver_s *dev,
int tcp_accept_connection(FAR struct net_driver_s *dev,
FAR struct tcp_conn_s *conn, uint16_t portno);
/* Defined in tcp_send.c ****************************************************/
void tcp_send(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
void tcp_send(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
uint16_t flags, uint16_t len);
void tcp_reset(FAR struct uip_driver_s *dev);
void tcp_ack(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
void tcp_reset(FAR struct net_driver_s *dev);
void tcp_ack(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
uint8_t ack);
/* Defined in tcp_appsend.c *************************************************/
void tcp_appsend(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
void tcp_appsend(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
uint16_t result);
void tcp_rexmit(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
void tcp_rexmit(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
uint16_t result);
/* Defined in tcp_input.c ***************************************************/
void tcp_input(FAR struct uip_driver_s *dev);
void tcp_input(FAR struct net_driver_s *dev);
/* Defined in tcp_callback.c ************************************************/
uint16_t tcp_callback(FAR struct uip_driver_s *dev,
uint16_t tcp_callback(FAR struct net_driver_s *dev,
FAR struct tcp_conn_s *conn, uint16_t flags);
#ifdef CONFIG_NET_TCP_READAHEAD
uint16_t tcp_datahandler(FAR struct tcp_conn_s *conn,
net/tcp/tcp_appsend.c
+2 -2
View File
@@ -97,7 +97,7 @@
*
****************************************************************************/
void tcp_appsend(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
void tcp_appsend(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
uint16_t result)
{
/* Handle the result based on the application response */
@@ -183,7 +183,7 @@ void tcp_appsend(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
*
****************************************************************************/
void tcp_rexmit(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
void tcp_rexmit(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
uint16_t result)
{
nllvdbg("result: %04x d_sndlen: %d conn->unacked: %d\n",
net/tcp/tcp_callback.c
+2 -2
View File
@@ -77,7 +77,7 @@
****************************************************************************/
static inline uint16_t
uip_dataevent(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
uip_dataevent(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
uint16_t flags)
{
uint16_t ret;
@@ -148,7 +148,7 @@ uip_dataevent(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
*
****************************************************************************/
uint16_t tcp_callback(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
uint16_t tcp_callback(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
uint16_t flags)
{
/* Preserve the UIP_ACKDATA, UIP_CLOSE, and UIP_ABORT in the response.
net/tcp/tcp_input.c
+1 -1
View File
@@ -98,7 +98,7 @@
*
****************************************************************************/
void tcp_input(struct uip_driver_s *dev)
void tcp_input(struct net_driver_s *dev)
{
struct tcp_conn_s *conn = NULL;
struct tcp_iphdr_s *pbuf = BUF;
net/tcp/tcp_listen.c
+1 -1
View File
@@ -247,7 +247,7 @@ bool tcp_islistener(uint16_t portno)
*
****************************************************************************/
int tcp_accept_connection(FAR struct uip_driver_s *dev,
int tcp_accept_connection(FAR struct net_driver_s *dev,
FAR struct tcp_conn_s *conn, uint16_t portno)
{
FAR struct tcp_conn_s *listener;
net/tcp/tcp_poll.c
+1 -1
View File
@@ -94,7 +94,7 @@
*
****************************************************************************/
void tcp_poll(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn)
void tcp_poll(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn)
{
uint8_t result;
net/tcp/tcp_send.c
+5 -5
View File
@@ -91,7 +91,7 @@
*
****************************************************************************/
static void tcp_sendcomplete(FAR struct uip_driver_s *dev)
static void tcp_sendcomplete(FAR struct net_driver_s *dev)
{
FAR struct tcp_iphdr_s *pbuf = BUF;
@@ -172,7 +172,7 @@ static void tcp_sendcomplete(FAR struct uip_driver_s *dev)
*
****************************************************************************/
static void tcp_sendcommon(FAR struct uip_driver_s *dev,
static void tcp_sendcommon(FAR struct net_driver_s *dev,
FAR struct tcp_conn_s *conn)
{
FAR struct tcp_iphdr_s *pbuf = BUF;
@@ -233,7 +233,7 @@ static void tcp_sendcommon(FAR struct uip_driver_s *dev,
*
****************************************************************************/
void tcp_send(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
void tcp_send(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
uint16_t flags, uint16_t len)
{
FAR struct tcp_iphdr_s *pbuf = BUF;
@@ -261,7 +261,7 @@ void tcp_send(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
*
****************************************************************************/
void tcp_reset(FAR struct uip_driver_s *dev)
void tcp_reset(FAR struct net_driver_s *dev)
{
FAR struct tcp_iphdr_s *pbuf = BUF;
uint16_t tmp16;
@@ -344,7 +344,7 @@ void tcp_reset(FAR struct uip_driver_s *dev)
*
****************************************************************************/
void tcp_ack(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
void tcp_ack(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
uint8_t ack)
{
struct tcp_iphdr_s *pbuf = BUF;
net/tcp/tcp_send_buffered.c
+1 -1
View File
@@ -213,7 +213,7 @@ static inline void psock_lost_connection(FAR struct socket *psock,
*
****************************************************************************/
static uint16_t psock_send_interrupt(FAR struct uip_driver_s *dev,
static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
FAR void *pvconn, FAR void *pvpriv,
uint16_t flags)
{
net/tcp/tcp_send_unbuffered.c
+1 -1
View File
@@ -162,7 +162,7 @@ static inline int send_timeout(FAR struct send_s *pstate)
*
****************************************************************************/
static uint16_t tcpsend_interrupt(FAR struct uip_driver_s *dev,
static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev,
FAR void *pvconn,
FAR void *pvpriv, uint16_t flags)
{

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