net: Add net/tcp/tcp.h; rename uip_tcpwrbuffer_ to tcp_wrbuffer_*

3 files changed, 145 insertions, 14 deletions

diff --git a/nuttx/net/tcp/tcp.h b/nuttx/net/tcp/tcp.h
new file mode 100644
index 000000000..b2b515793
--- /dev/null
+++ b/nuttx/net/tcp/tcp.h
@@ -0,0 +1,130 @@
+/****************************************************************************
+ * net/tcp/tcp.h
+ *
+ *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef _NET_TCP_TCP_H
+#define _NET_TCP_TCP_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#ifdef CONFIG_NET_TCP
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Type Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#ifdef __cplusplus
+#  define EXTERN extern "C"
+extern "C"
+{
+#else
+#  define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Function: tcp_wrbuffer_initialize
+ *
+ * Description:
+ *   Initialize the list of free write buffers
+ *
+ * Assumptions:
+ *   Called once early initialization.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_NET_TCP_WRITE_BUFFERS
+void tcp_wrbuffer_initialize(void);
+#endif /* CONFIG_NET_TCP_WRITE_BUFFERS */
+
+/****************************************************************************
+ * Function: tcp_wrbuffer_alloc
+ *
+ * Description:
+ *   Allocate a TCP write buffer by taking a pre-allocated buffer from
+ *   the free list.  This function is called from TCP logic when a buffer
+ *   of TCP data is about to sent
+ *
+ * Assumptions:
+ *   Called from user logic with interrupts enabled.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_NET_TCP_WRITE_BUFFERS
+struct tcp_wrbuffer_s;
+struct timespec;
+
+FAR struct tcp_wrbuffer_s *
+tcp_wrbuffer_alloc(FAR const struct timespec *abstime);
+#endif /* CONFIG_NET_TCP_WRITE_BUFFERS */
+
+/****************************************************************************
+ * Function: tcp_wrbuffer_release
+ *
+ * Description:
+ *   Release a TCP write buffer by returning the buffer to the free list.
+ *   This function is called from user logic after it is consumed the
+ *   buffered data.
+ *
+ * Assumptions:
+ *   Called from interrupt level with interrupts disabled.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_NET_TCP_WRITE_BUFFERS
+void tcp_wrbuffer_release(FAR struct tcp_wrbuffer_s *wrbuffer);
+#endif /* CONFIG_NET_TCP_WRITE_BUFFERS */
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CONFIG_NET_TCP */
+#endif /* _NET_TCP_TCP_H */
diff --git a/nuttx/net/tcp/tcp_conn.c b/nuttx/net/tcp/tcp_conn.c
index 0881d9ff9..bae10a754 100644
--- a/nuttx/net/tcp/tcp_conn.c
+++ b/nuttx/net/tcp/tcp_conn.c
@@ -55,6 +55,7 @@
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/uip/uip-arch.h>
 
+#include "tcp/tcp.h"
 #include "uip/uip_internal.h"
 
 /****************************************************************************
@@ -320,7 +321,7 @@ void uip_tcpfree(struct uip_conn *conn)
   FAR struct uip_readahead_s *readahead;
 #endif
 #ifdef CONFIG_NET_TCP_WRITE_BUFFERS
-  FAR struct uip_wrbuffer_s *wrbuffer;
+  FAR struct tcp_wrbuffer_s *wrbuffer;
 #endif
   uip_lock_t flags;
 
@@ -365,14 +366,14 @@ void uip_tcpfree(struct uip_conn *conn)
 #ifdef CONFIG_NET_TCP_WRITE_BUFFERS
   /* Release any write buffers attached to the connection */
 
-  while ((wrbuffer = (struct uip_wrbuffer_s *)sq_remfirst(&conn->write_q)) != NULL)
+  while ((wrbuffer = (struct tcp_wrbuffer_s *)sq_remfirst(&conn->write_q)) != NULL)
     {
-      uip_tcpwrbuffer_release(wrbuffer);
+      tcp_wrbuffer_release(wrbuffer);
     }
 
-  while ((wrbuffer = (struct uip_wrbuffer_s *)sq_remfirst(&conn->unacked_q)) != NULL)
+  while ((wrbuffer = (struct tcp_wrbuffer_s *)sq_remfirst(&conn->unacked_q)) != NULL)
     {
-      uip_tcpwrbuffer_release(wrbuffer);
+      tcp_wrbuffer_release(wrbuffer);
     }
 #endif
 
diff --git a/nuttx/net/tcp/tcp_wrbuffer.c b/nuttx/net/tcp/tcp_wrbuffer.c
index 309ea18d7..cba5f5d23 100644
--- a/nuttx/net/tcp/tcp_wrbuffer.c
+++ b/nuttx/net/tcp/tcp_wrbuffer.c
@@ -72,7 +72,7 @@ struct wrbuffer_s
 
   /* These are the pre-allocated write buffers */
 
-  struct uip_wrbuffer_s buffers[CONFIG_NET_NTCP_WRITE_BUFFERS];
+  struct tcp_wrbuffer_s buffers[CONFIG_NET_NTCP_WRITE_BUFFERS];
 };
 
 /****************************************************************************
@@ -92,7 +92,7 @@ static struct wrbuffer_s g_wrbuffer;
  ****************************************************************************/
 
 /****************************************************************************
- * Function: uip_tcpwrbuffer_init
+ * Function: tcp_wrbuffer_initialize
  *
  * Description:
  *   Initialize the list of free write buffers
@@ -102,7 +102,7 @@ static struct wrbuffer_s g_wrbuffer;
  *
  ****************************************************************************/
 
-void uip_tcpwrbuffer_init(void)
+void tcp_wrbuffer_initialize(void)
 {
   int i;
 
@@ -117,7 +117,7 @@ void uip_tcpwrbuffer_init(void)
 }
 
 /****************************************************************************
- * Function: uip_tcpwrbuffer_alloc
+ * Function: tcp_wrbuffer_alloc
  *
  * Description:
  *   Allocate a TCP write buffer by taking a pre-allocated buffer from
@@ -129,8 +129,8 @@ void uip_tcpwrbuffer_init(void)
  *
  ****************************************************************************/
 
-FAR struct uip_wrbuffer_s *
-uip_tcpwrbuffer_alloc(FAR const struct timespec *abstime)
+FAR struct tcp_wrbuffer_s *
+tcp_wrbuffer_alloc(FAR const struct timespec *abstime)
 {
   int ret;
 
@@ -148,11 +148,11 @@ uip_tcpwrbuffer_alloc(FAR const struct timespec *abstime)
       return NULL;
     }
 
-  return (FAR struct uip_wrbuffer_s*)sq_remfirst(&g_wrbuffer.freebuffers);
+  return (FAR struct tcp_wrbuffer_s*)sq_remfirst(&g_wrbuffer.freebuffers);
 }
 
 /****************************************************************************
- * Function: uip_tcpwrbuffer_release
+ * Function: tcp_wrbuffer_release
  *
  * Description:
  *   Release a TCP write buffer by returning the buffer to the free list.
@@ -164,7 +164,7 @@ uip_tcpwrbuffer_alloc(FAR const struct timespec *abstime)
  *
  ****************************************************************************/
 
-void uip_tcpwrbuffer_release(FAR struct uip_wrbuffer_s *wrbuffer)
+void tcp_wrbuffer_release(FAR struct tcp_wrbuffer_s *wrbuffer)
 {
   sq_addlast(&wrbuffer->wb_node, &g_wrbuffer.freebuffers);
   sem_post(&g_wrbuffer.sem);