sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move all non-standard, NuttX header files into include/nuttx/net

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4450 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-03-03 23:18:34 +00:00
parent f6004b3260
commit 217e8451f9
27 changed files with 42 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/ftpc/ftpc_main.c
View File

@ -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;

2
examples/igmp/igmp.c
View File

@ -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>

2
examples/nettest/nettest.c
View File

@ -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"

4
examples/thttpd/content/netstat/netstat.c
View File

@ -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

8
examples/thttpd/main.c
View File

@ -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"

2
examples/udp/target.c
View File

@ -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"

4
examples/uip/main.c
View File

@ -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>

2
examples/wget/target.c
View File

@ -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>

4
examples/wlan/wlan_main.c
View File

@ -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>

2
include/netutils/resolv.h
View File

@ -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)

4
include/netutils/smtp.h
View File

@ -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

2
include/netutils/uiplib.h
View File

@ -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

2
netutils/dhcpc/dhcpc.c
View File

@ -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>

2
netutils/dhcpd/dhcpd.c
View File

@ -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

5
netutils/ftpc/ftpc_login.c
View File

@ -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

2
netutils/smtp/smtp.c
View File

@ -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>
/****************************************************************************

5
netutils/telnetd/telnetd_driver.c
View File

@ -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>

4
netutils/tftpc/tftpc_get.c
View File

@ -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"

2
netutils/tftpc/tftpc_internal.h
View File

@ -47,7 +47,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <net/uip/uipopt.h>
#include <nuttx/net/uip/uipopt.h>
/****************************************************************************
* Pre-processor Definitions

4
netutils/tftpc/tftpc_packets.c
View File

@ -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"

4
netutils/tftpc/tftpc_put.c
View File

@ -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"

2
netutils/uiplib/uiplib.c
View File

@ -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>
/****************************************************************************

2
netutils/webserver/httpd.c
View File

@ -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>

4
netutils/webserver/httpd.h
View File

@ -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

2
netutils/webserver/httpd_cgi.c
View File

@ -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"

2
netutils/webserver/httpd_fsdata.h
View File

@ -44,7 +44,7 @@
****************************************************************************/
#include <stdint.h>
#include <net/uip/uip.h>
#include <nuttx/net/uip/uip.h>
/****************************************************************************
* Public Types

8
nshlib/nsh_netcmds.c
View File

@ -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) && \