From 8e706eb4ffaeaf16b80c474b10ae2efabd687d9e Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 28 Jun 2014 18:36:09 -0600 Subject: [PATCH] Rename many functions in net/devif from uip_* to devif_* --- include/nuttx/net/pkt.h | 5 ----- include/nuttx/net/tcp.h | 5 ----- include/nuttx/net/udp.h | 5 ----- net/devif/devif.h | 30 +++++++++++++++--------------- net/devif/devif_callback.c | 20 ++++++++++---------- net/devif/devif_initialize.c | 2 +- net/devif/devif_iobsend.c | 10 +++++----- net/devif/devif_pktsend.c | 8 ++++---- net/devif/devif_send.c | 4 ++-- net/icmp/icmp_input.c | 4 ++-- net/icmp/icmp_ping.c | 8 ++++---- net/icmp/icmp_poll.c | 2 +- net/pkt/pkt.h | 5 +++++ net/pkt/pkt_callback.c | 2 +- net/pkt/pkt_poll.c | 2 +- net/pkt/pkt_send.c | 6 +++--- net/socket/connect.c | 4 ++-- net/socket/net_close.c | 7 ++++--- net/socket/net_poll.c | 5 +++-- net/socket/net_sendfile.c | 8 ++++---- net/socket/recvfrom.c | 12 ++++++------ net/socket/sendto.c | 6 +++--- net/tcp/tcp.h | 5 +++++ net/tcp/tcp_callback.c | 2 +- net/tcp/tcp_conn.c | 2 +- net/tcp/tcp_send_buffered.c | 4 ++-- net/tcp/tcp_send_unbuffered.c | 6 +++--- net/udp/udp.h | 5 +++++ net/udp/udp_callback.c | 2 +- 29 files changed, 94 insertions(+), 92 deletions(-) diff --git a/include/nuttx/net/pkt.h b/include/nuttx/net/pkt.h index 843a756e6b4..ea66fa3ff9e 100644 --- a/include/nuttx/net/pkt.h +++ b/include/nuttx/net/pkt.h @@ -88,11 +88,6 @@ struct pkt_conn_s FAR struct pkt_conn_s *pkt_alloc(void); -/* Allocate a new packet socket data callback */ - -#define pkt_callbackalloc(conn) uip_callbackalloc(&conn->list) -#define pkt_callbackfree(conn,cb) uip_callbackfree(cb, &conn->list) - /* Free a connection structure that is no longer in use. This should * be done by the implementation of close() */ diff --git a/include/nuttx/net/tcp.h b/include/nuttx/net/tcp.h index 635f67ce115..d32a231f282 100644 --- a/include/nuttx/net/tcp.h +++ b/include/nuttx/net/tcp.h @@ -397,11 +397,6 @@ struct tcp_iphdr_s struct tcp_conn_s *tcp_alloc(void); -/* Allocate a new TCP data callback */ - -#define tcp_callbackalloc(conn) uip_callbackalloc(&conn->list) -#define tcp_callbackfree(conn,cb) uip_callbackfree(cb, &conn->list) - /* Free a connection structure that is no longer in use. This should * be done by the implementation of close() */ diff --git a/include/nuttx/net/udp.h b/include/nuttx/net/udp.h index 33f68130c9b..7daf78681ee 100644 --- a/include/nuttx/net/udp.h +++ b/include/nuttx/net/udp.h @@ -161,11 +161,6 @@ struct udp_stats_s FAR struct udp_conn_s *udp_alloc(void); -/* Allocate a new TCP data callback */ - -#define udp_callbackalloc(conn) uip_callbackalloc(&conn->list) -#define udp_callbackfree(conn,cb) uip_callbackfree(cb, &conn->list) - /* Free a connection structure that is no longer in use. This should * be done by the implementation of close() */ diff --git a/net/devif/devif.h b/net/devif/devif.h index c723f7023b9..5fcd846a246 100644 --- a/net/devif/devif.h +++ b/net/devif/devif.h @@ -114,7 +114,7 @@ extern "C" void devif_initialize(void); /**************************************************************************** - * Function: uip_callbackinit + * Function: devif_callback_init * * Description: * Configure the pre-allocated callback structures into a free list. @@ -126,10 +126,10 @@ void devif_initialize(void); * ****************************************************************************/ -void uip_callbackinit(void); +void devif_callback_init(void); /**************************************************************************** - * Function: uip_callbackalloc + * Function: devif_callback_alloc * * Description: * Allocate a callback container from the free list. @@ -141,10 +141,10 @@ void uip_callbackinit(void); * ****************************************************************************/ -FAR struct uip_callback_s *uip_callbackalloc(FAR struct uip_callback_s **list); +FAR struct uip_callback_s *devif_callback_alloc(FAR struct uip_callback_s **list); /**************************************************************************** - * Function: uip_callbackfree + * Function: devif_callback_free * * Description: * Return a callback container to the free list. @@ -156,11 +156,11 @@ FAR struct uip_callback_s *uip_callbackalloc(FAR struct uip_callback_s **list); * ****************************************************************************/ -void uip_callbackfree(FAR struct uip_callback_s *cb, - FAR struct uip_callback_s **list); +void devif_callback_free(FAR struct uip_callback_s *cb, + FAR struct uip_callback_s **list); /**************************************************************************** - * Function: uip_callbackexecute + * Function: devif_callback_execute * * Description: * Execute a list of callbacks. @@ -172,8 +172,8 @@ void uip_callbackfree(FAR struct uip_callback_s *cb, * ****************************************************************************/ -uint16_t uip_callbackexecute(FAR struct net_driver_s *dev, FAR void *pvconn, - uint16_t flags, FAR struct uip_callback_s *list); +uint16_t devif_callback_execute(FAR struct net_driver_s *dev, FAR void *pvconn, + uint16_t flags, FAR struct uip_callback_s *list); /**************************************************************************** * Send data on the current connection. @@ -199,17 +199,17 @@ uint16_t uip_callbackexecute(FAR struct net_driver_s *dev, FAR void *pvconn, * ****************************************************************************/ -void uip_send(FAR struct net_driver_s *dev, FAR const void *buf, int len); +void devif_send(FAR struct net_driver_s *dev, FAR const void *buf, int len); #ifdef CONFIG_NET_IOB struct iob_s; -void uip_iobsend(FAR struct net_driver_s *dev, FAR struct iob_s *buf, - unsigned int len, unsigned int offset); +void devif_iob_send(FAR struct net_driver_s *dev, FAR struct iob_s *buf, + unsigned int len, unsigned int offset); #endif #ifdef CONFIG_NET_PKT -void uip_pktsend(FAR struct net_driver_s *dev, FAR const void *buf, - unsigned int len); +void devif_pkt_send(FAR struct net_driver_s *dev, FAR const void *buf, + unsigned int len); #endif #undef EXTERN diff --git a/net/devif/devif_callback.c b/net/devif/devif_callback.c index aad9c4f0aad..2cd6d1e585d 100644 --- a/net/devif/devif_callback.c +++ b/net/devif/devif_callback.c @@ -66,7 +66,7 @@ static FAR struct uip_callback_s *g_cbfreelist = NULL; ****************************************************************************/ /**************************************************************************** - * Function: uip_callbackinit + * Function: devif_callback_init * * Description: * Configure the pre-allocated callback structures into a free list. @@ -78,7 +78,7 @@ static FAR struct uip_callback_s *g_cbfreelist = NULL; * ****************************************************************************/ -void uip_callbackinit(void) +void devif_callback_init(void) { int i; for (i = 0; i < CONFIG_NET_NACTIVESOCKETS; i++) @@ -89,7 +89,7 @@ void uip_callbackinit(void) } /**************************************************************************** - * Function: uip_callbackalloc + * Function: devif_callback_alloc * * Description: * Allocate a callback container from the free list. @@ -101,7 +101,7 @@ void uip_callbackinit(void) * ****************************************************************************/ -FAR struct uip_callback_s *uip_callbackalloc(FAR struct uip_callback_s **list) +FAR struct uip_callback_s *devif_callback_alloc(FAR struct uip_callback_s **list) { struct uip_callback_s *ret; net_lock_t save; @@ -141,7 +141,7 @@ FAR struct uip_callback_s *uip_callbackalloc(FAR struct uip_callback_s **list) } /**************************************************************************** - * Function: uip_callbackfree + * Function: devif_callback_free * * Description: * Return a callback container to the free list. @@ -153,8 +153,8 @@ FAR struct uip_callback_s *uip_callbackalloc(FAR struct uip_callback_s **list) * ****************************************************************************/ -void uip_callbackfree(FAR struct uip_callback_s *cb, - FAR struct uip_callback_s **list) +void devif_callback_free(FAR struct uip_callback_s *cb, + FAR struct uip_callback_s **list) { FAR struct uip_callback_s *prev; FAR struct uip_callback_s *curr; @@ -208,7 +208,7 @@ void uip_callbackfree(FAR struct uip_callback_s *cb, } /**************************************************************************** - * Function: uip_callbackexecute + * Function: devif_callback_execute * * Description: * Execute a list of callbacks. @@ -220,8 +220,8 @@ void uip_callbackfree(FAR struct uip_callback_s *cb, * ****************************************************************************/ -uint16_t uip_callbackexecute(FAR struct net_driver_s *dev, void *pvconn, - uint16_t flags, FAR struct uip_callback_s *list) +uint16_t devif_callback_execute(FAR struct net_driver_s *dev, void *pvconn, + uint16_t flags, FAR struct uip_callback_s *list) { FAR struct uip_callback_s *next; net_lock_t save; diff --git a/net/devif/devif_initialize.c b/net/devif/devif_initialize.c index 63b4ab7fccd..1609ddd8bf1 100644 --- a/net/devif/devif_initialize.c +++ b/net/devif/devif_initialize.c @@ -118,6 +118,6 @@ void devif_initialize(void) { /* Initialize callback support */ - uip_callbackinit(); + devif_callback_init(); } #endif /* CONFIG_NET */ diff --git a/net/devif/devif_iobsend.c b/net/devif/devif_iobsend.c index bfc947648a8..249823b9671 100644 --- a/net/devif/devif_iobsend.c +++ b/net/devif/devif_iobsend.c @@ -82,13 +82,13 @@ ****************************************************************************/ /**************************************************************************** - * Name: uip_iobsend + * Name: devif_iob_send * * Description: * Called from socket logic in response to a xmit or poll request from the * the network interface driver. * - * This is identical to calling uip_send() except that the data is + * This is identical to calling devif_send() except that the data is * in an I/O buffer chain, rather than a flat buffer. * * Assumptions: @@ -97,8 +97,8 @@ * ****************************************************************************/ -void uip_iobsend(FAR struct net_driver_s *dev, FAR struct iob_s *iob, - unsigned int len, unsigned int offset) +void devif_iob_send(FAR struct net_driver_s *dev, FAR struct iob_s *iob, + unsigned int len, unsigned int offset) { DEBUGASSERT(dev && len > 0 && len < CONFIG_NET_BUFSIZE); @@ -110,7 +110,7 @@ void uip_iobsend(FAR struct net_driver_s *dev, FAR struct iob_s *iob, #ifdef CONFIG_NET_TCP_WRBUFFER_DUMP /* Dump the outgoing device buffer */ - lib_dumpbuffer("uip_iobsend", dev->d_snddata, len); + lib_dumpbuffer("devif_iob_send", dev->d_snddata, len); #endif } diff --git a/net/devif/devif_pktsend.c b/net/devif/devif_pktsend.c index f18be4d9a2e..2f54e488968 100644 --- a/net/devif/devif_pktsend.c +++ b/net/devif/devif_pktsend.c @@ -81,13 +81,13 @@ ****************************************************************************/ /**************************************************************************** - * Name: uip_pktsend + * Name: devif_pkt_send * * Description: * Called from socket logic in order to send a raw packet in response to * an xmit or poll request from the the network interface driver. * - * This is almost identical to calling uip_send() except that the data to + * This is almost identical to calling devif_send() except that the data to * be sent is copied into dev->d_buf (vs. dev->d_snddata), since there is * no header on the data. * @@ -97,8 +97,8 @@ * ****************************************************************************/ -void uip_pktsend(FAR struct net_driver_s *dev, FAR const void *buf, - unsigned int len) +void devif_pkt_send(FAR struct net_driver_s *dev, FAR const void *buf, + unsigned int len) { DEBUGASSERT(dev && len > 0 && len < CONFIG_NET_BUFSIZE); diff --git a/net/devif/devif_send.c b/net/devif/devif_send.c index a019aadfc66..f4be2ffaadd 100644 --- a/net/devif/devif_send.c +++ b/net/devif/devif_send.c @@ -81,7 +81,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: uip_send + * Name: devif_send * * Description: * Called from socket logic in response to a xmit or poll request from the @@ -93,7 +93,7 @@ * ****************************************************************************/ -void uip_send(struct net_driver_s *dev, const void *buf, int len) +void devif_send(struct net_driver_s *dev, const void *buf, int len) { DEBUGASSERT(dev && len > 0 && len < CONFIG_NET_BUFSIZE); diff --git a/net/icmp/icmp_input.c b/net/icmp/icmp_input.c index b38713336a2..4c065e81ebe 100644 --- a/net/icmp/icmp_input.c +++ b/net/icmp/icmp_input.c @@ -185,7 +185,7 @@ void icmp_input(FAR struct net_driver_s *dev) #ifdef CONFIG_NET_ICMP_PING else if (picmp->type == ICMP_ECHO_REPLY && g_echocallback) { - (void)uip_callbackexecute(dev, picmp, UIP_ECHOREPLY, g_echocallback); + (void)devif_callback_execute(dev, picmp, UIP_ECHOREPLY, g_echocallback); } #endif @@ -273,7 +273,7 @@ typeerr: { /* Dispatch the ECHO reply to the waiting thread */ - flags = uip_callbackexecute(dev, picmp, flags, g_echocallback); + flags = devif_callback_execute(dev, picmp, flags, g_echocallback); } /* If the ECHO reply was not handled, then drop the packet */ diff --git a/net/icmp/icmp_ping.c b/net/icmp/icmp_ping.c index de270cd8273..7371f9d31b7 100644 --- a/net/icmp/icmp_ping.c +++ b/net/icmp/icmp_ping.c @@ -67,8 +67,8 @@ /* Allocate a new ICMP data callback */ -#define icmp_callbackalloc() uip_callbackalloc(&g_echocallback) -#define icmp_callbackfree(cb) uip_callbackfree(cb, &g_echocallback) +#define icmp_callback_alloc() devif_callback_alloc(&g_echocallback) +#define icmp_callback_free(cb) devif_callback_free(cb, &g_echocallback) /**************************************************************************** * Private Types @@ -345,7 +345,7 @@ int uip_ping(uip_ipaddr_t addr, uint16_t id, uint16_t seqno, /* Set up the callback */ - state.png_cb = icmp_callbackalloc(); + state.png_cb = icmp_callback_alloc(); if (state.png_cb) { state.png_cb->flags = UIP_POLL|UIP_ECHOREPLY; @@ -367,7 +367,7 @@ int uip_ping(uip_ipaddr_t addr, uint16_t id, uint16_t seqno, nlldbg("Start time: 0x%08x seqno: %d\n", state.png_time, seqno); net_lockedwait(&state.png_sem); - icmp_callbackfree(state.png_cb); + icmp_callback_free(state.png_cb); } net_unlock(save); diff --git a/net/icmp/icmp_poll.c b/net/icmp/icmp_poll.c index 7cd2f760aa5..720b2c69b9d 100644 --- a/net/icmp/icmp_poll.c +++ b/net/icmp/icmp_poll.c @@ -98,7 +98,7 @@ void icmp_poll(FAR struct net_driver_s *dev) /* Perform the application callback */ - (void)uip_callbackexecute(dev, NULL, UIP_POLL, g_echocallback); + (void)devif_callback_execute(dev, NULL, UIP_POLL, g_echocallback); } #endif /* CONFIG_NET && CONFIG_NET_ICMP && CONFIG_NET_ICMP_PING */ diff --git a/net/pkt/pkt.h b/net/pkt/pkt.h index 900f631c25e..5010d727529 100644 --- a/net/pkt/pkt.h +++ b/net/pkt/pkt.h @@ -50,6 +50,11 @@ * Pre-processor Definitions ****************************************************************************/ +/* Allocate a new packet socket data callback */ + +#define pkt_callback_alloc(conn) devif_callback_alloc(&conn->list) +#define pkt_callback_free(conn,cb) devif_callback_free(cb, &conn->list) + /**************************************************************************** * Public Type Definitions ****************************************************************************/ diff --git a/net/pkt/pkt_callback.c b/net/pkt/pkt_callback.c index 9c90225ee34..0412bdcb95a 100644 --- a/net/pkt/pkt_callback.c +++ b/net/pkt/pkt_callback.c @@ -88,7 +88,7 @@ uint16_t pkt_callback(FAR struct net_driver_s *dev, { /* Perform the callback */ - flags = uip_callbackexecute(dev, conn, flags, conn->list); + flags = devif_callback_execute(dev, conn, flags, conn->list); } return flags; diff --git a/net/pkt/pkt_poll.c b/net/pkt/pkt_poll.c index 7ab0803ca49..33b3bfb416b 100644 --- a/net/pkt/pkt_poll.c +++ b/net/pkt/pkt_poll.c @@ -118,7 +118,7 @@ void pkt_poll(FAR struct net_driver_s *dev, FAR struct pkt_conn_s *conn) if (dev->d_sndlen > 0) { -// uip_pktsend(dev, conn); +// devif_pkt_send(dev, conn); return; } } diff --git a/net/pkt/pkt_send.c b/net/pkt/pkt_send.c index 39924fd881e..dc71ee6b4cf 100644 --- a/net/pkt/pkt_send.c +++ b/net/pkt/pkt_send.c @@ -124,7 +124,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, { /* Copy the packet data into the device packet buffer and send it */ - uip_pktsend(dev, pstate->snd_buffer, pstate->snd_buflen); + devif_pkt_send(dev, pstate->snd_buffer, pstate->snd_buflen); pstate->snd_sent = pstate->snd_buflen; } @@ -243,7 +243,7 @@ ssize_t psock_pkt_send(FAR struct socket *psock, FAR const void *buf, /* Allocate resource to receive a callback */ - state.snd_cb = pkt_callbackalloc(conn); + state.snd_cb = pkt_callback_alloc(conn); if (state.snd_cb) { FAR struct net_driver_s *dev; @@ -281,7 +281,7 @@ ssize_t psock_pkt_send(FAR struct socket *psock, FAR const void *buf, /* Make sure that no further interrupts are processed */ - pkt_callbackfree(conn, state.snd_cb); + pkt_callback_free(conn, state.snd_cb); /* Clear the no-ARP bit in the device flags */ diff --git a/net/socket/connect.c b/net/socket/connect.c index 29fbd744f25..bc42ac3981d 100644 --- a/net/socket/connect.c +++ b/net/socket/connect.c @@ -113,7 +113,7 @@ static inline int psock_setup_callbacks(FAR struct socket *psock, /* Set up the callbacks in the connection */ - pstate->tc_cb = tcp_callbackalloc(conn); + pstate->tc_cb = tcp_callback_alloc(conn); if (pstate->tc_cb) { /* Set up the connection "interrupt" handler */ @@ -143,7 +143,7 @@ static inline void psock_teardown_callbacks(FAR struct tcp_connect_s *pstate, /* Make sure that no further interrupts are processed */ - tcp_callbackfree(conn, pstate->tc_cb); + tcp_callback_free(conn, pstate->tc_cb); pstate->tc_cb = NULL; diff --git a/net/socket/net_close.c b/net/socket/net_close.c index e6738e06481..6b92f683a31 100644 --- a/net/socket/net_close.c +++ b/net/socket/net_close.c @@ -60,6 +60,7 @@ #include "socket/socket.h" #include "netdev/netdev.h" #include "devif/devif.h" +#include "tcp/tcp.h" #include "pkt/pkt.h" /**************************************************************************** @@ -297,7 +298,7 @@ static inline int netclose_disconnect(FAR struct socket *psock) #ifdef CONFIG_NET_TCP_WRITE_BUFFERS if (psock->s_sndcb) { - tcp_callbackfree(conn, psock->s_sndcb); + tcp_callback_free(conn, psock->s_sndcb); psock->s_sndcb = NULL; } #endif @@ -309,7 +310,7 @@ static inline int netclose_disconnect(FAR struct socket *psock) /* Check for the case where the host beat us and disconnected first */ if (conn->tcpstateflags == UIP_ESTABLISHED && - (state.cl_cb = tcp_callbackalloc(conn)) != NULL) + (state.cl_cb = tcp_callback_alloc(conn)) != NULL) { /* Set up to receive TCP data event callbacks */ @@ -373,7 +374,7 @@ static inline int netclose_disconnect(FAR struct socket *psock) /* We are now disconnected */ sem_destroy(&state.cl_sem); - tcp_callbackfree(conn, state.cl_cb); + tcp_callback_free(conn, state.cl_cb); /* Free the connection */ diff --git a/net/socket/net_poll.c b/net/socket/net_poll.c index dcce077f811..681b6c5bc3e 100644 --- a/net/socket/net_poll.c +++ b/net/socket/net_poll.c @@ -58,6 +58,7 @@ #include +#include "tcp/tcp.h" #include "socket/socket.h" /**************************************************************************** @@ -214,7 +215,7 @@ static inline int net_pollsetup(FAR struct socket *psock, /* Allocate a TCP/IP callback structure */ - cb = tcp_callbackalloc(conn); + cb = tcp_callback_alloc(conn); if (!cb) { ret = -EBUSY; @@ -366,7 +367,7 @@ static inline int net_pollteardown(FAR struct socket *psock, /* Release the callback */ flags = net_lock(); - tcp_callbackfree(conn, info->cb); + tcp_callback_free(conn, info->cb); net_unlock(flags); /* Release the poll/select data slot */ diff --git a/net/socket/net_sendfile.c b/net/socket/net_sendfile.c index 6f657ee6abc..5b43f297d6d 100644 --- a/net/socket/net_sendfile.c +++ b/net/socket/net_sendfile.c @@ -491,7 +491,7 @@ ssize_t net_sendfile(int outfd, struct file *infile, off_t *offset, /* Allocate resources to receive a callback */ - state.snd_datacb = tcp_callbackalloc(conn); + state.snd_datacb = tcp_callback_alloc(conn); if (state.snd_datacb == NULL) { @@ -500,7 +500,7 @@ ssize_t net_sendfile(int outfd, struct file *infile, off_t *offset, goto errout_locked; } - state.snd_ackcb = tcp_callbackalloc(conn); + state.snd_ackcb = tcp_callback_alloc(conn); if (state.snd_ackcb == NULL) { @@ -551,10 +551,10 @@ ssize_t net_sendfile(int outfd, struct file *infile, off_t *offset, psock->s_flags = _SS_SETSTATE(psock->s_flags, _SF_IDLE); - tcp_callbackfree(conn, state.snd_ackcb); + tcp_callback_free(conn, state.snd_ackcb); errout_datacb: - tcp_callbackfree(conn, state.snd_datacb); + tcp_callback_free(conn, state.snd_datacb); errout_locked: diff --git a/net/socket/recvfrom.c b/net/socket/recvfrom.c index 16ce70b1b70..709c9fe541a 100644 --- a/net/socket/recvfrom.c +++ b/net/socket/recvfrom.c @@ -1075,7 +1075,7 @@ static ssize_t pkt_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len, /* Set up the callback in the connection */ - state.rf_cb = pkt_callbackalloc(conn); + state.rf_cb = pkt_callback_alloc(conn); if (state.rf_cb) { state.rf_cb->flags = UIP_NEWDATA|UIP_POLL; @@ -1096,7 +1096,7 @@ static ssize_t pkt_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len, /* Make sure that no further interrupts are processed */ - pkt_callbackfree(conn, state.rf_cb); + pkt_callback_free(conn, state.rf_cb); ret = recvfrom_result(ret, &state); } else @@ -1167,7 +1167,7 @@ static ssize_t udp_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len, /* Set up the callback in the connection */ - state.rf_cb = udp_callbackalloc(conn); + state.rf_cb = udp_callback_alloc(conn); if (state.rf_cb) { /* Set up the callback in the connection */ @@ -1190,7 +1190,7 @@ static ssize_t udp_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len, /* Make sure that no further interrupts are processed */ - udp_callbackfree(conn, state.rf_cb); + udp_callback_free(conn, state.rf_cb); ret = recvfrom_result(ret, &state); } else @@ -1354,7 +1354,7 @@ static ssize_t tcp_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len, /* Set up the callback in the connection */ - state.rf_cb = tcp_callbackalloc(conn); + state.rf_cb = tcp_callback_alloc(conn); if (state.rf_cb) { state.rf_cb->flags = UIP_NEWDATA|UIP_POLL|UIP_CLOSE|UIP_ABORT|UIP_TIMEDOUT; @@ -1371,7 +1371,7 @@ static ssize_t tcp_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len, /* Make sure that no further interrupts are processed */ - tcp_callbackfree(conn, state.rf_cb); + tcp_callback_free(conn, state.rf_cb); ret = recvfrom_result(ret, &state); } else diff --git a/net/socket/sendto.c b/net/socket/sendto.c index 4b943b298a5..91e7ed544da 100644 --- a/net/socket/sendto.c +++ b/net/socket/sendto.c @@ -207,7 +207,7 @@ static uint16_t sendto_interrupt(struct net_driver_s *dev, void *conn, { /* Copy the user data into d_snddata and send it */ - uip_send(dev, pstate->st_buffer, pstate->st_buflen); + devif_send(dev, pstate->st_buffer, pstate->st_buflen); pstate->st_sndlen = pstate->st_buflen; } @@ -392,7 +392,7 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf, /* Set up the callback in the connection */ - state.st_cb = udp_callbackalloc(conn); + state.st_cb = udp_callback_alloc(conn); if (state.st_cb) { state.st_cb->flags = UIP_POLL; @@ -413,7 +413,7 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf, /* Make sure that no further interrupts are processed */ - udp_callbackfree(conn, state.st_cb); + udp_callback_free(conn, state.st_cb); } net_unlock(save); diff --git a/net/tcp/tcp.h b/net/tcp/tcp.h index 3e4f193d4f5..90475b2b5c2 100644 --- a/net/tcp/tcp.h +++ b/net/tcp/tcp.h @@ -50,6 +50,11 @@ * Pre-processor Definitions ****************************************************************************/ +/* Allocate a new TCP data callback */ + +#define tcp_callback_alloc(conn) devif_callback_alloc(&conn->list) +#define tcp_callback_free(conn,cb) devif_callback_free(cb, &conn->list) + /**************************************************************************** * Public Type Definitions ****************************************************************************/ diff --git a/net/tcp/tcp_callback.c b/net/tcp/tcp_callback.c index d62ee4dae89..d77916cec2a 100644 --- a/net/tcp/tcp_callback.c +++ b/net/tcp/tcp_callback.c @@ -178,7 +178,7 @@ uint16_t tcp_callback(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn, * dev->d_len should also be cleared). */ - flags = uip_callbackexecute(dev, conn, flags, conn->list); + flags = devif_callback_execute(dev, conn, flags, conn->list); /* There may be no new data handler in place at them moment that the new * incoming data is received. If the new incoming data was not handled, then diff --git a/net/tcp/tcp_conn.c b/net/tcp/tcp_conn.c index dd1fea30f00..796dca3c8b2 100644 --- a/net/tcp/tcp_conn.c +++ b/net/tcp/tcp_conn.c @@ -338,7 +338,7 @@ void tcp_free(FAR struct tcp_conn_s *conn) for (cb = conn->list; cb; cb = next) { next = cb->flink; - tcp_callbackfree(conn, cb); + tcp_callback_free(conn, cb); } /* UIP_ALLOCATED means that that the connection is not in the active list diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c index 2871847490a..e8a7dab27a3 100644 --- a/net/tcp/tcp_send_buffered.c +++ b/net/tcp/tcp_send_buffered.c @@ -600,7 +600,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, * won't actually happen until the polling cycle completes). */ - uip_iobsend(dev, WRB_IOB(wrb), sndlen, WRB_SENT(wrb)); + devif_iob_send(dev, WRB_IOB(wrb), sndlen, WRB_SENT(wrb)); /* Remember how much data we send out now so that we know * when everything has been acknowledged. Just increment @@ -755,7 +755,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf, if (!psock->s_sndcb) { - psock->s_sndcb = tcp_callbackalloc(conn); + psock->s_sndcb = tcp_callback_alloc(conn); } /* Test if the callback has been allocated */ diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c index 7338921be74..8ea48b60cbf 100644 --- a/net/tcp/tcp_send_unbuffered.c +++ b/net/tcp/tcp_send_unbuffered.c @@ -376,7 +376,7 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev, * happen until the polling cycle completes). */ - uip_send(dev, &pstate->snd_buffer[pstate->snd_sent], sndlen); + devif_send(dev, &pstate->snd_buffer[pstate->snd_sent], sndlen); /* Check if the destination IP address is in the ARP table. If not, * then the send won't actually make it out... it will be replaced with @@ -550,7 +550,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock, /* Allocate resources to receive a callback */ - state.snd_cb = tcp_callbackalloc(conn); + state.snd_cb = tcp_callback_alloc(conn); if (state.snd_cb) { /* Get the initial sequence number that will be used */ @@ -588,7 +588,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock, /* Make sure that no further interrupts are processed */ - tcp_callbackfree(conn, state.snd_cb); + tcp_callback_free(conn, state.snd_cb); } } diff --git a/net/udp/udp.h b/net/udp/udp.h index 803a28b492d..f9904d39ace 100644 --- a/net/udp/udp.h +++ b/net/udp/udp.h @@ -50,6 +50,11 @@ * Pre-processor Definitions ****************************************************************************/ +/* Allocate a new TCP data callback */ + +#define udp_callback_alloc(conn) devif_callback_alloc(&conn->list) +#define udp_callback_free(conn,cb) devif_callback_free(cb, &conn->list) + /**************************************************************************** * Public Type Definitions ****************************************************************************/ diff --git a/net/udp/udp_callback.c b/net/udp/udp_callback.c index 53137e8527c..47ba5dea281 100644 --- a/net/udp/udp_callback.c +++ b/net/udp/udp_callback.c @@ -88,7 +88,7 @@ uint16_t udp_callback(FAR struct net_driver_s *dev, { /* Perform the callback */ - flags = uip_callbackexecute(dev, conn, flags, conn->list); + flags = devif_callback_execute(dev, conn, flags, conn->list); } return flags;