diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-06-24 10:14:15 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-06-24 10:14:15 -0600 |
| commit | 2399e0d1f94d9ac375ec43ee728124cd2c137915 (patch) | |
| tree | 53a356248d4efa61e643852cad4e18dd5b634483 | |
| parent | 47b78f32cc766651d93c79d1edbf61876d419bad (diff) | |
| download | nuttx-2399e0d1f94d9ac375ec43ee728124cd2c137915.tar.gz nuttx-2399e0d1f94d9ac375ec43ee728124cd2c137915.tar.bz2 nuttx-2399e0d1f94d9ac375ec43ee728124cd2c137915.zip | |
Move the remaining files from include/nuttx/net/uip to include/nuttx/net; Rename *_internal.h header files in net/ to just *.h
146 files changed, 257 insertions, 257 deletions
diff --git a/apps/examples/discover/discover_main.c b/apps/examples/discover/discover_main.c index 0fc6e7b7b..50f8dccc4 100644 --- a/apps/examples/discover/discover_main.c +++ b/apps/examples/discover/discover_main.c @@ -48,7 +48,7 @@ #include <debug.h> #include <net/if.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <apps/netutils/uiplib.h> diff --git a/apps/examples/igmp/igmp.c b/apps/examples/igmp/igmp.c index d50ea4a93..cb8feb002 100644 --- a/apps/examples/igmp/igmp.c +++ b/apps/examples/igmp/igmp.c @@ -45,7 +45,7 @@ #include <debug.h> #include <net/if.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <apps/netutils/uiplib.h> #include <apps/netutils/ipmsfilter.h> diff --git a/apps/examples/nettest/nettest.c b/apps/examples/nettest/nettest.c index 81faf9b93..770d282d3 100644 --- a/apps/examples/nettest/nettest.c +++ b/apps/examples/nettest/nettest.c @@ -44,7 +44,7 @@ #include <debug.h> #include <net/if.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <apps/netutils/uiplib.h> #include "nettest.h" diff --git a/apps/examples/tcpecho/tcpecho_main.c b/apps/examples/tcpecho/tcpecho_main.c index 88b931def..831f1f483 100644 --- a/apps/examples/tcpecho/tcpecho_main.c +++ b/apps/examples/tcpecho/tcpecho_main.c @@ -54,7 +54,7 @@ #include <unistd.h> #include <net/if.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <apps/netutils/uiplib.h> diff --git a/apps/examples/udp/target.c b/apps/examples/udp/target.c index d7b64638d..229dc261b 100644 --- a/apps/examples/udp/target.c +++ b/apps/examples/udp/target.c @@ -41,7 +41,7 @@ #include <stdio.h> #include <debug.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <apps/netutils/uiplib.h> #include "udp-internal.h" diff --git a/apps/examples/uip/uip_main.c b/apps/examples/uip/uip_main.c index 68fc20bf5..03da23df3 100644 --- a/apps/examples/uip/uip_main.c +++ b/apps/examples/uip/uip_main.c @@ -54,7 +54,7 @@ #include <debug.h> #include <net/if.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <apps/netutils/uiplib.h> diff --git a/apps/examples/wget/target.c b/apps/examples/wget/target.c index 62bb08978..9c795d1e2 100644 --- a/apps/examples/wget/target.c +++ b/apps/examples/wget/target.c @@ -46,7 +46,7 @@ #include <arpa/inet.h> #include <net/if.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <apps/netutils/uiplib.h> #include <apps/netutils/dnsclient.h> diff --git a/apps/examples/xmlrpc/xmlrpc_main.c b/apps/examples/xmlrpc/xmlrpc_main.c index 5d4e52299..e115bb0ae 100644 --- a/apps/examples/xmlrpc/xmlrpc_main.c +++ b/apps/examples/xmlrpc/xmlrpc_main.c @@ -63,7 +63,7 @@ #include <unistd.h> #include <net/if.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <apps/netutils/uiplib.h> diff --git a/apps/include/netutils/httpd.h b/apps/include/netutils/httpd.h index 706c3fd24..56e5da38a 100644 --- a/apps/include/netutils/httpd.h +++ b/apps/include/netutils/httpd.h @@ -44,7 +44,7 @@ * Included Files ****************************************************************************/ -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <stdint.h> #include <stdbool.h> diff --git a/apps/include/netutils/smtp.h b/apps/include/netutils/smtp.h index 5392babc2..05b4d543e 100644 --- a/apps/include/netutils/smtp.h +++ b/apps/include/netutils/smtp.h @@ -45,7 +45,7 @@ ****************************************************************************/ #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> /**************************************************************************** * Type Definitions diff --git a/apps/netutils/dhcpc/dhcpc.c b/apps/netutils/dhcpc/dhcpc.c index b34320230..fab4a3bcf 100644 --- a/apps/netutils/dhcpc/dhcpc.c +++ b/apps/netutils/dhcpc/dhcpc.c @@ -52,7 +52,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <apps/netutils/dhcpc.h> #include <apps/netutils/uiplib.h> diff --git a/apps/netutils/smtp/smtp.c b/apps/netutils/smtp/smtp.c index 08ff295ef..d83e260c5 100644 --- a/apps/netutils/smtp/smtp.c +++ b/apps/netutils/smtp/smtp.c @@ -57,7 +57,7 @@ #include <semaphore.h> #include <sys/socket.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <apps/netutils/smtp.h> /**************************************************************************** diff --git a/apps/netutils/tftpc/tftpc_get.c b/apps/netutils/tftpc/tftpc_get.c index 0c92f4a73..96ed2b4eb 100644 --- a/apps/netutils/tftpc/tftpc_get.c +++ b/apps/netutils/tftpc/tftpc_get.c @@ -50,7 +50,7 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <apps/netutils/tftp.h> #include "tftpc_internal.h" diff --git a/apps/netutils/tftpc/tftpc_packets.c b/apps/netutils/tftpc/tftpc_packets.c index d1e41f2d4..1df916a6a 100644 --- a/apps/netutils/tftpc/tftpc_packets.c +++ b/apps/netutils/tftpc/tftpc_packets.c @@ -52,7 +52,7 @@ #include <netinet/in.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <apps/netutils/tftp.h> #include "tftpc_internal.h" diff --git a/apps/netutils/tftpc/tftpc_put.c b/apps/netutils/tftpc/tftpc_put.c index e04a5dc43..19f33676e 100644 --- a/apps/netutils/tftpc/tftpc_put.c +++ b/apps/netutils/tftpc/tftpc_put.c @@ -50,7 +50,7 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <apps/netutils/tftp.h> #include "tftpc_internal.h" diff --git a/apps/netutils/uiplib/uiplib.c b/apps/netutils/uiplib/uiplib.c index c8051233e..4644c61b0 100644 --- a/apps/netutils/uiplib/uiplib.c +++ b/apps/netutils/uiplib/uiplib.c @@ -48,7 +48,7 @@ #include <string.h> #include <debug.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <apps/netutils/uiplib.h> diff --git a/apps/netutils/webserver/httpd.c b/apps/netutils/webserver/httpd.c index 3f9863f6f..26989611b 100644 --- a/apps/netutils/webserver/httpd.c +++ b/apps/netutils/webserver/httpd.c @@ -61,7 +61,7 @@ # include <pthread.h> #endif -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <apps/netutils/uiplib.h> #include <apps/netutils/httpd.h> diff --git a/apps/nshlib/nsh_netcmds.c b/apps/nshlib/nsh_netcmds.c index b8e90b933..8ceadd182 100644 --- a/apps/nshlib/nsh_netcmds.c +++ b/apps/nshlib/nsh_netcmds.c @@ -59,11 +59,11 @@ #include <nuttx/net/net.h> #include <nuttx/clock.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> #ifdef CONFIG_NET_STATISTICS -# include <nuttx/net/uip/uip.h> +# include <nuttx/net/uip.h> #endif #if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \ diff --git a/nuttx/arch/arm/src/c5471/c5471_ethernet.c b/nuttx/arch/arm/src/c5471/c5471_ethernet.c index 6d35231ab..54628c6f1 100644 --- a/nuttx/arch/arm/src/c5471/c5471_ethernet.c +++ b/nuttx/arch/arm/src/c5471/c5471_ethernet.c @@ -58,7 +58,7 @@ #include <nuttx/arch.h> #include <net/ethernet.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/arch/arm/src/kinetis/kinetis_enet.c b/nuttx/arch/arm/src/kinetis/kinetis_enet.c index 10d58e838..51bf26ff1 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_enet.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_enet.c @@ -53,7 +53,7 @@ #include <nuttx/arch.h> #include <nuttx/net/mii.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c index ee3fd5bfb..31f326995 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -52,7 +52,7 @@ #include <nuttx/arch.h> #include <nuttx/net/mii.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netconfig.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/arch/arm/src/sam34/sam_emac.c b/nuttx/arch/arm/src/sam34/sam_emac.c index da1647ddc..31da83f29 100644 --- a/nuttx/arch/arm/src/sam34/sam_emac.c +++ b/nuttx/arch/arm/src/sam34/sam_emac.c @@ -63,7 +63,7 @@ #include <nuttx/arch.h> #include <nuttx/kmalloc.h> #include <nuttx/net/mii.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/arch/arm/src/sama5/sam_emaca.c b/nuttx/arch/arm/src/sama5/sam_emaca.c index 315f68d21..09564ddaa 100644 --- a/nuttx/arch/arm/src/sama5/sam_emaca.c +++ b/nuttx/arch/arm/src/sama5/sam_emaca.c @@ -64,7 +64,7 @@ #include <nuttx/arch.h> #include <nuttx/kmalloc.h> #include <nuttx/net/mii.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/arch/arm/src/sama5/sam_emacb.c b/nuttx/arch/arm/src/sama5/sam_emacb.c index 3e80ba685..318a61f00 100644 --- a/nuttx/arch/arm/src/sama5/sam_emacb.c +++ b/nuttx/arch/arm/src/sama5/sam_emacb.c @@ -71,7 +71,7 @@ #include <nuttx/arch.h> #include <nuttx/kmalloc.h> #include <nuttx/net/mii.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/arch/arm/src/sama5/sam_gmac.c b/nuttx/arch/arm/src/sama5/sam_gmac.c index 3318cb45c..081835778 100644 --- a/nuttx/arch/arm/src/sama5/sam_gmac.c +++ b/nuttx/arch/arm/src/sama5/sam_gmac.c @@ -61,7 +61,7 @@ #include <nuttx/arch.h> #include <nuttx/kmalloc.h> #include <nuttx/net/gmii.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/arch/arm/src/stm32/stm32_eth.c b/nuttx/arch/arm/src/stm32/stm32_eth.c index 8797c6472..f16f74076 100644 --- a/nuttx/arch/arm/src/stm32/stm32_eth.c +++ b/nuttx/arch/arm/src/stm32/stm32_eth.c @@ -53,11 +53,11 @@ #include <nuttx/arch.h> #include <nuttx/net/mii.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> #if defined(CONFIG_NET_PKT) -# include <nuttx/net/uip/uip-pkt.h> +# include <nuttx/net/pkt.h> #endif #include "up_internal.h" diff --git a/nuttx/arch/arm/src/tiva/tiva_ethernet.c b/nuttx/arch/arm/src/tiva/tiva_ethernet.c index 091f445e4..b605360f6 100644 --- a/nuttx/arch/arm/src/tiva/tiva_ethernet.c +++ b/nuttx/arch/arm/src/tiva/tiva_ethernet.c @@ -51,7 +51,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/board/board.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c index c03395cf6..14e49a571 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c @@ -51,7 +51,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c index 9b2815b69..45ebbe599 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c @@ -55,7 +55,7 @@ #include <nuttx/arch.h> #include <nuttx/net/mii.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netconfig.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/arch/sim/src/up_uipdriver.c b/nuttx/arch/sim/src/up_uipdriver.c index 255e3ad4f..9693bc0d2 100644 --- a/nuttx/arch/sim/src/up_uipdriver.c +++ b/nuttx/arch/sim/src/up_uipdriver.c @@ -53,7 +53,7 @@ #include <nuttx/net/net.h> #include <net/ethernet.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> #include <nuttx/net/arp.h> diff --git a/nuttx/arch/z80/src/ez80/ez80_emac.c b/nuttx/arch/z80/src/ez80/ez80_emac.c index 11547ea48..3967b38e7 100644 --- a/nuttx/arch/z80/src/ez80/ez80_emac.c +++ b/nuttx/arch/z80/src/ez80/ez80_emac.c @@ -58,7 +58,7 @@ #include <arch/io.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/drivers/net/cs89x0.c b/nuttx/drivers/net/cs89x0.c index 881be0d34..59a09f394 100644 --- a/nuttx/drivers/net/cs89x0.c +++ b/nuttx/drivers/net/cs89x0.c @@ -51,7 +51,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/drivers/net/dm90x0.c b/nuttx/drivers/net/dm90x0.c index d3d34283f..9bceaa429 100644 --- a/nuttx/drivers/net/dm90x0.c +++ b/nuttx/drivers/net/dm90x0.c @@ -64,7 +64,7 @@ #include <nuttx/arch.h> #include <net/ethernet.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/drivers/net/e1000.c b/nuttx/drivers/net/e1000.c index d010c37a0..fd4f0c940 100644 --- a/nuttx/drivers/net/e1000.c +++ b/nuttx/drivers/net/e1000.c @@ -54,7 +54,7 @@ #include <nuttx/arch.h> #include <nuttx/kmalloc.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/drivers/net/enc28j60.c b/nuttx/drivers/net/enc28j60.c index 02ed7f32e..e5c4e033b 100644 --- a/nuttx/drivers/net/enc28j60.c +++ b/nuttx/drivers/net/enc28j60.c @@ -61,7 +61,7 @@ #include <nuttx/clock.h> #include <nuttx/net/enc28j60.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/drivers/net/encx24j600.c b/nuttx/drivers/net/encx24j600.c index ee68f5cd3..a67d7453d 100644 --- a/nuttx/drivers/net/encx24j600.c +++ b/nuttx/drivers/net/encx24j600.c @@ -67,7 +67,7 @@ #include <nuttx/clock.h> #include <nuttx/net/encx24j600.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/drivers/net/skeleton.c b/nuttx/drivers/net/skeleton.c index bdbffdc32..bbe5a9673 100644 --- a/nuttx/drivers/net/skeleton.c +++ b/nuttx/drivers/net/skeleton.c @@ -51,7 +51,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/drivers/net/slip.c b/nuttx/drivers/net/slip.c index 734f3510a..01caecba6 100644 --- a/nuttx/drivers/net/slip.c +++ b/nuttx/drivers/net/slip.c @@ -57,7 +57,7 @@ #include <nuttx/irq.h> #include <nuttx/net/net.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> #if defined(CONFIG_NET) && defined(CONFIG_NET_SLIP) diff --git a/nuttx/drivers/net/vnet.c b/nuttx/drivers/net/vnet.c index 7f94ec33c..a106c1a38 100644 --- a/nuttx/drivers/net/vnet.c +++ b/nuttx/drivers/net/vnet.c @@ -55,7 +55,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/fs/nfs/nfs_vfsops.c b/nuttx/fs/nfs/nfs_vfsops.c index 0051184e1..0a45c0307 100644 --- a/nuttx/fs/nfs/nfs_vfsops.c +++ b/nuttx/fs/nfs/nfs_vfsops.c @@ -68,8 +68,8 @@ #include <nuttx/fs/dirent.h> #include <nuttx/fs/fs.h> #include <nuttx/fs/nfs.h> -#include <nuttx/net/uip/uip.h> -#include <nuttx/net/uip/uip-udp.h> +#include <nuttx/net/uip.h> +#include <nuttx/net/udp.h> #include <nuttx/net/netconfig.h> #include <net/if.h> diff --git a/nuttx/include/nuttx/net/arp.h b/nuttx/include/nuttx/net/arp.h index c64471ce5..524490bb4 100644 --- a/nuttx/include/nuttx/net/arp.h +++ b/nuttx/include/nuttx/net/arp.h @@ -52,7 +52,7 @@ #include <net/ethernet.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/include/nuttx/net/uip/uip-icmp.h b/nuttx/include/nuttx/net/icmp.h index 849d62af0..87464c73f 100644 --- a/nuttx/include/nuttx/net/uip/uip-icmp.h +++ b/nuttx/include/nuttx/net/icmp.h @@ -1,8 +1,8 @@ /**************************************************************************** - * include/nuttx/net/uip/uip-icmp.h + * include/nuttx/net/icmp.h * Header file for the uIP ICMP stack. * - * Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * This logic was leveraged from uIP which also has a BSD-style license: @@ -38,8 +38,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_ICMP_H -#define __INCLUDE_NUTTX_NET_UIP_UIP_ICMP_H +#ifndef __INCLUDE_NUTTX_NET_ICMP_H +#define __INCLUDE_NUTTX_NET_ICMP_H /**************************************************************************** * Included Files @@ -208,4 +208,4 @@ EXTERN int uip_ping(uip_ipaddr_t addr, uint16_t id, uint16_t seqno, uint16_t dat #ifdef __cplusplus } #endif -#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_ICMP_H */ +#endif /* __INCLUDE_NUTTX_NET_ICMP_H */ diff --git a/nuttx/include/nuttx/net/uip/uip-igmp.h b/nuttx/include/nuttx/net/igmp.h index d3c021b66..8f6c4daf8 100644 --- a/nuttx/include/nuttx/net/uip/uip-igmp.h +++ b/nuttx/include/nuttx/net/igmp.h @@ -1,9 +1,9 @@ /**************************************************************************** - * include/nuttx/net/uip/uip-igmp.h + * include/nuttx/net/igmp.h * The definitions in this header file are intended only for internal use * by the NuttX port of the uIP stack. * - * Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2010, 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * The NuttX implementation of IGMP was inspired by the IGMP add-on for the @@ -39,8 +39,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_IGMP_H -#define __INCLUDE_NUTTX_NET_UIP_UIP_IGMP_H +#ifndef __INCLUDE_NUTTX_NET_IGMP_H +#define __INCLUDE_NUTTX_NET_IGMP_H /**************************************************************************** * Included Files @@ -54,7 +54,7 @@ #include <netinet/in.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> #ifdef CONFIG_NET_IGMP @@ -255,4 +255,4 @@ EXTERN int igmp_leavegroup(struct uip_driver_s *dev, FAR const struct in_addr * #endif #endif /* CONFIG_NET_IGMP */ -#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_IGMP_H */ +#endif /* __INCLUDE_NUTTX_NET_IGMP_H */ diff --git a/nuttx/include/nuttx/net/uip/uip-ipopt.h b/nuttx/include/nuttx/net/ip.h index 7aa4114db..4cbfd824a 100644 --- a/nuttx/include/nuttx/net/uip/uip-ipopt.h +++ b/nuttx/include/nuttx/net/ip.h @@ -1,9 +1,9 @@ /************************************************************************************************************ - * include/nuttx/net/uip/uip-ipopt.h + * include/nuttx/net/ip.h * * Defines values for the IP header options * - * Copyright (C) 2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2010, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -35,8 +35,8 @@ * ************************************************************************************************************/ -#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_IPOPT_H -#define __INCLUDE_NUTTX_NET_UIP_UIP_IPOPT_H +#ifndef __INCLUDE_NUTTX_NET_IP_H +#define __INCLUDE_NUTTX_NET_IP_H /************************************************************************************************************ * Included Files @@ -248,4 +248,4 @@ * Public Function Prototypes ************************************************************************************************************/ -#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_IPOPT_H */ +#endif /* __INCLUDE_NUTTX_NET_IP_H */ diff --git a/nuttx/include/nuttx/net/net.h b/nuttx/include/nuttx/net/net.h index c433d25b9..d8b6b1f39 100644 --- a/nuttx/include/nuttx/net/net.h +++ b/nuttx/include/nuttx/net/net.h @@ -48,7 +48,7 @@ #include <stdarg.h> #include <semaphore.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/include/nuttx/net/netdev.h b/nuttx/include/nuttx/net/netdev.h index 7f7733d2a..9c6cbd441 100644 --- a/nuttx/include/nuttx/net/netdev.h +++ b/nuttx/include/nuttx/net/netdev.h @@ -52,9 +52,9 @@ #include <stdint.h> #include <net/if.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #ifdef CONFIG_NET_IGMP -# include <nuttx/net/uip/uip-igmp.h> +# include <nuttx/net/igmp.h> #endif #include <nuttx/net/netconfig.h> diff --git a/nuttx/include/nuttx/net/uip/uip-pkt.h b/nuttx/include/nuttx/net/pkt.h index 1a5f2db4a..8db02e923 100644 --- a/nuttx/include/nuttx/net/uip/uip-pkt.h +++ b/nuttx/include/nuttx/net/pkt.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/netpacket/netpacket.h + * include/nuttx/net/pkt.h * Definitions for use with AF_PACKET sockets * * Copyright (C) 2014 Gregory Nutt. All rights reserved. @@ -37,8 +37,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_PKT_H -#define __INCLUDE_NUTTX_NET_UIP_UIP_PKT_H +#ifndef __INCLUDE_NUTTX_NET_PKT_H +#define __INCLUDE_NUTTX_NET_PKT_H /**************************************************************************** * Included Files @@ -103,4 +103,4 @@ void uip_pktpoll(struct uip_driver_s *dev, struct uip_pkt_conn *conn); int uip_pktinput(struct uip_driver_s *dev); -#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_PKT_H */ +#endif /* __INCLUDE_NUTTX_NET_PKT_H */ diff --git a/nuttx/include/nuttx/net/uip/uip-tcp.h b/nuttx/include/nuttx/net/tcp.h index a019f70b0..05ccf4c4a 100644 --- a/nuttx/include/nuttx/net/uip/uip-tcp.h +++ b/nuttx/include/nuttx/net/tcp.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/nuttx/net/uip/uip-tcp.h + * include/nuttx/net/tcp.h * Header file for the uIP TCP/IP stack. * * The uIP TCP/IP stack header file contains definitions for a number @@ -43,8 +43,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_TCP_H -#define __INCLUDE_NUTTX_NET_UIP_UIP_TCP_H +#ifndef __INCLUDE_NUTTX_NET_TCP_H +#define __INCLUDE_NUTTX_NET_TCP_H /**************************************************************************** * Included Files @@ -56,7 +56,7 @@ #include <stdint.h> #include <stdbool.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> /**************************************************************************** * Pre-processor Definitions @@ -526,4 +526,4 @@ int uip_backlogdelete(FAR struct uip_conn *conn, FAR struct uip_conn *blconn); #define uip_mss(conn) ((conn)->mss) #endif /* CONFIG_NET_TCP */ -#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_TCP_H */ +#endif /* __INCLUDE_NUTTX_NET_TCP_H */ diff --git a/nuttx/include/nuttx/net/uip/uip-udp.h b/nuttx/include/nuttx/net/udp.h index 9cdfb3fe7..2b90dce79 100644 --- a/nuttx/include/nuttx/net/uip/uip-udp.h +++ b/nuttx/include/nuttx/net/udp.h @@ -1,12 +1,12 @@ /**************************************************************************** - * include/nuttx/net/uip/uip-udp.h + * include/nuttx/net/udp.h * Header file for the uIP UDP stack. * * The uIP UDP stack header file contains definitions for a number * of C macros that are used by uIP programs as well as internal uIP * structures, UDP header structures and function declarations. * - * Copyright (C) 2007, 2009, 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009, 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * This logic was leveraged from uIP which also has a BSD-style license: @@ -42,8 +42,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_UDP_H -#define __INCLUDE_NUTTX_NET_UIP_UIP_UDP_H +#ifndef __INCLUDE_NUTTX_NET_UDP_H +#define __INCLUDE_NUTTX_NET_UDP_H /**************************************************************************** * Included Files @@ -203,4 +203,4 @@ extern int uip_udpconnect(struct uip_udp_conn *conn, const struct sockaddr_in *a extern void uip_udpenable(struct uip_udp_conn *conn); extern void uip_udpdisable(struct uip_udp_conn *conn); -#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_UDP_H */ +#endif /* __INCLUDE_NUTTX_NET_UDP_H */ diff --git a/nuttx/include/nuttx/net/uip/uip.h b/nuttx/include/nuttx/net/uip.h index 260082795..3725f423f 100644 --- a/nuttx/include/nuttx/net/uip/uip.h +++ b/nuttx/include/nuttx/net/uip.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/nuttx/net/uip/uip.h + * include/nuttx/net/uip.h * * The uIP header file contains definitions for a number of C macros that * are used by uIP programs as well as internal uIP structures and function @@ -41,8 +41,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_H -#define __INCLUDE_NUTTX_NET_UIP_UIP_H +#ifndef __INCLUDE_NUTTX_NET_UIP_H +#define __INCLUDE_NUTTX_NET_UIP_H /**************************************************************************** * Included Files @@ -228,19 +228,19 @@ struct uip_callback_s /* Protocol-specific support */ #ifdef CONFIG_NET_PKT -# include <nuttx/net/uip/uip-pkt.h> +# include <nuttx/net/pkt.h> #endif #ifdef CONFIG_NET_TCP -# include <nuttx/net/uip/uip-tcp.h> +# include <nuttx/net/tcp.h> #endif #ifdef CONFIG_NET_UDP -# include <nuttx/net/uip/uip-udp.h> +# include <nuttx/net/udp.h> #endif #ifdef CONFIG_NET_ICMP -# include <nuttx/net/uip/uip-icmp.h> +# include <nuttx/net/icmp.h> #endif #ifdef CONFIG_NET_IGMP -# include <nuttx/net/uip/uip-igmp.h> +# include <nuttx/net/igmp.h> #endif /* The structure holding the uIP statistics that are gathered if @@ -581,4 +581,4 @@ bool uip_ipaddr_maskcmp(uip_ipaddr_t addr1, uip_ipaddr_t addr2, (in_addr_t)(dest) = (in_addr_t)(src) & (in_addr_t)(mask); \ } while (0) -#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_H */ +#endif /* __INCLUDE_NUTTX_NET_UIP_H */ diff --git a/nuttx/net/accept.c b/nuttx/net/accept.c index 07e3f983e..d6a4ed84e 100644 --- a/nuttx/net/accept.c +++ b/nuttx/net/accept.c @@ -51,7 +51,7 @@ #include <arch/irq.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Definitions diff --git a/nuttx/net/arp/arp_timer.c b/nuttx/net/arp/arp_timer.c index 6331bda19..059f1577a 100644 --- a/nuttx/net/arp/arp_timer.c +++ b/nuttx/net/arp/arp_timer.c @@ -48,7 +48,7 @@ #include <nuttx/net/netconfig.h> #include <nuttx/net/arp.h> -#include "net_internal.h" +#include "net.h" #ifdef CONFIG_NET_ARP diff --git a/nuttx/net/bind.c b/nuttx/net/bind.c index 48e0ad3af..0d1a35cfe 100644 --- a/nuttx/net/bind.c +++ b/nuttx/net/bind.c @@ -49,7 +49,7 @@ # include <netpacket/packet.h> #endif -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Private Functions diff --git a/nuttx/net/connect.c b/nuttx/net/connect.c index 9ffd4a15c..0e28d91c5 100644 --- a/nuttx/net/connect.c +++ b/nuttx/net/connect.c @@ -50,8 +50,8 @@ #include <arch/irq.h> #include <nuttx/net/netdev.h> -#include "net_internal.h" -#include "uip/uip_internal.h" +#include "net.h" +#include "uip/uip.h" /**************************************************************************** * Private Types diff --git a/nuttx/net/getsockname.c b/nuttx/net/getsockname.c index fd5121308..ba15055e1 100644 --- a/nuttx/net/getsockname.c +++ b/nuttx/net/getsockname.c @@ -48,7 +48,7 @@ #include <nuttx/net/net.h> #include <nuttx/net/netdev.h> -#include "net_internal.h" +#include "net.h" #ifdef CONFIG_NET diff --git a/nuttx/net/getsockopt.c b/nuttx/net/getsockopt.c index 405823fb4..d1b8578c4 100644 --- a/nuttx/net/getsockopt.c +++ b/nuttx/net/getsockopt.c @@ -44,7 +44,7 @@ #include <sys/socket.h> #include <errno.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Global Functions diff --git a/nuttx/net/icmp/icmp_input.c b/nuttx/net/icmp/icmp_input.c index 83fe252a9..94087b9ae 100644 --- a/nuttx/net/icmp/icmp_input.c +++ b/nuttx/net/icmp/icmp_input.c @@ -50,10 +50,10 @@ #include <net/if.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" #ifdef CONFIG_NET_ICMP diff --git a/nuttx/net/icmp/icmp_ping.c b/nuttx/net/icmp/icmp_ping.c index 9394a49ce..adcc3626c 100644 --- a/nuttx/net/icmp/icmp_ping.c +++ b/nuttx/net/icmp/icmp_ping.c @@ -50,11 +50,11 @@ #include <net/if.h> #include <nuttx/clock.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip/uip_internal.h" -#include "../net_internal.h" /* Should not include this! */ +#include "uip/uip.h" +#include "../net.h" /* Should not include this! */ /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/icmp/icmp_poll.c b/nuttx/net/icmp/icmp_poll.c index d3b6014c7..2d79255e7 100644 --- a/nuttx/net/icmp/icmp_poll.c +++ b/nuttx/net/icmp/icmp_poll.c @@ -43,10 +43,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/icmp/icmp_send.c b/nuttx/net/icmp/icmp_send.c index 603a477f9..96df208ea 100644 --- a/nuttx/net/icmp/icmp_send.c +++ b/nuttx/net/icmp/icmp_send.c @@ -43,10 +43,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/igmp/igmp_group.c b/nuttx/net/igmp/igmp_group.c index fb38cc1cb..1fbcaa08a 100644 --- a/nuttx/net/igmp/igmp_group.c +++ b/nuttx/net/igmp/igmp_group.c @@ -55,10 +55,10 @@ #include <nuttx/arch.h> #include <nuttx/kmalloc.h> -#include <nuttx/net/uip/uip.h> -#include <nuttx/net/uip/uip-igmp.h> +#include <nuttx/net/uip.h> +#include <nuttx/net/igmp.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" #ifdef CONFIG_NET_IGMP diff --git a/nuttx/net/igmp/igmp_init.c b/nuttx/net/igmp/igmp_init.c index f0f94198a..36f48b547 100644 --- a/nuttx/net/igmp/igmp_init.c +++ b/nuttx/net/igmp/igmp_init.c @@ -47,10 +47,10 @@ #include <assert.h> #include <debug.h> -#include <nuttx/net/uip/uip.h> -#include <nuttx/net/uip/uip-igmp.h> +#include <nuttx/net/uip.h> +#include <nuttx/net/igmp.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" #ifdef CONFIG_NET_IGMP diff --git a/nuttx/net/igmp/igmp_input.c b/nuttx/net/igmp/igmp_input.c index 660d9f0b0..b1c39399b 100644 --- a/nuttx/net/igmp/igmp_input.c +++ b/nuttx/net/igmp/igmp_input.c @@ -48,10 +48,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> -#include <nuttx/net/uip/uip-igmp.h> +#include <nuttx/net/uip.h> +#include <nuttx/net/igmp.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" #ifdef CONFIG_NET_IGMP diff --git a/nuttx/net/igmp/igmp_join.c b/nuttx/net/igmp/igmp_join.c index 33e5b5140..5dafb0dd6 100644 --- a/nuttx/net/igmp/igmp_join.c +++ b/nuttx/net/igmp/igmp_join.c @@ -47,10 +47,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> -#include <nuttx/net/uip/uip-igmp.h> +#include <nuttx/net/uip.h> +#include <nuttx/net/igmp.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" #ifdef CONFIG_NET_IGMP diff --git a/nuttx/net/igmp/igmp_leave.c b/nuttx/net/igmp/igmp_leave.c index 1b80272ee..f3bfe9f4d 100644 --- a/nuttx/net/igmp/igmp_leave.c +++ b/nuttx/net/igmp/igmp_leave.c @@ -48,10 +48,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> -#include <nuttx/net/uip/uip-igmp.h> +#include <nuttx/net/uip.h> +#include <nuttx/net/igmp.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" #ifdef CONFIG_NET_IGMP diff --git a/nuttx/net/igmp/igmp_mcastmac.c b/nuttx/net/igmp/igmp_mcastmac.c index 937810935..163ad0db5 100644 --- a/nuttx/net/igmp/igmp_mcastmac.c +++ b/nuttx/net/igmp/igmp_mcastmac.c @@ -47,9 +47,9 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" #ifdef CONFIG_NET_IGMP diff --git a/nuttx/net/igmp/igmp_msg.c b/nuttx/net/igmp/igmp_msg.c index ae0155e70..ba4151209 100644 --- a/nuttx/net/igmp/igmp_msg.c +++ b/nuttx/net/igmp/igmp_msg.c @@ -47,10 +47,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> -#include <nuttx/net/uip/uip-igmp.h> +#include <nuttx/net/uip.h> +#include <nuttx/net/igmp.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" #ifdef CONFIG_NET_IGMP diff --git a/nuttx/net/igmp/igmp_poll.c b/nuttx/net/igmp/igmp_poll.c index 522826e29..9f6f8f0a5 100644 --- a/nuttx/net/igmp/igmp_poll.c +++ b/nuttx/net/igmp/igmp_poll.c @@ -47,10 +47,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" #ifdef CONFIG_NET_IGMP diff --git a/nuttx/net/igmp/igmp_send.c b/nuttx/net/igmp/igmp_send.c index af7da4cfb..64e609827 100644 --- a/nuttx/net/igmp/igmp_send.c +++ b/nuttx/net/igmp/igmp_send.c @@ -43,12 +43,12 @@ #include <arpa/inet.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include <nuttx/net/uip/uip-ipopt.h> -#include <nuttx/net/uip/uip-igmp.h> +#include <nuttx/net/ip.h> +#include <nuttx/net/igmp.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" #ifdef CONFIG_NET_IGMP diff --git a/nuttx/net/igmp/igmp_timer.c b/nuttx/net/igmp/igmp_timer.c index bf7007998..bdcc846b5 100644 --- a/nuttx/net/igmp/igmp_timer.c +++ b/nuttx/net/igmp/igmp_timer.c @@ -49,10 +49,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> -#include <nuttx/net/uip/uip-igmp.h> +#include <nuttx/net/uip.h> +#include <nuttx/net/igmp.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" #ifdef CONFIG_NET_IGMP diff --git a/nuttx/net/listen.c b/nuttx/net/listen.c index 5e3c62f69..c8a1260bd 100644 --- a/nuttx/net/listen.c +++ b/nuttx/net/listen.c @@ -44,7 +44,7 @@ #include <errno.h> #include <debug.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Global Functions diff --git a/nuttx/net/net_internal.h b/nuttx/net/net.h index 9577d2ea3..96eddb8b2 100644 --- a/nuttx/net/net_internal.h +++ b/nuttx/net/net.h @@ -1,5 +1,5 @@ /**************************************************************************** - * net/net_internal.h + * net/net.h * * Copyright (C) 2007-2009, 2011-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __NET_INTERNAL_H -#define __NET_INTERNAL_H +#ifndef _NET_NET_H +#define _NET_NET_H /**************************************************************************** * Included Files @@ -48,7 +48,7 @@ #include <time.h> #include <nuttx/net/net.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> /**************************************************************************** * Pre-processor Definitions @@ -236,4 +236,4 @@ ssize_t psock_send(FAR struct socket *psock, FAR const void *buf, size_t len, #endif #endif /* CONFIG_NET */ -#endif /* __NET_INTERNAL_H */ +#endif /* _NET_NET_H */ diff --git a/nuttx/net/net_addroute.c b/nuttx/net/net_addroute.c index b93a84071..7db5504d8 100644 --- a/nuttx/net/net_addroute.c +++ b/nuttx/net/net_addroute.c @@ -46,7 +46,7 @@ #include <arch/irq.h> -#include "net_internal.h" +#include "net.h" #include "net_route.h" #if defined(CONFIG_NET) && defined(CONFIG_NET_ROUTE) diff --git a/nuttx/net/net_allocroute.c b/nuttx/net/net_allocroute.c index 8ae0938e8..69fdd56b9 100644 --- a/nuttx/net/net_allocroute.c +++ b/nuttx/net/net_allocroute.c @@ -45,7 +45,7 @@ #include <arch/irq.h> -#include "net_internal.h" +#include "net.h" #include "net_route.h" #if defined(CONFIG_NET) && defined(CONFIG_NET_ROUTE) diff --git a/nuttx/net/net_checksd.c b/nuttx/net/net_checksd.c index 0a6975cad..77feab68a 100644 --- a/nuttx/net/net_checksd.c +++ b/nuttx/net/net_checksd.c @@ -45,7 +45,7 @@ #include <errno.h> #include <debug.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Global Functions diff --git a/nuttx/net/net_clone.c b/nuttx/net/net_clone.c index 5efed0944..4f5bfe668 100644 --- a/nuttx/net/net_clone.c +++ b/nuttx/net/net_clone.c @@ -46,7 +46,7 @@ #include <nuttx/arch.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Global Functions diff --git a/nuttx/net/net_close.c b/nuttx/net/net_close.c index f96724f0e..d5a72f59d 100644 --- a/nuttx/net/net_close.c +++ b/nuttx/net/net_close.c @@ -54,8 +54,8 @@ # include <nuttx/clock.h> #endif -#include "net_internal.h" -#include "uip/uip_internal.h" +#include "net.h" +#include "uip/uip.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/net_delroute.c b/nuttx/net/net_delroute.c index 50c978a88..1d4571c52 100644 --- a/nuttx/net/net_delroute.c +++ b/nuttx/net/net_delroute.c @@ -43,7 +43,7 @@ #include <string.h> #include <errno.h> -#include "net_internal.h" +#include "net.h" #include "net_route.h" #if defined(CONFIG_NET) && defined(CONFIG_NET_ROUTE) diff --git a/nuttx/net/net_dsec2timeval.c b/nuttx/net/net_dsec2timeval.c index 0f570cb39..cad43ae03 100644 --- a/nuttx/net/net_dsec2timeval.c +++ b/nuttx/net/net_dsec2timeval.c @@ -45,7 +45,7 @@ #include <errno.h> #include <nuttx/clock.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Global Functions diff --git a/nuttx/net/net_dup.c b/nuttx/net/net_dup.c index 9ab36b920..5f0185a12 100644 --- a/nuttx/net/net_dup.c +++ b/nuttx/net/net_dup.c @@ -44,7 +44,7 @@ #include <errno.h> #include <debug.h> -#include "net_internal.h" +#include "net.h" #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 diff --git a/nuttx/net/net_dup2.c b/nuttx/net/net_dup2.c index 3403a70c3..3223fcf78 100644 --- a/nuttx/net/net_dup2.c +++ b/nuttx/net/net_dup2.c @@ -44,7 +44,7 @@ #include <errno.h> #include <debug.h> -#include "net_internal.h" +#include "net.h" #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 diff --git a/nuttx/net/net_foreachroute.c b/nuttx/net/net_foreachroute.c index f8343618d..2b22abc90 100644 --- a/nuttx/net/net_foreachroute.c +++ b/nuttx/net/net_foreachroute.c @@ -44,7 +44,7 @@ #include <arch/irq.h> -#include "net_internal.h" +#include "net.h" #include "net_route.h" #if defined(CONFIG_NET) && defined(CONFIG_NET_ROUTE) diff --git a/nuttx/net/net_monitor.c b/nuttx/net/net_monitor.c index 3ce092220..cc1289da3 100644 --- a/nuttx/net/net_monitor.c +++ b/nuttx/net/net_monitor.c @@ -44,8 +44,8 @@ #include <assert.h> #include <debug.h> -#include "net_internal.h" -#include "uip/uip_internal.h" +#include "net.h" +#include "uip/uip.h" /**************************************************************************** * Private Types diff --git a/nuttx/net/net_poll.c b/nuttx/net/net_poll.c index 49c0a2b74..00900919a 100644 --- a/nuttx/net/net_poll.c +++ b/nuttx/net/net_poll.c @@ -51,12 +51,12 @@ #include <nuttx/kmalloc.h> #include <nuttx/arch.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/net.h> -#include <uip/uip_internal.h> +#include <uip/uip.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/net_route.h b/nuttx/net/net_route.h index 08039fe01..e6484ce93 100644 --- a/nuttx/net/net_route.h +++ b/nuttx/net/net_route.h @@ -45,7 +45,7 @@ #include <queue.h> #include <net/if.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #ifdef CONFIG_NET_ROUTE diff --git a/nuttx/net/net_router.c b/nuttx/net/net_router.c index e56b2c550..4851c08ec 100644 --- a/nuttx/net/net_router.c +++ b/nuttx/net/net_router.c @@ -43,7 +43,7 @@ #include <string.h> #include <errno.h> -#include "net_internal.h" +#include "net.h" #include "net_route.h" #if defined(CONFIG_NET) && defined(CONFIG_NET_ROUTE) diff --git a/nuttx/net/net_sendfile.c b/nuttx/net/net_sendfile.c index aaaefcce0..23d8cd1b5 100644 --- a/nuttx/net/net_sendfile.c +++ b/nuttx/net/net_sendfile.c @@ -61,8 +61,8 @@ #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> -#include "net_internal.h" -#include "uip/uip_internal.h" +#include "net.h" +#include "uip/uip.h" /**************************************************************************** * Definitions diff --git a/nuttx/net/net_sockets.c b/nuttx/net/net_sockets.c index c6962915d..66800f382 100644 --- a/nuttx/net/net_sockets.c +++ b/nuttx/net/net_sockets.c @@ -49,12 +49,12 @@ #include <nuttx/net/iob.h> #include <nuttx/net/arp.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/net.h> #include <nuttx/kmalloc.h> #include "net_route.h" -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/net_timeo.c b/nuttx/net/net_timeo.c index c593c45c7..551aa188f 100644 --- a/nuttx/net/net_timeo.c +++ b/nuttx/net/net_timeo.c @@ -45,7 +45,7 @@ #include <nuttx/clock.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Global Functions diff --git a/nuttx/net/net_timeval2dsec.c b/nuttx/net/net_timeval2dsec.c index e0b25db98..f61f1a179 100644 --- a/nuttx/net/net_timeval2dsec.c +++ b/nuttx/net/net_timeval2dsec.c @@ -45,7 +45,7 @@ #include <errno.h> #include <nuttx/clock.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Global Functions diff --git a/nuttx/net/net_vfcntl.c b/nuttx/net/net_vfcntl.c index 5fa6177f1..7db7fdb77 100644 --- a/nuttx/net/net_vfcntl.c +++ b/nuttx/net/net_vfcntl.c @@ -47,7 +47,7 @@ #include <arch/irq.h> #include <nuttx/net/net.h> -#include "net_internal.h" +#include "net.h" #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 diff --git a/nuttx/net/netdev_carrier.c b/nuttx/net/netdev_carrier.c index d0e59d996..d74ce46c2 100644 --- a/nuttx/net/netdev_carrier.c +++ b/nuttx/net/netdev_carrier.c @@ -52,7 +52,7 @@ #include <net/ethernet.h> #include <nuttx/net/netdev.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Definitions diff --git a/nuttx/net/netdev_count.c b/nuttx/net/netdev_count.c index 4ee0612a5..c185c1428 100644 --- a/nuttx/net/netdev_count.c +++ b/nuttx/net/netdev_count.c @@ -45,7 +45,7 @@ #include <nuttx/net/netdev.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/netdev_findbyaddr.c b/nuttx/net/netdev_findbyaddr.c index 77bef5aaf..99bdc9d9f 100644 --- a/nuttx/net/netdev_findbyaddr.c +++ b/nuttx/net/netdev_findbyaddr.c @@ -48,7 +48,7 @@ #include <nuttx/net/netdev.h> #include "net_route.h" -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/netdev_findbyname.c b/nuttx/net/netdev_findbyname.c index c56971e2b..281fadcb7 100644 --- a/nuttx/net/netdev_findbyname.c +++ b/nuttx/net/netdev_findbyname.c @@ -45,7 +45,7 @@ #include <nuttx/net/netdev.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/netdev_foreach.c b/nuttx/net/netdev_foreach.c index b3c4975f9..47597d522 100644 --- a/nuttx/net/netdev_foreach.c +++ b/nuttx/net/netdev_foreach.c @@ -44,7 +44,7 @@ #include <nuttx/net/net.h> #include <nuttx/net/netdev.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/netdev_ioctl.c b/nuttx/net/netdev_ioctl.c index eb0c6e523..3c7e4eeda 100644 --- a/nuttx/net/netdev_ioctl.c +++ b/nuttx/net/netdev_ioctl.c @@ -56,14 +56,14 @@ #include <netinet/in.h> #include <nuttx/net/netdev.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #ifdef CONFIG_NET_IGMP # include "sys/sockio.h" -# include "nuttx/net/uip/uip-igmp.h" +# include "nuttx/net/igmp.h" #endif -#include "net_internal.h" +#include "net.h" #include "net_route.h" /**************************************************************************** diff --git a/nuttx/net/netdev_register.c b/nuttx/net/netdev_register.c index e34f79232..58c928c33 100644 --- a/nuttx/net/netdev_register.c +++ b/nuttx/net/netdev_register.c @@ -52,7 +52,7 @@ #include <net/ethernet.h> #include <nuttx/net/netdev.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Definitions diff --git a/nuttx/net/netdev_router.c b/nuttx/net/netdev_router.c index c0e32056d..bcb47b3ab 100644 --- a/nuttx/net/netdev_router.c +++ b/nuttx/net/netdev_router.c @@ -45,7 +45,7 @@ #include <nuttx/net/netdev.h> -#include "net_internal.h" +#include "net.h" #include "net_route.h" #if defined(CONFIG_NET) && defined(CONFIG_NET_ROUTE) diff --git a/nuttx/net/netdev_rxnotify.c b/nuttx/net/netdev_rxnotify.c index ffacf061d..67830258d 100644 --- a/nuttx/net/netdev_rxnotify.c +++ b/nuttx/net/netdev_rxnotify.c @@ -47,7 +47,7 @@ #include <nuttx/net/netdev.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Definitions diff --git a/nuttx/net/netdev_sem.c b/nuttx/net/netdev_sem.c index ba6299c62..b56f7cba2 100644 --- a/nuttx/net/netdev_sem.c +++ b/nuttx/net/netdev_sem.c @@ -48,7 +48,7 @@ #include <assert.h> #include <errno.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Definitions diff --git a/nuttx/net/netdev_txnotify.c b/nuttx/net/netdev_txnotify.c index 9d8c69f9a..760fe3291 100644 --- a/nuttx/net/netdev_txnotify.c +++ b/nuttx/net/netdev_txnotify.c @@ -47,7 +47,7 @@ #include <nuttx/net/netdev.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Definitions diff --git a/nuttx/net/netdev_unregister.c b/nuttx/net/netdev_unregister.c index 7ce9af17a..e8dd76238 100644 --- a/nuttx/net/netdev_unregister.c +++ b/nuttx/net/netdev_unregister.c @@ -52,7 +52,7 @@ #include <net/ethernet.h> #include <nuttx/net/netdev.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Definitions diff --git a/nuttx/net/pkt/pkt_callback.c b/nuttx/net/pkt/pkt_callback.c index 679f46ef3..a00360f7e 100644 --- a/nuttx/net/pkt/pkt_callback.c +++ b/nuttx/net/pkt/pkt_callback.c @@ -44,10 +44,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Private Data diff --git a/nuttx/net/pkt/pkt_conn.c b/nuttx/net/pkt/pkt_conn.c index 30a20655d..bbaae63b3 100644 --- a/nuttx/net/pkt/pkt_conn.c +++ b/nuttx/net/pkt/pkt_conn.c @@ -51,11 +51,11 @@ #include <arch/irq.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> #include <nuttx/net/arp.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Private Data diff --git a/nuttx/net/pkt/pkt_input.c b/nuttx/net/pkt/pkt_input.c index 227c388fb..916deb564 100644 --- a/nuttx/net/pkt/pkt_input.c +++ b/nuttx/net/pkt/pkt_input.c @@ -47,12 +47,12 @@ #include <debug.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include <nuttx/net/uip/uip-pkt.h> +#include <nuttx/net/pkt.h> #include <nuttx/net/arp.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/pkt/pkt_poll.c b/nuttx/net/pkt/pkt_poll.c index 58ca8f3b7..36ee03c58 100644 --- a/nuttx/net/pkt/pkt_poll.c +++ b/nuttx/net/pkt/pkt_poll.c @@ -48,11 +48,11 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include <nuttx/net/uip/uip-pkt.h> +#include <nuttx/net/pkt.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/pkt/pkt_send.c b/nuttx/net/pkt/pkt_send.c index e8449eb6b..3712c3e29 100644 --- a/nuttx/net/pkt/pkt_send.c +++ b/nuttx/net/pkt/pkt_send.c @@ -53,10 +53,10 @@ #include <nuttx/clock.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> -#include <nuttx/net/uip/uip-pkt.h> +#include <nuttx/net/pkt.h> -#include "net_internal.h" -#include "uip/uip_internal.h" +#include "net.h" +#include "uip/uip.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/recv.c b/nuttx/net/recv.c index 1571a7377..8ddb4bce6 100644 --- a/nuttx/net/recv.c +++ b/nuttx/net/recv.c @@ -44,7 +44,7 @@ #include <sys/socket.h> #include <errno.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Global Functions diff --git a/nuttx/net/recvfrom.c b/nuttx/net/recvfrom.c index d7f479309..79e1e339b 100644 --- a/nuttx/net/recvfrom.c +++ b/nuttx/net/recvfrom.c @@ -56,8 +56,8 @@ #include <nuttx/clock.h> #include <nuttx/net/netdev.h> -#include "net_internal.h" -#include "uip/uip_internal.h" +#include "net.h" +#include "uip/uip.h" /**************************************************************************** * Definitions diff --git a/nuttx/net/send.c b/nuttx/net/send.c index cbec0f7de..6ff0d9f98 100644 --- a/nuttx/net/send.c +++ b/nuttx/net/send.c @@ -45,7 +45,7 @@ #include "tcp/tcp.h" #include "pkt/pkt.h" -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Definitions diff --git a/nuttx/net/sendto.c b/nuttx/net/sendto.c index e34afc9dc..512bdf62c 100644 --- a/nuttx/net/sendto.c +++ b/nuttx/net/sendto.c @@ -51,8 +51,8 @@ #include <nuttx/clock.h> #include <nuttx/net/netdev.h> -#include "net_internal.h" -#include "uip/uip_internal.h" +#include "net.h" +#include "uip/uip.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/setsockopt.c b/nuttx/net/setsockopt.c index 7700775bf..40e12c7a0 100644 --- a/nuttx/net/setsockopt.c +++ b/nuttx/net/setsockopt.c @@ -46,7 +46,7 @@ #include <errno.h> #include <arch/irq.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Global Functions diff --git a/nuttx/net/socket.c b/nuttx/net/socket.c index bd63a6584..d7352c04a 100644 --- a/nuttx/net/socket.c +++ b/nuttx/net/socket.c @@ -45,7 +45,7 @@ #include <assert.h> #include <debug.h> -#include "net_internal.h" +#include "net.h" /**************************************************************************** * Global Functions diff --git a/nuttx/net/tcp/tcp_appsend.c b/nuttx/net/tcp/tcp_appsend.c index 9f95906f5..50eaf0352 100644 --- a/nuttx/net/tcp/tcp_appsend.c +++ b/nuttx/net/tcp/tcp_appsend.c @@ -49,10 +49,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/tcp/tcp_backlog.c b/nuttx/net/tcp/tcp_backlog.c index 8fa707223..e76af4e25 100644 --- a/nuttx/net/tcp/tcp_backlog.c +++ b/nuttx/net/tcp/tcp_backlog.c @@ -47,10 +47,10 @@ #include <debug.h> #include <nuttx/kmalloc.h> -#include <nuttx/net/uip/uip.h> -#include <nuttx/net/uip/uip-tcp.h> +#include <nuttx/net/uip.h> +#include <nuttx/net/tcp.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Private Data diff --git a/nuttx/net/tcp/tcp_callback.c b/nuttx/net/tcp/tcp_callback.c index 63b2d5199..b05027c5b 100644 --- a/nuttx/net/tcp/tcp_callback.c +++ b/nuttx/net/tcp/tcp_callback.c @@ -46,10 +46,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Private Data diff --git a/nuttx/net/tcp/tcp_conn.c b/nuttx/net/tcp/tcp_conn.c index b95cd7e7b..893c95642 100644 --- a/nuttx/net/tcp/tcp_conn.c +++ b/nuttx/net/tcp/tcp_conn.c @@ -52,11 +52,11 @@ #include <arch/irq.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> #include "tcp/tcp.h" -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Public Data diff --git a/nuttx/net/tcp/tcp_input.c b/nuttx/net/tcp/tcp_input.c index e373e466e..60a7151fc 100644 --- a/nuttx/net/tcp/tcp_input.c +++ b/nuttx/net/tcp/tcp_input.c @@ -51,10 +51,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/tcp/tcp_listen.c b/nuttx/net/tcp/tcp_listen.c index f974d3f6f..daff52996 100644 --- a/nuttx/net/tcp/tcp_listen.c +++ b/nuttx/net/tcp/tcp_listen.c @@ -50,7 +50,7 @@ #include <nuttx/net/netconfig.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Private Data diff --git a/nuttx/net/tcp/tcp_poll.c b/nuttx/net/tcp/tcp_poll.c index b0286fd24..e741344e8 100644 --- a/nuttx/net/tcp/tcp_poll.c +++ b/nuttx/net/tcp/tcp_poll.c @@ -49,10 +49,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/tcp/tcp_readahead.c b/nuttx/net/tcp/tcp_readahead.c index 280b5469c..059abbc5c 100644 --- a/nuttx/net/tcp/tcp_readahead.c +++ b/nuttx/net/tcp/tcp_readahead.c @@ -43,9 +43,9 @@ #include <queue.h> #include <debug.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Private Types diff --git a/nuttx/net/tcp/tcp_send.c b/nuttx/net/tcp/tcp_send.c index 0b079934f..5aa2ef599 100644 --- a/nuttx/net/tcp/tcp_send.c +++ b/nuttx/net/tcp/tcp_send.c @@ -49,10 +49,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/tcp/tcp_send_buffered.c b/nuttx/net/tcp/tcp_send_buffered.c index 1f0a568f2..05a0e4bfb 100644 --- a/nuttx/net/tcp/tcp_send_buffered.c +++ b/nuttx/net/tcp/tcp_send_buffered.c @@ -67,9 +67,9 @@ #include <nuttx/net/iob.h> #include <nuttx/net/netdev.h> -#include "net_internal.h" +#include "net.h" #include "tcp/tcp.h" -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/tcp/tcp_send_unbuffered.c b/nuttx/net/tcp/tcp_send_unbuffered.c index ad58daf8a..dc0cd0eb9 100644 --- a/nuttx/net/tcp/tcp_send_unbuffered.c +++ b/nuttx/net/tcp/tcp_send_unbuffered.c @@ -55,8 +55,8 @@ #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> -#include "net_internal.h" -#include "uip/uip_internal.h" +#include "net.h" +#include "uip/uip.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/tcp/tcp_seqno.c b/nuttx/net/tcp/tcp_seqno.c index 754740717..6e5cb0b5c 100644 --- a/nuttx/net/tcp/tcp_seqno.c +++ b/nuttx/net/tcp/tcp_seqno.c @@ -51,10 +51,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Public Data diff --git a/nuttx/net/tcp/tcp_timer.c b/nuttx/net/tcp/tcp_timer.c index 0b159abc4..08614ed73 100644 --- a/nuttx/net/tcp/tcp_timer.c +++ b/nuttx/net/tcp/tcp_timer.c @@ -49,10 +49,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/tcp/tcp_wrbuffer.c b/nuttx/net/tcp/tcp_wrbuffer.c index 0cdd99c97..21da66cb0 100644 --- a/nuttx/net/tcp/tcp_wrbuffer.c +++ b/nuttx/net/tcp/tcp_wrbuffer.c @@ -56,7 +56,7 @@ #include "tcp/tcp.h" #include "nuttx/net/iob.h" -#include "nuttx/net/uip/uip-tcp.h" +#include "nuttx/net/tcp.h" /**************************************************************************** * Private Types diff --git a/nuttx/net/tcp/tcp_wrbuffer_dump.c b/nuttx/net/tcp/tcp_wrbuffer_dump.c index 6ff5bb021..497d7c20e 100644 --- a/nuttx/net/tcp/tcp_wrbuffer_dump.c +++ b/nuttx/net/tcp/tcp_wrbuffer_dump.c @@ -43,7 +43,7 @@ #include <debug.h> #include <nuttx/net/iob.h> -#include <nuttx/net/uip/uip-tcp.h> +#include <nuttx/net/tcp.h> #ifdef CONFIG_DEBUG diff --git a/nuttx/net/udp/udp_callback.c b/nuttx/net/udp/udp_callback.c index b43a5f4fc..7241d6912 100644 --- a/nuttx/net/udp/udp_callback.c +++ b/nuttx/net/udp/udp_callback.c @@ -44,10 +44,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Private Data diff --git a/nuttx/net/udp/udp_conn.c b/nuttx/net/udp/udp_conn.c index 4b8178283..09b1c848d 100644 --- a/nuttx/net/udp/udp_conn.c +++ b/nuttx/net/udp/udp_conn.c @@ -57,10 +57,10 @@ #include <arch/irq.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Private Data diff --git a/nuttx/net/udp/udp_input.c b/nuttx/net/udp/udp_input.c index d5280f432..9097fe077 100644 --- a/nuttx/net/udp/udp_input.c +++ b/nuttx/net/udp/udp_input.c @@ -48,10 +48,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/udp/udp_poll.c b/nuttx/net/udp/udp_poll.c index 46ea6ddce..80a1d1f64 100644 --- a/nuttx/net/udp/udp_poll.c +++ b/nuttx/net/udp/udp_poll.c @@ -48,10 +48,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/udp/udp_send.c b/nuttx/net/udp/udp_send.c index 5f43eafd4..722ef5302 100644 --- a/nuttx/net/udp/udp_send.c +++ b/nuttx/net/udp/udp_send.c @@ -47,10 +47,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip/uip_internal.h" +#include "uip/uip.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/uip/uip_internal.h b/nuttx/net/uip/uip.h index a5ebc56ec..91e804d0f 100644 --- a/nuttx/net/uip/uip_internal.h +++ b/nuttx/net/uip/uip.h @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip_internal.h + * net/uip/uip.h * * Copyright (C) 2007-2009, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -36,8 +36,8 @@ * ****************************************************************************/ -#ifndef _NET_UIP_UIP_INTERNAL_H -#define _NET_UIP_UIP_INTERNAL_H +#ifndef _NET_UIP_UIP_H +#define _NET_UIP_UIP_H /**************************************************************************** * Included Files @@ -50,7 +50,7 @@ #include <stdbool.h> #include <errno.h> #include <arch/irq.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/arp.h> /**************************************************************************** @@ -293,4 +293,4 @@ void uip_removemcastmac(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *ip); #endif #endif /* CONFIG_NET */ -#endif /* _NET_UIP_UIP_INTERNAL_H */ +#endif /* _NET_UIP_UIP_H */ diff --git a/nuttx/net/uip/uip_callback.c b/nuttx/net/uip/uip_callback.c index 6caf28c10..3a0847bac 100644 --- a/nuttx/net/uip/uip_callback.c +++ b/nuttx/net/uip/uip_callback.c @@ -45,10 +45,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip_internal.h" +#include "uip.h" /**************************************************************************** * Private Data diff --git a/nuttx/net/uip/uip_chksum.c b/nuttx/net/uip/uip_chksum.c index 1f28eeaf0..f8ad769a8 100644 --- a/nuttx/net/uip/uip_chksum.c +++ b/nuttx/net/uip/uip_chksum.c @@ -44,10 +44,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip_internal.h" +#include "uip.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/uip/uip_initialize.c b/nuttx/net/uip/uip_initialize.c index 03266fc91..a76f0a1bd 100644 --- a/nuttx/net/uip/uip_initialize.c +++ b/nuttx/net/uip/uip_initialize.c @@ -45,10 +45,10 @@ #ifdef CONFIG_NET #include <stdint.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include "tcp/tcp.h" -#include "uip_internal.h" +#include "uip.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/uip/uip_input.c b/nuttx/net/uip/uip_input.c index b9b94f193..f5ee06b53 100644 --- a/nuttx/net/uip/uip_input.c +++ b/nuttx/net/uip/uip_input.c @@ -86,14 +86,14 @@ #include <string.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> #ifdef CONFIG_NET_IPv6 # include "uip_neighbor.h" #endif /* CONFIG_NET_IPv6 */ -#include "uip_internal.h" +#include "uip.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/uip/uip_iobsend.c b/nuttx/net/uip/uip_iobsend.c index 2fda3bd47..874e78e7f 100644 --- a/nuttx/net/uip/uip_iobsend.c +++ b/nuttx/net/uip/uip_iobsend.c @@ -44,7 +44,7 @@ #include <debug.h> #include <nuttx/net/iob.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> #ifdef CONFIG_NET_IOB diff --git a/nuttx/net/uip/uip_lock.c b/nuttx/net/uip/uip_lock.c index 594390a44..0bb17b941 100644 --- a/nuttx/net/uip/uip_lock.c +++ b/nuttx/net/uip/uip_lock.c @@ -46,7 +46,7 @@ #include <debug.h> #include <nuttx/arch.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #if defined(CONFIG_NET) && defined(CONFIG_NET_NOINTS) diff --git a/nuttx/net/uip/uip_neighbor.h b/nuttx/net/uip/uip_neighbor.h index b55835b74..455610d02 100644 --- a/nuttx/net/uip/uip_neighbor.h +++ b/nuttx/net/uip/uip_neighbor.h @@ -40,7 +40,7 @@ #define __UIP_NEIGHBOR_H__ #include <stdint.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <net/ethernet.h> struct uip_neighbor_addr diff --git a/nuttx/net/uip/uip_pktsend.c b/nuttx/net/uip/uip_pktsend.c index 1a53c93cd..379845922 100644 --- a/nuttx/net/uip/uip_pktsend.c +++ b/nuttx/net/uip/uip_pktsend.c @@ -43,7 +43,7 @@ #include <assert.h> #include <debug.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> #ifdef CONFIG_NET_PKT diff --git a/nuttx/net/uip/uip_poll.c b/nuttx/net/uip/uip_poll.c index adab74520..a4100e576 100644 --- a/nuttx/net/uip/uip_poll.c +++ b/nuttx/net/uip/uip_poll.c @@ -43,10 +43,10 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> -#include "uip_internal.h" +#include "uip.h" /**************************************************************************** * Private Data diff --git a/nuttx/net/uip/uip_send.c b/nuttx/net/uip/uip_send.c index 1eaf97414..f426166b8 100644 --- a/nuttx/net/uip/uip_send.c +++ b/nuttx/net/uip/uip_send.c @@ -45,7 +45,7 @@ #include <assert.h> #include <debug.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> /**************************************************************************** diff --git a/nuttx/net/uip/uip_setipid.c b/nuttx/net/uip/uip_setipid.c index 9aaea482a..eb859cce3 100644 --- a/nuttx/net/uip/uip_setipid.c +++ b/nuttx/net/uip/uip_setipid.c @@ -43,9 +43,9 @@ #include <stdint.h> #include <debug.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> -#include "uip_internal.h" +#include "uip.h" /**************************************************************************** * Private Data |