summaryrefslogtreecommitdiff
path: root/nuttx/include/nuttx/net
diff options
context:
space:
mode:
Diffstat (limited to 'nuttx/include/nuttx/net')
-rw-r--r--nuttx/include/nuttx/net/pkt.h16
-rw-r--r--nuttx/include/nuttx/net/uip.h35
2 files changed, 7 insertions, 44 deletions
diff --git a/nuttx/include/nuttx/net/pkt.h b/nuttx/include/nuttx/net/pkt.h
index 8db02e923..2dfd85d2d 100644
--- a/nuttx/include/nuttx/net/pkt.h
+++ b/nuttx/include/nuttx/net/pkt.h
@@ -55,7 +55,7 @@
/* Representation of a uIP packet socket connection */
-struct uip_pkt_conn
+struct pkt_conn_s
{
dq_entry_t node; /* Supports a double linked list */
uint8_t lmac[6]; /* The local Ethernet address in network byte order */
@@ -86,21 +86,19 @@ struct uip_pkt_conn
* normally something done by the implementation of the socket() API
*/
-struct uip_pkt_conn *uip_pktalloc(void);
+FAR struct pkt_conn_s *pkt_alloc(void);
/* Allocate a new packet socket data callback */
-#define uip_pktcallbackalloc(conn) uip_callbackalloc(&conn->list)
-#define uip_pktcallbackfree(conn,cb) uip_callbackfree(cb, &conn->list)
+#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()
*/
-void uip_pktfree(struct uip_pkt_conn *conn);
-
-void uip_pktpoll(struct uip_driver_s *dev, struct uip_pkt_conn *conn);
-
-int uip_pktinput(struct uip_driver_s *dev);
+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);
#endif /* __INCLUDE_NUTTX_NET_PKT_H */
diff --git a/nuttx/include/nuttx/net/uip.h b/nuttx/include/nuttx/net/uip.h
index 00dffb159..b9bad39f8 100644
--- a/nuttx/include/nuttx/net/uip.h
+++ b/nuttx/include/nuttx/net/uip.h
@@ -370,41 +370,6 @@ int uip_lockedwait(sem_t *sem);
* data, etc.
*/
-/* Send data on the current connection.
- *
- * This function is used to send out a single segment of TCP
- * data. Only applications that have been invoked by uIP for event
- * processing can send data.
- *
- * The amount of data that actually is sent out after a call to this
- * funcion is determined by the maximum amount of data TCP allows. uIP
- * will automatically crop the data so that only the appropriate
- * amount of data is sent. The function uip_mss() can be used to query
- * uIP for the amount of data that actually will be sent.
- *
- * Note: This function does not guarantee that the sent data will
- * arrive at the destination. If the data is lost in the network, the
- * application will be invoked with the UIP_REXMIT flag set. The
- * application will then have to resend the data using this function.
- *
- * data A pointer to the data which is to be sent.
- *
- * len The maximum amount of data bytes to be sent.
- */
-
-void uip_send(FAR struct uip_driver_s *dev, FAR const void *buf, int len);
-
-#ifdef CONFIG_NET_IOB
-struct iob_s;
-void uip_iobsend(FAR struct uip_driver_s *dev, FAR struct iob_s *buf,
- unsigned int len, unsigned int offset);
-#endif
-
-#ifdef CONFIG_NET_PKT
-void uip_pktsend(FAR struct uip_driver_s *dev, FAR const void *buf,
- unsigned int len);
-#endif
-
/* uIP convenience and converting functions.
*
* These functions can be used for converting between different data