Move IGMP files from net/uip to net/igmp

12 files changed, 37 insertions, 48 deletions

diff --git a/nuttx/net/Makefile b/nuttx/net/Makefile
index 9e403b92b..f3fda059a 100644
--- a/nuttx/net/Makefile
+++ b/nuttx/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/nuttx/net/uip/uip_igmpgroup.c b/nuttx/net/igmp/igmp_group.c
index ab3beb2f4..fb38cc1cb 100644
--- a/nuttx/net/uip/uip_igmpgroup.c
+++ b/nuttx/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 <nuttx/net/uip/uip.h>
 #include <nuttx/net/uip/uip-igmp.h>
 
-#include "uip_internal.h"
+#include "uip/uip_internal.h"
 
 #ifdef CONFIG_NET_IGMP
 
diff --git a/nuttx/net/uip/uip_igmpinit.c b/nuttx/net/igmp/igmp_init.c
index 4e3b07c50..f0f94198a 100644
--- a/nuttx/net/uip/uip_igmpinit.c
+++ b/nuttx/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 <nuttx/net/uip/uip.h>
 #include <nuttx/net/uip/uip-igmp.h>
 
-#include "uip_internal.h"
+#include "uip/uip_internal.h"
 
 #ifdef CONFIG_NET_IGMP
 
diff --git a/nuttx/net/uip/uip_igmpinput.c b/nuttx/net/igmp/igmp_input.c
index ca766ae8b..1c6f9cc91 100644
--- a/nuttx/net/uip/uip_igmpinput.c
+++ b/nuttx/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 <gnutt@nuttx.org>
@@ -51,7 +51,7 @@
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/uip/uip-igmp.h>
 
-#include "uip_internal.h"
+#include "uip/uip_internal.h"
 
 #ifdef CONFIG_NET_IGMP
 
diff --git a/nuttx/net/uip/uip_igmpjoin.c b/nuttx/net/igmp/igmp_join.c
index 8227dba15..e795d1dd6 100644
--- a/nuttx/net/uip/uip_igmpjoin.c
+++ b/nuttx/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 <gnutt@nuttx.org>
@@ -50,7 +50,7 @@
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/uip/uip-igmp.h>
 
-#include "uip_internal.h"
+#include "uip/uip_internal.h"
 
 #ifdef CONFIG_NET_IGMP
 
diff --git a/nuttx/net/uip/uip_igmpleave.c b/nuttx/net/igmp/igmp_leave.c
index b5a0fddde..f3632e338 100644
--- a/nuttx/net/uip/uip_igmpleave.c
+++ b/nuttx/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 <gnutt@nuttx.org>
@@ -51,7 +51,7 @@
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/uip/uip-igmp.h>
 
-#include "uip_internal.h"
+#include "uip/uip_internal.h"
 
 #ifdef CONFIG_NET_IGMP
 
diff --git a/nuttx/net/uip/uip_mcastmac.c b/nuttx/net/igmp/igmp_mcastmac.c
index b8d2a1dd3..3f8b8369f 100644
--- a/nuttx/net/uip/uip_mcastmac.c
+++ b/nuttx/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 <gnutt@nuttx.org>
@@ -49,7 +49,7 @@
 #include <nuttx/net/uip/uipopt.h>
 #include <nuttx/net/uip/uip.h>
 
-#include "uip_internal.h"
+#include "uip/uip_internal.h"
 
 #ifdef CONFIG_NET_IGMP
 
diff --git a/nuttx/net/uip/uip_igmpmsg.c b/nuttx/net/igmp/igmp_msg.c
index aa6c0318b..b3d1948bf 100644
--- a/nuttx/net/uip/uip_igmpmsg.c
+++ b/nuttx/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 <gnutt@nuttx.org>
@@ -50,7 +50,7 @@
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/uip/uip-igmp.h>
 
-#include "uip_internal.h"
+#include "uip/uip_internal.h"
 
 #ifdef CONFIG_NET_IGMP
 
diff --git a/nuttx/net/uip/uip_igmppoll.c b/nuttx/net/igmp/igmp_poll.c
index b72143374..219ffe217 100644
--- a/nuttx/net/uip/uip_igmppoll.c
+++ b/nuttx/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 <gnutt@nuttx.org>
@@ -50,7 +50,7 @@
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/uip/uip-arch.h>
 
-#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/nuttx/net/uip/uip_igmpsend.c b/nuttx/net/igmp/igmp_send.c
index 26fcad382..32dc1d78f 100644
--- a/nuttx/net/uip/uip_igmpsend.c
+++ b/nuttx/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 <gnutt@nuttx.org>
@@ -48,7 +48,7 @@
 #include <nuttx/net/uip/uip-ipopt.h>
 #include <nuttx/net/uip/uip-igmp.h>
 
-#include "uip_internal.h"
+#include "uip/uip_internal.h"
 
 #ifdef CONFIG_NET_IGMP
 
diff --git a/nuttx/net/uip/uip_igmptimer.c b/nuttx/net/igmp/igmp_timer.c
index 6c6fa0f84..74ee41e5b 100644
--- a/nuttx/net/uip/uip_igmptimer.c
+++ b/nuttx/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 <gnutt@nuttx.org>
@@ -52,7 +52,7 @@
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/uip/uip-igmp.h>
 
-#include "uip_internal.h"
+#include "uip/uip_internal.h"
 
 #ifdef CONFIG_NET_IGMP
 
diff --git a/nuttx/net/uip/Make.defs b/nuttx/net/uip/Make.defs
index 382fb2e5d..24cb9ae97 100644
--- a/nuttx/net/uip/Make.defs
+++ b/nuttx/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