Clean up IGMP naming

2 files changed, 95 insertions, 1 deletions

diff --git a/nuttx/net/icmp/Make.defs b/nuttx/net/icmp/Make.defs
index 59ea9bb0b..9e77e257f 100644
--- a/nuttx/net/icmp/Make.defs
+++ b/nuttx/net/icmp/Make.defs
@@ -54,6 +54,5 @@ endif
 
 DEPPATH += --dep-path icmp
 VPATH += :icmp
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)net$(DELIM)icmp}
 
 endif
diff --git a/nuttx/net/icmp/icmp.h b/nuttx/net/icmp/icmp.h
new file mode 100644
index 000000000..fe0376781
--- /dev/null
+++ b/nuttx/net/icmp/icmp.h
@@ -0,0 +1,95 @@
+/****************************************************************************
+ * net/icmp/icmp.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_ICMP_ICMP_H
+#define __NET_ICMP_ICMP_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/types.h>
+
+#ifdef CONFIG_NET_ICMP
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Type Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#ifdef __cplusplus
+#  define EXTERN extern "C"
+extern "C"
+{
+#else
+#  define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/* Defined in icmp_input.c **************************************************/
+
+void icmp_input(FAR struct uip_driver_s *dev);
+
+/* Defined in icmp_poll.c ***************************************************/
+
+#ifdef CONFIG_NET_ICMP_PING
+void icmp_poll(FAR struct uip_driver_s *dev);
+#endif /* CONFIG_NET_ICMP_PING */
+
+/* Defined in icmp_send.c ***************************************************/
+
+#ifdef CONFIG_NET_ICMP_PING
+void icmp_send(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *destaddr);
+#endif /* CONFIG_NET_ICMP_PING */
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CONFIG_NET_ICMP */
+#endif /* __NET_ICMP_ICMP_H */