From 626469e30c3073e59a45d65c0314f15ca8facde7 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 24 Jun 2014 08:53:28 -0600 Subject: [PATCH] Move include/nuttx/net/uipopt.h to include/nuttx/net/netconfig.h --- arch/arm/src/lpc17xx/lpc17_ethernet.c | 2 +- arch/mips/src/pic32mx/pic32mx-ethernet.c | 2 +- fs/nfs/nfs_vfsops.c | 2 +- include/nuttx/net/arp.h | 2 +- .../nuttx/net/{uip/uipopt.h => netconfig.h} | 25 +++++++------------ include/nuttx/net/uip/uip-arch.h | 2 +- include/nuttx/net/uip/uip-icmp.h | 2 +- include/nuttx/net/uip/uip-pkt.h | 2 +- include/nuttx/net/uip/uip-tcp.h | 2 +- include/nuttx/net/uip/uip-udp.h | 2 +- include/nuttx/net/uip/uip.h | 2 +- net/arp/arp_inout.c | 2 +- net/arp/arp_table.c | 2 +- net/arp/arp_timer.c | 2 +- net/icmp/icmp_input.c | 2 +- net/icmp/icmp_ping.c | 2 +- net/icmp/icmp_poll.c | 2 +- net/icmp/icmp_send.c | 2 +- net/igmp/igmp_input.c | 2 +- net/igmp/igmp_join.c | 2 +- net/igmp/igmp_leave.c | 2 +- net/igmp/igmp_mcastmac.c | 2 +- net/igmp/igmp_msg.c | 2 +- net/igmp/igmp_poll.c | 2 +- net/igmp/igmp_send.c | 2 +- net/igmp/igmp_timer.c | 2 +- net/pkt/pkt_callback.c | 2 +- net/pkt/pkt_conn.c | 2 +- net/pkt/pkt_poll.c | 2 +- net/tcp/tcp_appsend.c | 2 +- net/tcp/tcp_backlog.c | 2 +- net/tcp/tcp_callback.c | 2 +- net/tcp/tcp_conn.c | 2 +- net/tcp/tcp_input.c | 2 +- net/tcp/tcp_listen.c | 2 +- net/tcp/tcp_poll.c | 2 +- net/tcp/tcp_readahead.c | 2 +- net/tcp/tcp_send.c | 2 +- net/tcp/tcp_seqno.c | 2 +- net/tcp/tcp_timer.c | 2 +- net/tcp/tcp_wrbuffer.c | 2 +- net/udp/udp_callback.c | 2 +- net/udp/udp_conn.c | 2 +- net/udp/udp_input.c | 2 +- net/udp/udp_poll.c | 2 +- net/udp/udp_send.c | 2 +- net/uip/uip_callback.c | 2 +- net/uip/uip_chksum.c | 2 +- net/uip/uip_input.c | 2 +- net/uip/uip_poll.c | 2 +- 50 files changed, 58 insertions(+), 65 deletions(-) rename include/nuttx/net/{uip/uipopt.h => netconfig.h} (92%) diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c index 60dee4a8e0c..cea75f4abec 100644 --- a/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -53,7 +53,7 @@ #include #include -#include +#include #include #include diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c index 5af9e7452d5..de34dc2d724 100644 --- a/arch/mips/src/pic32mx/pic32mx-ethernet.c +++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c @@ -56,7 +56,7 @@ #include #include -#include +#include #include #include diff --git a/fs/nfs/nfs_vfsops.c b/fs/nfs/nfs_vfsops.c index 6da88bb2cf2..0051184e10f 100644 --- a/fs/nfs/nfs_vfsops.c +++ b/fs/nfs/nfs_vfsops.c @@ -70,7 +70,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/nuttx/net/arp.h b/include/nuttx/net/arp.h index e0fea967dc2..c64471ce5aa 100644 --- a/include/nuttx/net/arp.h +++ b/include/nuttx/net/arp.h @@ -51,7 +51,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/include/nuttx/net/uip/uipopt.h b/include/nuttx/net/netconfig.h similarity index 92% rename from include/nuttx/net/uip/uipopt.h rename to include/nuttx/net/netconfig.h index fb85b4ad762..ab2135ee4cf 100644 --- a/include/nuttx/net/uip/uipopt.h +++ b/include/nuttx/net/netconfig.h @@ -1,20 +1,13 @@ /**************************************************************************** - * include/nuttx/net/uip/uipopt.h - * Configuration options for uIP. + * include/nuttx/net/netconfig.h + * Configuration options for NuttX uIP-based networking. * * This file is used for tweaking various configuration options for - * uIP. You should make a copy of this file into one of your project's - * directories instead of editing this example "uipopt.h" file that - * comes with the uIP distribution. + * uIP. This is most assuring the correct default values are provided and + * that configured options are valid. * - * uIP is configured using the per-project configuration file - * uipopt.h. This file contains all compile-time options for uIP and - * should be tweaked to match each specific project. The uIP - * distribution contains a documented example "uipopt.h" that can be - * copied and modified for each project. - * - * Note: Most of the configuration options in the uipopt.h should not - * be changed, but rather the per-project defconfig file. + * Note: Network configuration options the netconfig.h should not be changed, + * but rather the per-project defconfig file. * * Copyright (C) 2007, 2011, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -51,8 +44,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NET_UIP_UIPOPT_H -#define __INCLUDE_NUTTX_NET_UIP_UIPOPT_H +#ifndef __INCLUDE_NUTTX_NET_NETCONFG_H +#define __INCLUDE_NUTTX_NET_NETCONFG_H /**************************************************************************** * Included Files @@ -329,4 +322,4 @@ typedef uint16_t uip_stats_t; -#endif /* __INCLUDE_NUTTX_NET_UIP_UIPOPT_H */ +#endif /* __INCLUDE_NUTTX_NET_NETCONFG_H */ diff --git a/include/nuttx/net/uip/uip-arch.h b/include/nuttx/net/uip/uip-arch.h index 905af0c5072..546fe445118 100644 --- a/include/nuttx/net/uip/uip-arch.h +++ b/include/nuttx/net/uip/uip-arch.h @@ -57,7 +57,7 @@ # include #endif -#include +#include #include /**************************************************************************** diff --git a/include/nuttx/net/uip/uip-icmp.h b/include/nuttx/net/uip/uip-icmp.h index 27098d5d367..849d62af00c 100644 --- a/include/nuttx/net/uip/uip-icmp.h +++ b/include/nuttx/net/uip/uip-icmp.h @@ -48,7 +48,7 @@ #include #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/include/nuttx/net/uip/uip-pkt.h b/include/nuttx/net/uip/uip-pkt.h index 2580b5be60e..1a5f2db4abf 100644 --- a/include/nuttx/net/uip/uip-pkt.h +++ b/include/nuttx/net/uip/uip-pkt.h @@ -47,7 +47,7 @@ #include #include -#include +#include /**************************************************************************** * Public Type Definitions diff --git a/include/nuttx/net/uip/uip-tcp.h b/include/nuttx/net/uip/uip-tcp.h index b1e0fac2ff4..a019f70b0d4 100644 --- a/include/nuttx/net/uip/uip-tcp.h +++ b/include/nuttx/net/uip/uip-tcp.h @@ -55,7 +55,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/include/nuttx/net/uip/uip-udp.h b/include/nuttx/net/uip/uip-udp.h index 5eb7f171160..9cdfb3fe70c 100644 --- a/include/nuttx/net/uip/uip-udp.h +++ b/include/nuttx/net/uip/uip-udp.h @@ -52,7 +52,7 @@ #include #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/include/nuttx/net/uip/uip.h b/include/nuttx/net/uip/uip.h index 65f05a5ec0e..26008279589 100644 --- a/include/nuttx/net/uip/uip.h +++ b/include/nuttx/net/uip/uip.h @@ -60,7 +60,7 @@ #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/net/arp/arp_inout.c b/net/arp/arp_inout.c index 18a1483cad9..14963436ab2 100644 --- a/net/arp/arp_inout.c +++ b/net/arp/arp_inout.c @@ -63,7 +63,7 @@ #include #include -#include +#include #include #include diff --git a/net/arp/arp_table.c b/net/arp/arp_table.c index b4d7ac68442..ebf11e2520a 100644 --- a/net/arp/arp_table.c +++ b/net/arp/arp_table.c @@ -53,7 +53,7 @@ #include #include -#include +#include #include #include diff --git a/net/arp/arp_timer.c b/net/arp/arp_timer.c index d6f105ac18a..6331bda19b3 100644 --- a/net/arp/arp_timer.c +++ b/net/arp/arp_timer.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include "net_internal.h" diff --git a/net/icmp/icmp_input.c b/net/icmp/icmp_input.c index 1e2626f3bff..8434e4ab19b 100644 --- a/net/icmp/icmp_input.c +++ b/net/icmp/icmp_input.c @@ -49,7 +49,7 @@ #include #include -#include +#include #include #include diff --git a/net/icmp/icmp_ping.c b/net/icmp/icmp_ping.c index 32c859ca0e7..66f23cf79d4 100644 --- a/net/icmp/icmp_ping.c +++ b/net/icmp/icmp_ping.c @@ -49,7 +49,7 @@ #include #include -#include +#include #include #include diff --git a/net/icmp/icmp_poll.c b/net/icmp/icmp_poll.c index 747b8ae0530..045facfb5a7 100644 --- a/net/icmp/icmp_poll.c +++ b/net/icmp/icmp_poll.c @@ -42,7 +42,7 @@ #include -#include +#include #include #include diff --git a/net/icmp/icmp_send.c b/net/icmp/icmp_send.c index b46701ed487..8d6232d368c 100644 --- a/net/icmp/icmp_send.c +++ b/net/icmp/icmp_send.c @@ -42,7 +42,7 @@ #include -#include +#include #include #include diff --git a/net/igmp/igmp_input.c b/net/igmp/igmp_input.c index 1c6f9cc9199..660d9f0b066 100644 --- a/net/igmp/igmp_input.c +++ b/net/igmp/igmp_input.c @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include diff --git a/net/igmp/igmp_join.c b/net/igmp/igmp_join.c index e795d1dd6c7..33e5b514040 100644 --- a/net/igmp/igmp_join.c +++ b/net/igmp/igmp_join.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include diff --git a/net/igmp/igmp_leave.c b/net/igmp/igmp_leave.c index f3632e338cc..1b80272ee9c 100644 --- a/net/igmp/igmp_leave.c +++ b/net/igmp/igmp_leave.c @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include diff --git a/net/igmp/igmp_mcastmac.c b/net/igmp/igmp_mcastmac.c index 3f8b8369fdf..937810935f5 100644 --- a/net/igmp/igmp_mcastmac.c +++ b/net/igmp/igmp_mcastmac.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include "uip/uip_internal.h" diff --git a/net/igmp/igmp_msg.c b/net/igmp/igmp_msg.c index b3d1948bfde..ae0155e700c 100644 --- a/net/igmp/igmp_msg.c +++ b/net/igmp/igmp_msg.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include diff --git a/net/igmp/igmp_poll.c b/net/igmp/igmp_poll.c index 219ffe2177d..55b94deb505 100644 --- a/net/igmp/igmp_poll.c +++ b/net/igmp/igmp_poll.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include diff --git a/net/igmp/igmp_send.c b/net/igmp/igmp_send.c index 32dc1d78f46..dbcce795b47 100644 --- a/net/igmp/igmp_send.c +++ b/net/igmp/igmp_send.c @@ -42,7 +42,7 @@ #include #include -#include +#include #include #include #include diff --git a/net/igmp/igmp_timer.c b/net/igmp/igmp_timer.c index 74ee41e5b92..bf700799845 100644 --- a/net/igmp/igmp_timer.c +++ b/net/igmp/igmp_timer.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include diff --git a/net/pkt/pkt_callback.c b/net/pkt/pkt_callback.c index 1110a5a02d8..5bc84fdb256 100644 --- a/net/pkt/pkt_callback.c +++ b/net/pkt/pkt_callback.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include diff --git a/net/pkt/pkt_conn.c b/net/pkt/pkt_conn.c index 1b262195d21..e52be6d48f6 100644 --- a/net/pkt/pkt_conn.c +++ b/net/pkt/pkt_conn.c @@ -50,7 +50,7 @@ #include -#include +#include #include #include #include diff --git a/net/pkt/pkt_poll.c b/net/pkt/pkt_poll.c index 8e8d718471b..ab34a3b9ae0 100644 --- a/net/pkt/pkt_poll.c +++ b/net/pkt/pkt_poll.c @@ -47,7 +47,7 @@ #include -#include +#include #include #include #include diff --git a/net/tcp/tcp_appsend.c b/net/tcp/tcp_appsend.c index 857ca4385d5..79b27efe0b8 100644 --- a/net/tcp/tcp_appsend.c +++ b/net/tcp/tcp_appsend.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include diff --git a/net/tcp/tcp_backlog.c b/net/tcp/tcp_backlog.c index a1a16323e0d..8fa70722342 100644 --- a/net/tcp/tcp_backlog.c +++ b/net/tcp/tcp_backlog.c @@ -37,7 +37,7 @@ * Included Files ****************************************************************************/ -#include +#include #if defined(CONFIG_NET) && defined(CONFIG_NET_TCP) && defined(CONFIG_NET_TCPBACKLOG) #include diff --git a/net/tcp/tcp_callback.c b/net/tcp/tcp_callback.c index 6a142262873..8a15e86e203 100644 --- a/net/tcp/tcp_callback.c +++ b/net/tcp/tcp_callback.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/net/tcp/tcp_conn.c b/net/tcp/tcp_conn.c index bae10a75491..87b8881c274 100644 --- a/net/tcp/tcp_conn.c +++ b/net/tcp/tcp_conn.c @@ -51,7 +51,7 @@ #include -#include +#include #include #include diff --git a/net/tcp/tcp_input.c b/net/tcp/tcp_input.c index bbd44ee6ff1..76d688eda6d 100644 --- a/net/tcp/tcp_input.c +++ b/net/tcp/tcp_input.c @@ -50,7 +50,7 @@ #include #include -#include +#include #include #include diff --git a/net/tcp/tcp_listen.c b/net/tcp/tcp_listen.c index 4a597809169..f974d3f6fb1 100644 --- a/net/tcp/tcp_listen.c +++ b/net/tcp/tcp_listen.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include "uip/uip_internal.h" diff --git a/net/tcp/tcp_poll.c b/net/tcp/tcp_poll.c index ac4cdb8f3d2..39955b7f12c 100644 --- a/net/tcp/tcp_poll.c +++ b/net/tcp/tcp_poll.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include diff --git a/net/tcp/tcp_readahead.c b/net/tcp/tcp_readahead.c index 5ac4a42ac96..280b5469c5f 100644 --- a/net/tcp/tcp_readahead.c +++ b/net/tcp/tcp_readahead.c @@ -37,7 +37,7 @@ * Included Files ****************************************************************************/ -#include +#include #if defined(CONFIG_NET) && defined(CONFIG_NET_TCP) && defined(CONFIG_NET_TCP_READAHEAD) #include diff --git a/net/tcp/tcp_send.c b/net/tcp/tcp_send.c index 3e313f2147f..4d98e269cea 100644 --- a/net/tcp/tcp_send.c +++ b/net/tcp/tcp_send.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include diff --git a/net/tcp/tcp_seqno.c b/net/tcp/tcp_seqno.c index 625eefeb25b..5242fe9a0b5 100644 --- a/net/tcp/tcp_seqno.c +++ b/net/tcp/tcp_seqno.c @@ -50,7 +50,7 @@ #include #include -#include +#include #include #include diff --git a/net/tcp/tcp_timer.c b/net/tcp/tcp_timer.c index edcdb9c2426..06be1902f1a 100644 --- a/net/tcp/tcp_timer.c +++ b/net/tcp/tcp_timer.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include diff --git a/net/tcp/tcp_wrbuffer.c b/net/tcp/tcp_wrbuffer.c index 929b2f3a27c..0cdd99c97d2 100644 --- a/net/tcp/tcp_wrbuffer.c +++ b/net/tcp/tcp_wrbuffer.c @@ -38,7 +38,7 @@ * Included Files ****************************************************************************/ -#include +#include #if defined(CONFIG_NET) && defined(CONFIG_NET_TCP) && defined(CONFIG_NET_TCP_WRITE_BUFFERS) #if defined(CONFIG_DEBUG) && defined(CONFIG_NET_TCP_WRBUFFER_DEBUG) diff --git a/net/udp/udp_callback.c b/net/udp/udp_callback.c index 9cdc8633dfb..cec22630caf 100644 --- a/net/udp/udp_callback.c +++ b/net/udp/udp_callback.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include diff --git a/net/udp/udp_conn.c b/net/udp/udp_conn.c index 0d36d7d6787..f1c0195c28f 100644 --- a/net/udp/udp_conn.c +++ b/net/udp/udp_conn.c @@ -56,7 +56,7 @@ #include -#include +#include #include #include diff --git a/net/udp/udp_input.c b/net/udp/udp_input.c index e2d7c434f32..f9e7107953d 100644 --- a/net/udp/udp_input.c +++ b/net/udp/udp_input.c @@ -47,7 +47,7 @@ #include -#include +#include #include #include diff --git a/net/udp/udp_poll.c b/net/udp/udp_poll.c index 23b66325031..b565e50e8d1 100644 --- a/net/udp/udp_poll.c +++ b/net/udp/udp_poll.c @@ -47,7 +47,7 @@ #include -#include +#include #include #include diff --git a/net/udp/udp_send.c b/net/udp/udp_send.c index aab52f6d4d0..4296d69e95c 100644 --- a/net/udp/udp_send.c +++ b/net/udp/udp_send.c @@ -46,7 +46,7 @@ #include -#include +#include #include #include diff --git a/net/uip/uip_callback.c b/net/uip/uip_callback.c index 4ed830e9560..3c8bb19f86a 100644 --- a/net/uip/uip_callback.c +++ b/net/uip/uip_callback.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include diff --git a/net/uip/uip_chksum.c b/net/uip/uip_chksum.c index 9f4a89866e7..8670f2e1e43 100644 --- a/net/uip/uip_chksum.c +++ b/net/uip/uip_chksum.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include diff --git a/net/uip/uip_input.c b/net/uip/uip_input.c index fa0496ad9b0..0bff32387bb 100644 --- a/net/uip/uip_input.c +++ b/net/uip/uip_input.c @@ -85,7 +85,7 @@ #include #include -#include +#include #include #include diff --git a/net/uip/uip_poll.c b/net/uip/uip_poll.c index 644c1e98c83..25185e4f95e 100644 --- a/net/uip/uip_poll.c +++ b/net/uip/uip_poll.c @@ -42,7 +42,7 @@ #include -#include +#include #include #include