Rename uip_driver_s net_driver_s

10 files changed, 25 insertions, 25 deletions

diff --git a/nuttx/net/tcp/tcp.h b/nuttx/net/tcp/tcp.h
index ef75526de..3e4f193d4 100644
--- a/nuttx/net/tcp/tcp.h
+++ b/nuttx/net/tcp/tcp.h
@@ -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,
diff --git a/nuttx/net/tcp/tcp_appsend.c b/nuttx/net/tcp/tcp_appsend.c
index eb4214d55..f02049208 100644
--- a/nuttx/net/tcp/tcp_appsend.c
+++ b/nuttx/net/tcp/tcp_appsend.c
@@ -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",
diff --git a/nuttx/net/tcp/tcp_callback.c b/nuttx/net/tcp/tcp_callback.c
index f09bf995f..bbd886173 100644
--- a/nuttx/net/tcp/tcp_callback.c
+++ b/nuttx/net/tcp/tcp_callback.c
@@ -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.
diff --git a/nuttx/net/tcp/tcp_input.c b/nuttx/net/tcp/tcp_input.c
index 634343004..909996a23 100644
--- a/nuttx/net/tcp/tcp_input.c
+++ b/nuttx/net/tcp/tcp_input.c
@@ -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;
diff --git a/nuttx/net/tcp/tcp_listen.c b/nuttx/net/tcp/tcp_listen.c
index 1b48dc2ee..be9324103 100644
--- a/nuttx/net/tcp/tcp_listen.c
+++ b/nuttx/net/tcp/tcp_listen.c
@@ -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;
diff --git a/nuttx/net/tcp/tcp_poll.c b/nuttx/net/tcp/tcp_poll.c
index 3fc9609d7..465a3e253 100644
--- a/nuttx/net/tcp/tcp_poll.c
+++ b/nuttx/net/tcp/tcp_poll.c
@@ -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;
 
diff --git a/nuttx/net/tcp/tcp_send.c b/nuttx/net/tcp/tcp_send.c
index 929ca1c9b..f404e9d59 100644
--- a/nuttx/net/tcp/tcp_send.c
+++ b/nuttx/net/tcp/tcp_send.c
@@ -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;
diff --git a/nuttx/net/tcp/tcp_send_buffered.c b/nuttx/net/tcp/tcp_send_buffered.c
index 37359406f..d51a6efbf 100644
--- a/nuttx/net/tcp/tcp_send_buffered.c
+++ b/nuttx/net/tcp/tcp_send_buffered.c
@@ -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)
 {
diff --git a/nuttx/net/tcp/tcp_send_unbuffered.c b/nuttx/net/tcp/tcp_send_unbuffered.c
index 0736b220c..39474cfc3 100644
--- a/nuttx/net/tcp/tcp_send_unbuffered.c
+++ b/nuttx/net/tcp/tcp_send_unbuffered.c
@@ -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)
 {
diff --git a/nuttx/net/tcp/tcp_timer.c b/nuttx/net/tcp/tcp_timer.c
index 228abf6e3..87083aef6 100644
--- a/nuttx/net/tcp/tcp_timer.c
+++ b/nuttx/net/tcp/tcp_timer.c
@@ -96,7 +96,7 @@
  *
  ****************************************************************************/
 
-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)
 {
   uint8_t result;