From 143959c1ed2c45704ef8746598d8fcad95f7d1a5 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 18 Jun 2014 10:18:53 -0600 Subject: [PATCH] Move TCP files from net/uip to net/tcp --- net/Makefile | 1 + .../uip_tcpappsend.c => tcp/tcp_appsend.c} | 4 ++-- .../uip_tcpbacklog.c => tcp/tcp_backlog.c} | 4 ++-- .../uip_tcpcallback.c => tcp/tcp_callback.c} | 4 ++-- net/{uip/uip_tcpconn.c => tcp/tcp_conn.c} | 4 ++-- net/{uip/uip_tcpinput.c => tcp/tcp_input.c} | 4 ++-- net/{uip/uip_tcppoll.c => tcp/tcp_poll.c} | 4 ++-- .../tcp_readahead.c} | 4 ++-- net/{uip/uip_tcpsend.c => tcp/tcp_send.c} | 4 ++-- net/{uip/uip_tcpseqno.c => tcp/tcp_seqno.c} | 4 ++-- net/{uip/uip_tcptimer.c => tcp/tcp_timer.c} | 4 ++-- .../uip_tcpwrbuffer.c => tcp/tcp_wrbuffer.c} | 4 ++-- net/uip/Make.defs | 20 ------------------- 13 files changed, 23 insertions(+), 42 deletions(-) rename net/{uip/uip_tcpappsend.c => tcp/tcp_appsend.c} (99%) rename net/{uip/uip_tcpbacklog.c => tcp/tcp_backlog.c} (99%) rename net/{uip/uip_tcpcallback.c => tcp/tcp_callback.c} (99%) rename net/{uip/uip_tcpconn.c => tcp/tcp_conn.c} (99%) rename net/{uip/uip_tcpinput.c => tcp/tcp_input.c} (99%) rename net/{uip/uip_tcppoll.c => tcp/tcp_poll.c} (98%) rename net/{uip/uip_tcpreadahead.c => tcp/tcp_readahead.c} (98%) rename net/{uip/uip_tcpsend.c => tcp/tcp_send.c} (99%) rename net/{uip/uip_tcpseqno.c => tcp/tcp_seqno.c} (99%) rename net/{uip/uip_tcptimer.c => tcp/tcp_timer.c} (99%) rename net/{uip/uip_tcpwrbuffer.c => tcp/tcp_wrbuffer.c} (98%) diff --git a/net/Makefile b/net/Makefile index 9209176a94..6d5eff36de 100644 --- a/net/Makefile +++ b/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 diff --git a/net/uip/uip_tcpappsend.c b/net/tcp/tcp_appsend.c similarity index 99% rename from net/uip/uip_tcpappsend.c rename to net/tcp/tcp_appsend.c index 8607d93cbc..857ca4385d 100644 --- a/net/uip/uip_tcpappsend.c +++ b/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 @@ -52,7 +52,7 @@ #include #include -#include "uip_internal.h" +#include "uip/uip_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/net/uip/uip_tcpbacklog.c b/net/tcp/tcp_backlog.c similarity index 99% rename from net/uip/uip_tcpbacklog.c rename to net/tcp/tcp_backlog.c index 20f9151dd7..a1a16323e0 100644 --- a/net/uip/uip_tcpbacklog.c +++ b/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 @@ -50,7 +50,7 @@ #include #include -#include "uip_internal.h" +#include "uip/uip_internal.h" /**************************************************************************** * Private Data diff --git a/net/uip/uip_tcpcallback.c b/net/tcp/tcp_callback.c similarity index 99% rename from net/uip/uip_tcpcallback.c rename to net/tcp/tcp_callback.c index 8cd82fb42d..6a14226287 100644 --- a/net/uip/uip_tcpcallback.c +++ b/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 @@ -49,7 +49,7 @@ #include #include -#include "uip_internal.h" +#include "uip/uip_internal.h" /**************************************************************************** * Private Data diff --git a/net/uip/uip_tcpconn.c b/net/tcp/tcp_conn.c similarity index 99% rename from net/uip/uip_tcpconn.c rename to net/tcp/tcp_conn.c index 212b786328..0881d9ff99 100644 --- a/net/uip/uip_tcpconn.c +++ b/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 @@ -55,7 +55,7 @@ #include #include -#include "uip_internal.h" +#include "uip/uip_internal.h" /**************************************************************************** * Public Data diff --git a/net/uip/uip_tcpinput.c b/net/tcp/tcp_input.c similarity index 99% rename from net/uip/uip_tcpinput.c rename to net/tcp/tcp_input.c index 9f18a0db7a..bbd44ee6ff 100644 --- a/net/uip/uip_tcpinput.c +++ b/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 #include -#include "uip_internal.h" +#include "uip/uip_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/net/uip/uip_tcppoll.c b/net/tcp/tcp_poll.c similarity index 98% rename from net/uip/uip_tcppoll.c rename to net/tcp/tcp_poll.c index 3b1bf45b80..ac4cdb8f3d 100644 --- a/net/uip/uip_tcppoll.c +++ b/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 #include -#include "uip_internal.h" +#include "uip/uip_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/net/uip/uip_tcpreadahead.c b/net/tcp/tcp_readahead.c similarity index 98% rename from net/uip/uip_tcpreadahead.c rename to net/tcp/tcp_readahead.c index 7ee9073ae0..5ac4a42ac9 100644 --- a/net/uip/uip_tcpreadahead.c +++ b/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 @@ -45,7 +45,7 @@ #include -#include "uip_internal.h" +#include "uip/uip_internal.h" /**************************************************************************** * Private Types diff --git a/net/uip/uip_tcpsend.c b/net/tcp/tcp_send.c similarity index 99% rename from net/uip/uip_tcpsend.c rename to net/tcp/tcp_send.c index 7d8e7a9c40..3e313f2147 100644 --- a/net/uip/uip_tcpsend.c +++ b/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 @@ -52,7 +52,7 @@ #include #include -#include "uip_internal.h" +#include "uip/uip_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/net/uip/uip_tcpseqno.c b/net/tcp/tcp_seqno.c similarity index 99% rename from net/uip/uip_tcpseqno.c rename to net/tcp/tcp_seqno.c index ea0aac4436..625eefeb25 100644 --- a/net/uip/uip_tcpseqno.c +++ b/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 @@ -54,7 +54,7 @@ #include #include -#include "uip_internal.h" +#include "uip/uip_internal.h" /**************************************************************************** * Public Data diff --git a/net/uip/uip_tcptimer.c b/net/tcp/tcp_timer.c similarity index 99% rename from net/uip/uip_tcptimer.c rename to net/tcp/tcp_timer.c index 8a34660b37..edcdb9c242 100644 --- a/net/uip/uip_tcptimer.c +++ b/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 #include -#include "uip_internal.h" +#include "uip/uip_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/net/uip/uip_tcpwrbuffer.c b/net/tcp/tcp_wrbuffer.c similarity index 98% rename from net/uip/uip_tcpwrbuffer.c rename to net/tcp/tcp_wrbuffer.c index d08b682b0d..7211655a57 100644 --- a/net/uip/uip_tcpwrbuffer.c +++ b/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 @@ -45,7 +45,7 @@ #include #include -#include "uip_internal.h" +#include "uip/uip_internal.h" /**************************************************************************** * Private Types diff --git a/net/uip/Make.defs b/net/uip/Make.defs index 7cd15b5694..d5c1fde89f 100644 --- a/net/uip/Make.defs +++ b/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)