From 093ecf1e35390e54b8d8a3ce6679b46893c1f6da Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 30 May 2014 13:05:19 -0600 Subject: [PATCH] Move IGMP files from net/uip to net/igmp --- net/Makefile | 5 ++- .../uip_igmpgroup.c => igmp/igmp_group.c} | 4 +- net/{uip/uip_igmpinit.c => igmp/igmp_init.c} | 4 +- .../uip_igmpinput.c => igmp/igmp_input.c} | 4 +- net/{uip/uip_igmpjoin.c => igmp/igmp_join.c} | 4 +- .../uip_igmpleave.c => igmp/igmp_leave.c} | 4 +- .../uip_mcastmac.c => igmp/igmp_mcastmac.c} | 4 +- net/{uip/uip_igmpmsg.c => igmp/igmp_msg.c} | 4 +- net/{uip/uip_igmppoll.c => igmp/igmp_poll.c} | 6 +-- net/{uip/uip_igmpsend.c => igmp/igmp_send.c} | 4 +- .../uip_igmptimer.c => igmp/igmp_timer.c} | 4 +- net/uip/Make.defs | 38 +++++++------------ 12 files changed, 37 insertions(+), 48 deletions(-) rename net/{uip/uip_igmpgroup.c => igmp/igmp_group.c} (99%) rename net/{uip/uip_igmpinit.c => igmp/igmp_init.c} (98%) rename net/{uip/uip_igmpinput.c => igmp/igmp_input.c} (99%) rename net/{uip/uip_igmpjoin.c => igmp/igmp_join.c} (99%) rename net/{uip/uip_igmpleave.c => igmp/igmp_leave.c} (99%) rename net/{uip/uip_mcastmac.c => igmp/igmp_mcastmac.c} (98%) rename net/{uip/uip_igmpmsg.c => igmp/igmp_msg.c} (98%) rename net/{uip/uip_igmppoll.c => igmp/igmp_poll.c} (98%) rename net/{uip/uip_igmpsend.c => igmp/igmp_send.c} (99%) rename net/{uip/uip_igmptimer.c => igmp/igmp_timer.c} (99%) diff --git a/net/Makefile b/net/Makefile index 9e403b92be..f3fda059a8 100644 --- a/net/Makefile +++ b/net/Makefile @@ -100,13 +100,14 @@ NETDEV_CSRCS += netdev_rxnotify.c endif include arp/Make.defs +include igmp/Make.defs include uip/Make.defs endif -ASRCS = $(SOCK_ASRCS) $(NETDEV_ASRCS) $(ARP_ASRCS) $(UIP_ASRCS) +ASRCS = $(SOCK_ASRCS) $(NETDEV_ASRCS) $(NET_ASRCS) AOBJS = $(ASRCS:.S=$(OBJEXT)) -CSRCS = $(SOCK_CSRCS) $(NETDEV_CSRCS) $(ARP_CSRCS) $(UIP_CSRCS) +CSRCS = $(SOCK_CSRCS) $(NETDEV_CSRCS) $(NET_CSRCS) COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) diff --git a/net/uip/uip_igmpgroup.c b/net/igmp/igmp_group.c similarity index 99% rename from net/uip/uip_igmpgroup.c rename to net/igmp/igmp_group.c index ab3beb2f4c..fb38cc1cb7 100644 --- a/net/uip/uip_igmpgroup.c +++ b/net/igmp/igmp_group.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip_igmpgroup.c + * net/igmp/igmp_group.c * IGMP group data structure management logic * * Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved. @@ -58,7 +58,7 @@ #include #include -#include "uip_internal.h" +#include "uip/uip_internal.h" #ifdef CONFIG_NET_IGMP diff --git a/net/uip/uip_igmpinit.c b/net/igmp/igmp_init.c similarity index 98% rename from net/uip/uip_igmpinit.c rename to net/igmp/igmp_init.c index 4e3b07c504..f0f94198a2 100644 --- a/net/uip/uip_igmpinit.c +++ b/net/igmp/igmp_init.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip_igmpinit.c + * net/igmp/igmp_init.c * IGMP initialization logic * * Copyright (C) 2010 Gregory Nutt. All rights reserved. @@ -50,7 +50,7 @@ #include #include -#include "uip_internal.h" +#include "uip/uip_internal.h" #ifdef CONFIG_NET_IGMP diff --git a/net/uip/uip_igmpinput.c b/net/igmp/igmp_input.c similarity index 99% rename from net/uip/uip_igmpinput.c rename to net/igmp/igmp_input.c index ca766ae8b4..1c6f9cc919 100644 --- a/net/uip/uip_igmpinput.c +++ b/net/igmp/igmp_input.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip_igminput.c + * net/igmp/igmp_input.c * * Copyright (C) 2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -51,7 +51,7 @@ #include #include -#include "uip_internal.h" +#include "uip/uip_internal.h" #ifdef CONFIG_NET_IGMP diff --git a/net/uip/uip_igmpjoin.c b/net/igmp/igmp_join.c similarity index 99% rename from net/uip/uip_igmpjoin.c rename to net/igmp/igmp_join.c index 8227dba151..e795d1dd6c 100644 --- a/net/uip/uip_igmpjoin.c +++ b/net/igmp/igmp_join.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip_igmpjoin.c + * net/igmp/igmp_join.c * * Copyright (C) 2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -50,7 +50,7 @@ #include #include -#include "uip_internal.h" +#include "uip/uip_internal.h" #ifdef CONFIG_NET_IGMP diff --git a/net/uip/uip_igmpleave.c b/net/igmp/igmp_leave.c similarity index 99% rename from net/uip/uip_igmpleave.c rename to net/igmp/igmp_leave.c index b5a0fdddec..f3632e338c 100644 --- a/net/uip/uip_igmpleave.c +++ b/net/igmp/igmp_leave.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip_igmpleave.c + * net/igmp/igmp_leave.c * * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -51,7 +51,7 @@ #include #include -#include "uip_internal.h" +#include "uip/uip_internal.h" #ifdef CONFIG_NET_IGMP diff --git a/net/uip/uip_mcastmac.c b/net/igmp/igmp_mcastmac.c similarity index 98% rename from net/uip/uip_mcastmac.c rename to net/igmp/igmp_mcastmac.c index b8d2a1dd36..3f8b8369fd 100644 --- a/net/uip/uip_mcastmac.c +++ b/net/igmp/igmp_mcastmac.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip_mcastmac.c + * net/igmp/igmp_mcastmac.c * * Copyright (C) 2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +49,7 @@ #include #include -#include "uip_internal.h" +#include "uip/uip_internal.h" #ifdef CONFIG_NET_IGMP diff --git a/net/uip/uip_igmpmsg.c b/net/igmp/igmp_msg.c similarity index 98% rename from net/uip/uip_igmpmsg.c rename to net/igmp/igmp_msg.c index aa6c0318b3..b3d1948bfd 100644 --- a/net/uip/uip_igmpmsg.c +++ b/net/igmp/igmp_msg.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip_igmpmgs.c + * net/igmp/igmp_msg.c * * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -50,7 +50,7 @@ #include #include -#include "uip_internal.h" +#include "uip/uip_internal.h" #ifdef CONFIG_NET_IGMP diff --git a/net/uip/uip_igmppoll.c b/net/igmp/igmp_poll.c similarity index 98% rename from net/uip/uip_igmppoll.c rename to net/igmp/igmp_poll.c index b721433740..219ffe2177 100644 --- a/net/uip/uip_igmppoll.c +++ b/net/igmp/igmp_poll.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip_igmppoll.c + * net/igmp/igmp_poll.c * * Copyright (C) 2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -50,7 +50,7 @@ #include #include -#include "uip_internal.h" +#include "uip/uip_internal.h" #ifdef CONFIG_NET_IGMP @@ -69,7 +69,7 @@ * Construct the . * * Returned Value: - * Returns a non-zero value if a IGP message is sent. + * Returns a non-zero value if an IGMP message is sent. * * Assumptions: * This function is called from the driver polling logic... probably within diff --git a/net/uip/uip_igmpsend.c b/net/igmp/igmp_send.c similarity index 99% rename from net/uip/uip_igmpsend.c rename to net/igmp/igmp_send.c index 26fcad382c..32dc1d78f4 100644 --- a/net/uip/uip_igmpsend.c +++ b/net/igmp/igmp_send.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip_igmpsend.c + * net/igmp/igmp_send.c * * Copyright (C) 2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -48,7 +48,7 @@ #include #include -#include "uip_internal.h" +#include "uip/uip_internal.h" #ifdef CONFIG_NET_IGMP diff --git a/net/uip/uip_igmptimer.c b/net/igmp/igmp_timer.c similarity index 99% rename from net/uip/uip_igmptimer.c rename to net/igmp/igmp_timer.c index 6c6fa0f849..74ee41e5b9 100644 --- a/net/uip/uip_igmptimer.c +++ b/net/igmp/igmp_timer.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip_igmptimer.c + * net/igmp/igmp_timer.c * * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -52,7 +52,7 @@ #include #include -#include "uip_internal.h" +#include "uip/uip_internal.h" #ifdef CONFIG_NET_IGMP diff --git a/net/uip/Make.defs b/net/uip/Make.defs index 382fb2e5d0..24cb9ae972 100644 --- a/net/uip/Make.defs +++ b/net/uip/Make.defs @@ -33,44 +33,41 @@ # ############################################################################ -UIP_ASRCS = -UIP_CSRCS = - ifeq ($(CONFIG_NET),y) # Common IP source files -UIP_CSRCS += uip_initialize.c uip_setipid.c uip_input.c uip_send.c -UIP_CSRCS += uip_poll.c uip_chksum.c uip_callback.c +NET_CSRCS += uip_initialize.c uip_setipid.c uip_input.c uip_send.c +NET_CSRCS += uip_poll.c uip_chksum.c uip_callback.c # Non-interrupt level support required? ifeq ($(CONFIG_NET_NOINTS),y) -UIP_CSRCS += uip_lock.c +NET_CSRCS += uip_lock.c endif # IPv6-specific logic ifeq ($(CONFIG_NET_IPv6),y) -UIP_CSRCS += uip_neighbor.c +NET_CSRCS += uip_neighbor.c endif # TCP/IP source files ifeq ($(CONFIG_NET_TCP),y) -UIP_CSRCS += uip_tcpconn.c uip_tcpseqno.c uip_tcppoll.c uip_tcptimer.c -UIP_CSRCS += uip_tcpsend.c uip_tcpinput.c uip_tcpappsend.c uip_listen.c -UIP_CSRCS += uip_tcpcallback.c uip_tcpbacklog.c +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) -UIP_CSRCS += uip_tcpreadahead.c +NET_CSRCS += uip_tcpreadahead.c endif ifeq ($(CONFIG_NET_TCP_WRITE_BUFFERS),y) -UIP_CSRCS += uip_tcpwrbuffer.c +NET_CSRCS += uip_tcpwrbuffer.c endif endif @@ -79,8 +76,8 @@ endif ifeq ($(CONFIG_NET_UDP),y) -UIP_CSRCS += uip_udpconn.c uip_udppoll.c uip_udpsend.c uip_udpinput.c -UIP_CSRCS += uip_udpcallback.c +NET_CSRCS += uip_udpconn.c uip_udppoll.c uip_udpsend.c uip_udpinput.c +NET_CSRCS += uip_udpcallback.c endif @@ -88,22 +85,13 @@ endif ifeq ($(CONFIG_NET_ICMP),y) -UIP_CSRCS += uip_icmpinput.c uip_igmppoll.c +NET_CSRCS += uip_icmpinput.c ifeq ($(CONFIG_NET_ICMP_PING),y) ifneq ($(CONFIG_DISABLE_CLOCK),y) -UIP_CSRCS += uip_icmpping.c uip_icmppoll.c uip_icmpsend.c +NET_CSRCS += uip_icmpping.c uip_icmppoll.c uip_icmpsend.c endif endif - -# IGMP source files - -ifeq ($(CONFIG_NET_IGMP),y) -UIP_CSRCS += uip_igmpgroup.c uip_igmpinit.c uip_igmpinput.c uip_igmpjoin.c -UIP_CSRCS += uip_igmpleave.c uip_igmpmsg.c uip_igmpsend.c uip_igmptimer.c -UIP_CSRCS += uip_mcastmac.c -endif - endif # Include uip build support