diff options
author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-03-03 23:18:34 +0000 |
---|---|---|
committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-03-03 23:18:34 +0000 |
commit | 03c2be3856624ed069e414148a1d571d4b1fcb25 (patch) | |
tree | 836687c8a01c9ab067c477767811699a0584323f /apps | |
parent | 73af31f231cc1538daed09540331e2fa4d7b95b0 (diff) | |
download | px4-firmware-03c2be3856624ed069e414148a1d571d4b1fcb25.tar.gz px4-firmware-03c2be3856624ed069e414148a1d571d4b1fcb25.tar.bz2 px4-firmware-03c2be3856624ed069e414148a1d571d4b1fcb25.zip |
Move all non-standard, NuttX header files into include/nuttx/net
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4450 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'apps')
27 files changed, 42 insertions, 46 deletions
diff --git a/apps/examples/ftpc/ftpc_main.c b/apps/examples/ftpc/ftpc_main.c index 9093b0c10..866a69cdb 100644 --- a/apps/examples/ftpc/ftpc_main.c +++ b/apps/examples/ftpc/ftpc_main.c @@ -295,7 +295,7 @@ static int ftpc_execute(SESSION handle, int argc, char *argv[]) int ftpc_parse(SESSION handle, char *cmdline) { - FAR char *argv[FTPC_MAX_ARGUMENTS]; + FAR char *argv[FTPC_MAX_ARGUMENTS+1]; FAR char *saveptr; FAR char *cmd; int argc; diff --git a/apps/examples/igmp/igmp.c b/apps/examples/igmp/igmp.c index 7f2a8099c..5b7ff8376 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 <net/uip/uip.h> +#include <nuttx/net/uip/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 7160e693a..34ae48f2e 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 <net/uip/uip.h> +#include <nuttx/net/uip/uip.h> #include <apps/netutils/uiplib.h> #include "nettest.h" diff --git a/apps/examples/thttpd/content/netstat/netstat.c b/apps/examples/thttpd/content/netstat/netstat.c index 634146274..61590ab29 100755 --- a/apps/examples/thttpd/content/netstat/netstat.c +++ b/apps/examples/thttpd/content/netstat/netstat.c @@ -44,8 +44,8 @@ #include <unistd.h> #include <netinet/ether.h> -#include <net/uip/uipopt.h> -#include <net/uip/uip-arch.h> +#include <nuttx/net/uip/uipopt.h> +#include <nuttx/net/uip/uip-arch.h> /**************************************************************************** * Pre-processor Definitions diff --git a/apps/examples/thttpd/main.c b/apps/examples/thttpd/main.c index be30876cb..30c13bb00 100644 --- a/apps/examples/thttpd/main.c +++ b/apps/examples/thttpd/main.c @@ -1,8 +1,8 @@ /**************************************************************************** * examples/thttpd/main.c * - * Copyright (C) 2009-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2009-2012 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 @@ -51,7 +51,7 @@ #include <net/if.h> #include <netinet/ether.h> -#include <net/uip/uip-arp.h> +#include <nuttx/net/uip/uip-arp.h> #include <apps/netutils/uiplib.h> #include <apps/netutils/thttpd.h> @@ -59,7 +59,7 @@ #include <nuttx/binfmt.h> #include <nuttx/nxflat.h> #ifdef CONFIG_NET_SLIP -# include <nuttx/net.h> +# include <nuttx/net/net.h> #endif #include "content/romfs.h" diff --git a/apps/examples/udp/target.c b/apps/examples/udp/target.c index 07fec0e75..defbc7e05 100644 --- a/apps/examples/udp/target.c +++ b/apps/examples/udp/target.c @@ -41,7 +41,7 @@ #include <stdio.h> #include <debug.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uip.h> #include <apps/netutils/uiplib.h> #include "udp-internal.h" diff --git a/apps/examples/uip/main.c b/apps/examples/uip/main.c index fd2da4b8e..e4ba6dfdb 100644 --- a/apps/examples/uip/main.c +++ b/apps/examples/uip/main.c @@ -54,8 +54,8 @@ #include <debug.h> #include <net/if.h> -#include <net/uip/uip.h> -#include <net/uip/uip-arp.h> +#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip/uip-arp.h> #include <apps/netutils/uiplib.h> diff --git a/apps/examples/wget/target.c b/apps/examples/wget/target.c index 9c55746b3..542220162 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 <net/uip/uip.h> +#include <nuttx/net/uip/uip.h> #include <apps/netutils/uiplib.h> #include <apps/netutils/resolv.h> diff --git a/apps/examples/wlan/wlan_main.c b/apps/examples/wlan/wlan_main.c index 04210909a..585878730 100644 --- a/apps/examples/wlan/wlan_main.c +++ b/apps/examples/wlan/wlan_main.c @@ -57,8 +57,8 @@ #include <nuttx/usb/usbhost.h> #include <net/if.h> -#include <net/uip/uip.h> -#include <net/uip/uip-arp.h> +#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip/uip-arp.h> #include <apps/netutils/uiplib.h> diff --git a/apps/include/netutils/resolv.h b/apps/include/netutils/resolv.h index a427c5394..e1499afd7 100644 --- a/apps/include/netutils/resolv.h +++ b/apps/include/netutils/resolv.h @@ -33,7 +33,7 @@ #ifndef __APPS_NETUTILS_RESOLVE_H #define __APPS_NETUTILS_RESOLVE_H -#include <net/uip/uipopt.h> +#include <nuttx/net/uip/uipopt.h> #undef EXTERN #if defined(__cplusplus) diff --git a/apps/include/netutils/smtp.h b/apps/include/netutils/smtp.h index d1ea0c5d9..ef3864bf3 100644 --- a/apps/include/netutils/smtp.h +++ b/apps/include/netutils/smtp.h @@ -44,8 +44,8 @@ * Included Files ****************************************************************************/ -#include <net/uip/uipopt.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uipopt.h> +#include <nuttx/net/uip/uip.h> /**************************************************************************** * Type Definitions diff --git a/apps/include/netutils/uiplib.h b/apps/include/netutils/uiplib.h index a149de63b..48a71a14c 100644 --- a/apps/include/netutils/uiplib.h +++ b/apps/include/netutils/uiplib.h @@ -56,7 +56,7 @@ #include <pthread.h> #include <netinet/in.h> -#include <net/uip/uipopt.h> +#include <nuttx/net/uip/uipopt.h> /**************************************************************************** * Pre-processor Definitions diff --git a/apps/netutils/dhcpc/dhcpc.c b/apps/netutils/dhcpc/dhcpc.c index 4e59d2371..9801242fe 100644 --- a/apps/netutils/dhcpc/dhcpc.c +++ b/apps/netutils/dhcpc/dhcpc.c @@ -52,7 +52,7 @@ #include <errno.h> #include <debug.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uip.h> #include <apps/netutils/dhcpc.h> #include <apps/netutils/uiplib.h> diff --git a/apps/netutils/dhcpd/dhcpd.c b/apps/netutils/dhcpd/dhcpd.c index 6c14c6196..d9143288d 100644 --- a/apps/netutils/dhcpd/dhcpd.c +++ b/apps/netutils/dhcpd/dhcpd.c @@ -56,7 +56,7 @@ # include <debug.h> /* For ndbg, vdbg */ # include <nuttx/compiler.h> /* For CONFIG_CPP_HAVE_WARNING */ # include <arch/irq.h> /* For irqstore() and friends -- REVISIT */ -# include <net/uip/uip-arp.h> /* For low-level ARP interfaces -- REVISIT */ +# include <nuttx/net/uip/uip-arp.h> /* For low-level ARP interfaces -- REVISIT */ # include <apps/netutils/dhcpd.h> /* Advertised DHCPD APIs */ #endif diff --git a/apps/netutils/ftpc/ftpc_login.c b/apps/netutils/ftpc/ftpc_login.c index be899a074..3d41d8a25 100644 --- a/apps/netutils/ftpc/ftpc_login.c +++ b/apps/netutils/ftpc/ftpc_login.c @@ -1,8 +1,8 @@ /**************************************************************************** * apps/netutils/ftpc/ftpc_login.c * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2011-2012 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 @@ -145,7 +145,6 @@ errout: int ftpc_relogin(FAR struct ftpc_session_s *session) { - int err; int ret; /* Log into the server. First send the USER command. The server may accept diff --git a/apps/netutils/smtp/smtp.c b/apps/netutils/smtp/smtp.c index d758c6f6b..4e66a41cb 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 <net/uip/uip.h> +#include <nuttx/net/uip/uip.h> #include <apps/netutils/smtp.h> /**************************************************************************** diff --git a/apps/netutils/telnetd/telnetd_driver.c b/apps/netutils/telnetd/telnetd_driver.c index eb43012c4..2efaba1be 100644 --- a/apps/netutils/telnetd/telnetd_driver.c +++ b/apps/netutils/telnetd/telnetd_driver.c @@ -1,9 +1,6 @@ /**************************************************************************** * apps/netutils/telnetd_driver.c * - * Copyright (C) 2008-2 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <gnutt@nuttx.org> - * * Copyright (C) 2007, 2009, 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * @@ -62,7 +59,7 @@ #include <nuttx/fs.h> #include <debug.h> -#include <nuttx/net.h> +#include <nuttx/net/net.h> #include <apps/netutils/telnetd.h> #include <apps/netutils/uiplib.h> diff --git a/apps/netutils/tftpc/tftpc_get.c b/apps/netutils/tftpc/tftpc_get.c index b2170ec39..4f391806c 100644 --- a/apps/netutils/tftpc/tftpc_get.c +++ b/apps/netutils/tftpc/tftpc_get.c @@ -49,8 +49,8 @@ #include <errno.h> #include <debug.h> -#include <net/uip/uipopt.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uipopt.h> +#include <nuttx/net/uip/uip.h> #include <apps/netutils/tftp.h> #include "tftpc_internal.h" diff --git a/apps/netutils/tftpc/tftpc_internal.h b/apps/netutils/tftpc/tftpc_internal.h index ffaecdb13..bed25a6a5 100644 --- a/apps/netutils/tftpc/tftpc_internal.h +++ b/apps/netutils/tftpc/tftpc_internal.h @@ -47,7 +47,7 @@ #include <stdint.h> #include <stdbool.h> -#include <net/uip/uipopt.h> +#include <nuttx/net/uip/uipopt.h> /**************************************************************************** * Pre-processor Definitions diff --git a/apps/netutils/tftpc/tftpc_packets.c b/apps/netutils/tftpc/tftpc_packets.c index d1370efd8..7d172e659 100644 --- a/apps/netutils/tftpc/tftpc_packets.c +++ b/apps/netutils/tftpc/tftpc_packets.c @@ -51,8 +51,8 @@ #include <netinet/in.h> -#include <net/uip/uipopt.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uipopt.h> +#include <nuttx/net/uip/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 b36599718..7124bb981 100644 --- a/apps/netutils/tftpc/tftpc_put.c +++ b/apps/netutils/tftpc/tftpc_put.c @@ -49,8 +49,8 @@ #include <errno.h> #include <debug.h> -#include <net/uip/uipopt.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uipopt.h> +#include <nuttx/net/uip/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 99f716f5c..5e4fc4e18 100644 --- a/apps/netutils/uiplib/uiplib.c +++ b/apps/netutils/uiplib/uiplib.c @@ -46,7 +46,7 @@ #include <stdint.h> #include <stdbool.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uip.h> #include <apps/netutils/uiplib.h> /**************************************************************************** diff --git a/apps/netutils/webserver/httpd.c b/apps/netutils/webserver/httpd.c index bf03a8094..0d8386bc5 100644 --- a/apps/netutils/webserver/httpd.c +++ b/apps/netutils/webserver/httpd.c @@ -58,7 +58,7 @@ #include <errno.h> #include <debug.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uip.h> #include <apps/netutils/uiplib.h> #include <apps/netutils/httpd.h> diff --git a/apps/netutils/webserver/httpd.h b/apps/netutils/webserver/httpd.h index 52073765c..88e326f70 100644 --- a/apps/netutils/webserver/httpd.h +++ b/apps/netutils/webserver/httpd.h @@ -46,8 +46,8 @@ #include <nuttx/config.h> #include <stdint.h> -#include <net/uip/uip.h> -#include <net/uip/uipopt.h> +#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip/uipopt.h> /**************************************************************************** * Pre-processor Definitions diff --git a/apps/netutils/webserver/httpd_cgi.c b/apps/netutils/webserver/httpd_cgi.c index 967ef9b9c..4a6f871f8 100644 --- a/apps/netutils/webserver/httpd_cgi.c +++ b/apps/netutils/webserver/httpd_cgi.c @@ -42,7 +42,7 @@ #include <nuttx/compiler.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uip.h> #include <apps/netutils/httpd.h> #include "httpd_cgi.h" diff --git a/apps/netutils/webserver/httpd_fsdata.h b/apps/netutils/webserver/httpd_fsdata.h index d0a69affa..c25ea0c86 100644 --- a/apps/netutils/webserver/httpd_fsdata.h +++ b/apps/netutils/webserver/httpd_fsdata.h @@ -44,7 +44,7 @@ ****************************************************************************/ #include <stdint.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uip.h> /**************************************************************************** * Public Types diff --git a/apps/nshlib/nsh_netcmds.c b/apps/nshlib/nsh_netcmds.c index 04d10b1e1..7aec60994 100644 --- a/apps/nshlib/nsh_netcmds.c +++ b/apps/nshlib/nsh_netcmds.c @@ -52,15 +52,15 @@ #include <libgen.h> /* Needed for basename */ #include <errno.h> -#include <nuttx/net.h> +#include <nuttx/net/net.h> #include <nuttx/clock.h> #include <net/ethernet.h> -#include <net/uip/uip.h> -#include <net/uip/uip-arch.h> +#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip/uip-arch.h> #include <netinet/ether.h> #ifdef CONFIG_NET_STATISTICS -# include <net/uip/uip.h> +# include <nuttx/net/uip/uip.h> #endif #if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \ |