Move TCP files from net/uip to net/tcp

net/Makefile

@@ -103,6 +103,7 @@ include iob/Make.defs
 include arp/Make.defs
 include icmp/Make.defs
 include igmp/Make.defs
+include tcp/Make.defs
 include uip/Make.defs
 endif
 

net/tcp/tcp_appsend.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip_tcpappsend.c
+ * net/tcp/tcp_appsend.c
  *
  *   Copyright (C) 2007-2010, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -52,7 +52,7 @@
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/uip/uip-arch.h>
 
-#include "uip_internal.h"
+#include "uip/uip_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions

net/tcp/tcp_backlog.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip_tcpbacklog.c
+ * net/tcp/tcp_backlog.c
  *
  *   Copyright (C) 2008-2009, 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +50,7 @@
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/uip/uip-tcp.h>
 
-#include "uip_internal.h"
+#include "uip/uip_internal.h"
 
 /****************************************************************************
  * Private Data

net/tcp/tcp_callback.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip_tcpcallback.c
+ * net/tcp/tcp_callback.c
  *
  *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -49,7 +49,7 @@
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/uip/uip-arch.h>
 
-#include "uip_internal.h"
+#include "uip/uip_internal.h"
 
 /****************************************************************************
  * Private Data

net/tcp/tcp_conn.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip_tcpconn.c
+ * net/tcp/tcp_conn.c
  *
  *   Copyright (C) 2007-2011, 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -55,7 +55,7 @@
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/uip/uip-arch.h>
 
-#include "uip_internal.h"
+#include "uip/uip_internal.h"
 
 /****************************************************************************
  * Public Data

net/tcp/tcp_input.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip_tcpinput.c
+ * net/tcp/tcp_input.c
  * Handling incoming TCP input
  *
  *   Copyright (C) 2007-2014 Gregory Nutt. All rights reserved.
@@ -54,7 +54,7 @@
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/uip/uip-arch.h>
 
-#include "uip_internal.h"
+#include "uip/uip_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions

net/tcp/tcp_poll.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip_tcppoll.c
+ * net/tcp/tcp_poll.c
  * Poll for the availability of TCP TX data
  *
  *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
@@ -52,7 +52,7 @@
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/uip/uip-arch.h>
 
-#include "uip_internal.h"
+#include "uip/uip_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions

net/tcp/tcp_readahead.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip_tcpreadahead.c
+ * net/tcp/tcp_readahead.c
  *
  *   Copyright (C) 2007-2009, 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -45,7 +45,7 @@
 
 #include <nuttx/net/uip/uip.h>
 
-#include "uip_internal.h"
+#include "uip/uip_internal.h"
 
 /****************************************************************************
  * Private Types

net/tcp/tcp_send.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip_tcpsend.c
+ * net//tcp_send.c
  *
  *   Copyright (C) 2007-2010, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -52,7 +52,7 @@
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/uip/uip-arch.h>
 
-#include "uip_internal.h"
+#include "uip/uip_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions

net/tcp/tcp_seqno.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip_tcpseqno.c
+ * net/tcp/tcp_seqno.c
  *
  *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -54,7 +54,7 @@
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/uip/uip-arch.h>
 
-#include "uip_internal.h"
+#include "uip/uip_internal.h"
 
 /****************************************************************************
  * Public Data

net/tcp/tcp_timer.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip_tcptimer.c
+ * net/tcp/tcp_timer.c
  * Poll for the availability of TCP TX data
  *
  *   Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
@@ -52,7 +52,7 @@
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/uip/uip-arch.h>
 
-#include "uip_internal.h"
+#include "uip/uip_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions

net/tcp/tcp_wrbuffer.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip_tcpwrbuffer.c
+ * net/tcp/tcp_wrbuffer.c
  *
  *   Copyright (C) 2007-2009, 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -45,7 +45,7 @@
 #include <semaphore.h>
 #include <debug.h>
 
-#include "uip_internal.h"
+#include "uip/uip_internal.h"
 
 /****************************************************************************
  * Private Types

net/uip/Make.defs

@@ -61,26 +61,6 @@ ifeq ($(CONFIG_NET_IPv6),y)
 NET_CSRCS += uip_neighbor.c
 endif
 
-# TCP/IP source files
-
-ifeq ($(CONFIG_NET_TCP),y)
-
-NET_CSRCS += uip_tcpconn.c uip_tcpseqno.c uip_tcppoll.c uip_tcptimer.c
-NET_CSRCS += uip_tcpsend.c uip_tcpinput.c uip_tcpappsend.c uip_listen.c
-NET_CSRCS += uip_tcpcallback.c uip_tcpbacklog.c
-
-# TCP Buffering
-
-ifeq ($(CONFIG_NET_TCP_READAHEAD),y)
-NET_CSRCS += uip_tcpreadahead.c
-endif
-
-ifeq ($(CONFIG_NET_TCP_WRITE_BUFFERS),y)
-NET_CSRCS += uip_tcpwrbuffer.c
-endif
-
-endif
-
 # UDP source files
 
 ifeq ($(CONFIG_NET_UDP),y)