Merged nuttx/apps into master

Make.defs

@@ -2,7 +2,7 @@
 # apps/Make.defs
 # Common make definitions provided to all applications
 #
-#   Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011, 2014, 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -34,6 +34,8 @@
 #
 ############################################################################
 
+# Builtin Registration
+
 BUILTIN_REGISTRY = $(APPDIR)$(DELIM)builtin$(DELIM)registry
 
 DEPCONFIG = $(TOPDIR)$(DELIM).config
@@ -61,3 +63,11 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
 else
   MKKCONFIG = $(APPDIR)/tools/mkkconfig.sh
 endif
+
+ifeq ($(WINTOOL),y)
+  INCDIROPT = -w
+endif
+
+# Standard include path
+
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)$(DELIM)include"}

builtin/exec_builtin.c

@@ -51,7 +51,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <apps/builtin/builtin.h>
+#include "builtin/builtin.h"
 
 /****************************************************************************
  * Public Functions

examples/bridge/bridge_main.c

@@ -50,12 +50,12 @@
 #include <netinet/in.h>
 
 #include <nuttx/net/arp.h>
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
 
 #if defined(CONFIG_EXAMPLES_BRIDGE_NET1_DHCPC) || \
     defined(CONFIG_EXAMPLES_BRIDGE_NET2_DHCPC)
 #  include <arpa/inet.h>
-#  include <apps/netutils/dhcpc.h>
+#  include "netutils/dhcpc.h"
 #endif
 
 /****************************************************************************

examples/cc3000/shell.c

@@ -47,11 +47,11 @@
 #include <net/if.h>
 #include <arpa/inet.h>
 
-#include <apps/netutils/telnetd.h>
+#include "netutils/telnetd.h"
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
 
 #include "shell.h"
-#include <apps/nshlib/nshlib.h>
+#include "nshlib/nshlib.h"
 
 /****************************************************************************
  * Pre-processor Definitions

examples/cc3000/telnetd_daemon.c

@@ -53,8 +53,8 @@
 #include <debug.h>
 #include <netinet/in.h>
 
-#include <apps/netutils/telnetd.h>
+#include "netutils/telnetd.h"
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
 
 #include "telnetd.h"
 

examples/cc3000/telnetd_driver.c

@@ -61,7 +61,7 @@
 
 #include <nuttx/net/net.h>
 
-#include <apps/netutils/telnetd.h>
+#include "netutils/telnetd.h"
 
 #include "telnetd.h"
 

examples/chat/chat_main.c

@@ -51,7 +51,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <apps/netutils/chat.h>
+#include "netutils/chat.h"
 
 /****************************************************************************
  * Pre-processor Definitions

examples/dhcpd/target.c

@@ -44,8 +44,8 @@
 #include <arpa/inet.h>
 #include <net/if.h>
 
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
-#include <apps/netutils/dhcpd.h>
+#include "netutils/dhcpd.h"
 
 /****************************************************************************
  * Preprocessor Definitions

examples/discover/discover_main.c

@@ -51,8 +51,8 @@
 #include <netinet/in.h>
 #include <nuttx/net/arp.h>
 
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
-#include <apps/netutils/discover.h>
+#include "netutils/discover.h"
 
 #ifdef CONFIG_EXAMPLES_DISCOVER_DHCPC
 #  include <arpa/inet.h>
@@ -65,7 +65,7 @@
 /* DHCPC may be used in conjunction with any other feature (or not) */
 
 #ifdef CONFIG_EXAMPLES_DISCOVER_DHCPC
-#  include <apps/netutils/dhcpc.h>
+#  include "netutils/dhcpc.h"
 #endif
 
 /****************************************************************************

examples/ftpc/ftpc.h

@@ -49,7 +49,7 @@
 #include <stdbool.h>
 #include <errno.h>
 
-#include <apps/netutils/ftpc.h>
+#include "netutils/ftpc.h"
 
 /****************************************************************************
  * Pre-processor Definitions

examples/ftpc/ftpc_cmds.c

@@ -41,7 +41,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <apps/netutils/ftpc.h>
+#include "netutils/ftpc.h"
 
 #include "ftpc.h"
 

examples/ftpc/ftpc_main.c

@@ -44,9 +44,9 @@
 #include <errno.h>
 
 #include <arpa/inet.h>
-#include <apps/netutils/ftpc.h>
+#include "netutils/ftpc.h"
 
-#include <apps/system/readline.h>
+#include "system/readline.h"
 
 #include "ftpc.h"
 

examples/ftpd/ftpd_main.c

@@ -46,8 +46,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
-#include <apps/netutils/ftpd.h>
+#include "netutils/ftpd.h"
 
 #include "ftpd.h"
 

examples/igmp/igmp.c

@@ -48,8 +48,8 @@
 #include <net/if.h>
 #include <netinet/in.h>
 
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
-#include <apps/netutils/ipmsfilter.h>
+#include "netutils/ipmsfilter.h"
 
 #include "igmp.h"
 

examples/json/json_main.c

@@ -38,7 +38,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <apps/netutils/cJSON.h>
+#include "netutils/cJSON.h"
 
 /****************************************************************************
  * Private Types

examples/modbus/modbus_main.c

@@ -68,8 +68,8 @@
 #include <signal.h>
 #include <errno.h>
 
-#include <apps/modbus/mb.h>
+#include "modbus/mb.h"
-#include <apps/modbus/mbport.h>
+#include "modbus/mbport.h"
 
 /****************************************************************************
  * Pre-processor Definitions

examples/netloop/lo_listener.c

@@ -58,7 +58,7 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
 
 #include "netloop.h"
 

examples/nettest/nettest.c

@@ -52,7 +52,7 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
 
 #include "nettest.h"
 

examples/nrf24l01_term/nrf24l01_term.c

@@ -57,7 +57,7 @@
 
 #include <nuttx/wireless/nrf24l01.h>
 
-#include <apps/system/readline.h>
+#include "system/readline.h"
 
 #ifdef CONFIG_DISABLE_POLL
 #  error The poll interface is required for the nRF24L01 terminal example. You must disable config option DISABLE_POLL.

examples/nsh/nsh_main.c

@@ -55,7 +55,7 @@
 #  include <nuttx/binfmt/symtab.h>
 #endif
 
-#include <apps/nshlib/nshlib.h>
+#include "nshlib/nshlib.h"
 
 /****************************************************************************
  * Pre-processor Definitions

examples/nxterm/nxterm_main.c

@@ -66,7 +66,7 @@
 #include <nuttx/nx/nxfonts.h>
 #include <nuttx/nx/nxterm.h>
 
-#include <apps/nshlib/nshlib.h>
+#include "nshlib/nshlib.h"
 
 #include "nxterm_internal.h"
 

examples/pashello/pashello.c

@@ -43,7 +43,7 @@
 #include <stdlib.h>
 #include <debug.h>
 
-#include <apps/interpreters/prun.h>
+#include "interpreters/prun.h"
 
 #include "pashello.h"
 

examples/poll/net_listener.c

@@ -58,7 +58,7 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
 
 #include "poll_internal.h"
 

examples/poll/net_reader.c

@@ -58,7 +58,7 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
 
 #include "poll_internal.h"
 

examples/pppd/pppd_main.c

@@ -40,7 +40,7 @@
 #include <nuttx/config.h>
 #include <stdio.h>
 
-#include <apps/netutils/pppd.h>
+#include "netutils/pppd.h"
 
 /****************************************************************************
  * Pre-processor Definitions

examples/sendmail/sendmail_main.c

@@ -49,8 +49,8 @@
 #include <netinet/in.h>
 
 #include <nuttx/net/ip.h>
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
-#include <apps/netutils/smtp.h>
+#include "netutils/smtp.h"
 
 /****************************************************************************
  * Pre-processor Defintitions

examples/tcpecho/tcpecho_main.c

@@ -58,7 +58,7 @@
 #include <arpa/inet.h>
 
 #include <nuttx/net/arp.h>
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
 
 #ifdef CONFIG_EXAMPLES_TCPECHO_DHCPC
 #  include <arpa/inet.h>
@@ -71,7 +71,7 @@
 /* DHCPC may be used in conjunction with any other feature (or not) */
 
 #ifdef CONFIG_EXAMPLES_TCPECHO_DHCPC
-#  include <apps/netutils/dhcpc.h>
+#  include "netutils/dhcpc.h"
 #endif
 
 /****************************************************************************

examples/telnetd/telnetd.c

@@ -48,8 +48,8 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 
-#include <apps/netutils/telnetd.h>
+#include "netutils/telnetd.h"
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
 
 #include "telnetd.h"
 

examples/thttpd/thttpd_main.c

@@ -54,8 +54,8 @@
 #include <netinet/ether.h>
 
 #include <nuttx/net/arp.h>
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
-#include <apps/netutils/thttpd.h>
+#include "netutils/thttpd.h"
 
 #include <nuttx/fs/ramdisk.h>
 #include <nuttx/binfmt/binfmt.h>

examples/tiff/tiff_main.c

@@ -43,7 +43,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <apps/graphics/tiff.h>
+#include "graphics/tiff.h"
 
 /****************************************************************************
  * Pre-Processor Definitions

examples/udp/target.c

@@ -45,7 +45,7 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
 
 #include "udp-internal.h"
 

examples/udpblaster/udpblaster_target.c

@@ -47,7 +47,7 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
 
 #include "udpblaster.h"
 

examples/usbterm/usbterm_main.c

@@ -51,7 +51,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <apps/system/readline.h>
+#include "system/readline.h"
 
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>

examples/webserver/cgi.c

@@ -41,7 +41,7 @@
 #include <sys/socket.h>
 
 #include <nuttx/net/netstats.h>
-#include <apps/netutils/httpd.h>
+#include "netutils/httpd.h"
 
 #include "cgi.h"
 

examples/webserver/webserver_main.c

@@ -57,7 +57,7 @@
 #include <netinet/in.h>
 
 #include <nuttx/net/arp.h>
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
 
 #ifdef CONFIG_EXAMPLES_WEBSERVER_DHCPC
 #include <arpa/inet.h>
@@ -70,12 +70,12 @@
 /* DHCPC may be used in conjunction with any other feature (or not) */
 
 #ifdef CONFIG_EXAMPLES_WEBSERVER_DHCPC
-# include <apps/netutils/dhcpc.h>
+# include "netutils/dhcpc.h"
 #endif
 
 /* Include uIP webserver definitions */
 
-#include <apps/netutils/httpd.h>
+#include "netutils/httpd.h"
 
 #include "cgi.h"
 

examples/wget/wget_main.c

@@ -46,8 +46,8 @@
 #include <arpa/inet.h>
 #include <net/if.h>
 
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
-#include <apps/netutils/webclient.h>
+#include "netutils/webclient.h"
 
 /****************************************************************************
  * Preprocessor Definitions

examples/wgetjson/wgetjson_main.c

@@ -49,9 +49,9 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
-#include <apps/netutils/webclient.h>
+#include "netutils/webclient.h"
-#include <apps/netutils/cJSON.h>
+#include "netutils/cJSON.h"
 
 /****************************************************************************
  * Pre-processor Definitions

examples/xmlrpc/calls.c

@@ -45,7 +45,7 @@
  ****************************************************************************/
 
 #include <string.h>
-#include <apps/netutils/xmlrpc.h>
+#include "netutils/xmlrpc.h"
 
 /****************************************************************************
  * Private Function Prototypes

examples/xmlrpc/xmlrpc_main.c

@@ -67,8 +67,8 @@
 #include <netinet/in.h>
 
 #include <nuttx/net/arp.h>
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
-#include <apps/netutils/xmlrpc.h>
+#include "netutils/xmlrpc.h"
 
 #ifdef CONFIG_EXAMPLES_XMLRPC_DHCPC
 #  include <arpa/inet.h>
@@ -81,7 +81,7 @@
 /* DHCPC may be used in conjunction with any other feature (or not) */
 
 #ifdef CONFIG_EXAMPLES_XMLRPC_DHCPC
-#  include <apps/netutils/dhcpc.h>
+#  include "netutils/dhcpc.h"
 #endif
 
 /****************************************************************************

fsutils/flash_eraseall/flash_eraseall.c

@@ -46,7 +46,7 @@
 #include <debug.h>
 
 #include <nuttx/mtd/mtd.h>
-#include <apps/fsutils/flash_eraseall.h>
+#include "fsutils/flash_eraseall.h"
 
 /****************************************************************************
  * Public Functions

fsutils/inifile/inifile.c

@@ -44,7 +44,7 @@
 #include <string.h>
 #include <debug.h>
 
-#include <apps/fsutils/inifile.h>
+#include "fsutils/inifile.h"
 
 /****************************************************************************
  * Pre-processor Definitions

fsutils/mksmartfs/mksmartfs.c

@@ -45,7 +45,7 @@
 #include <errno.h>
 # if !defined(CONFIG_DISABLE_MOUNTPOINT)
 #   ifdef CONFIG_FS_SMARTFS
-#     include <apps/fsutils/mksmartfs.h>
+#     include "fsutils/mksmartfs.h"
 #     include <nuttx/fs/ioctl.h>
 #     include <nuttx/fs/smart.h>
 #   endif

fsutils/passwd/passwd_adduser.c

@@ -40,7 +40,7 @@
 #include <semaphore.h>
 #include <errno.h>
 
-#include <apps/fsutils/passwd.h>
+#include "fsutils/passwd.h"
 #include "passwd.h"
 
 /****************************************************************************

fsutils/passwd/passwd_deluser.c

@@ -39,7 +39,7 @@
 
 #include <semaphore.h>
 
-#include <apps/fsutils/passwd.h>
+#include "fsutils/passwd.h"
 
 #include "passwd.h"
 

fsutils/passwd/passwd_update.c

@@ -39,7 +39,7 @@
 
 #include <semaphore.h>
 
-#include <apps/fsutils/passwd.h>
+#include "fsutils/passwd.h"
 #include <passwd.h>
 
 /****************************************************************************

fsutils/passwd/passwd_verify.c

@@ -40,7 +40,7 @@
 #include <string.h>
 #include <semaphore.h>
 
-#include <apps/fsutils/passwd.h>
+#include "fsutils/passwd.h"
 #include "passwd.h"
 
 /****************************************************************************

gpsutils/minmea/minmea.c

@@ -43,7 +43,7 @@
 #include <ctype.h>
 #include <stdarg.h>
 
-#include <apps/gpsutils/minmea.h>
+#include "gpsutils/minmea.h"
 
 /****************************************************************************
  * Pre-processor Definitions

graphics/screenshot/Makefile

@@ -1,7 +1,7 @@
 ############################################################################
 # apps/examples/screenshot/Makefile
 #
-#   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,10 +37,6 @@
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
-ifeq ($(WINTOOL),y)
-INCDIROPT = -w
-endif
-
 # TIFF Screenshot utility
 
 ASRCS =

graphics/screenshot/screenshot_main.c

@@ -48,7 +48,7 @@
 #include <semaphore.h>
 #include <errno.h>
 
-#include <apps/graphics/tiff.h>
+#include "graphics/tiff.h"
 
 #include <nuttx/nx/nx.h>
 

graphics/tiff/tiff_addstrip.c

@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <apps/graphics/tiff.h>
+#include "graphics/tiff.h"
 
 #include "tiff_internal.h"
 

graphics/tiff/tiff_finalize.c

@@ -44,7 +44,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <apps/graphics/tiff.h>
+#include "graphics/tiff.h"
 
 #include "tiff_internal.h"
 

graphics/tiff/tiff_initialize.c

@@ -47,7 +47,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <apps/graphics/tiff.h>
+#include "graphics/tiff.h"
 
 #include "tiff_internal.h"
 

graphics/tiff/tiff_internal.h

@@ -46,7 +46,7 @@
 #include <stdint.h>
 
 #include <nuttx/nx/nxglib.h>
-#include <apps/graphics/tiff.h>
+#include "graphics/tiff.h"
 
 /****************************************************************************
  * Pre-Processor Definitions

graphics/tiff/tiff_utils.c

@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <apps/graphics/tiff.h>
+#include "graphics/tiff.h"
 
 #include "tiff_internal.h"
 

graphics/traveler/Makefile

@@ -1,7 +1,7 @@
 ############################################################################
 # apps/graphics/traveler/Makefile
 #
-#   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -109,10 +109,6 @@ endif
 CONFIG_EXAMPLES_HELLO_PROGNAME ?= hello$(EXEEXT)
 PROGNAME = $(CONFIG_EXAMPLES_HELLO_PROGNAME)
 
-ifeq ($(WINTOOL),y)
-INCDIROPT = -w
-endif
-
 CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TRAVELER_INC)}
 
 DEPPATH = --dep-path . --dep-path src

graphics/traveler/src/trv_world.c

@@ -49,7 +49,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <apps/fsutils/inifile.h>
+#include "fsutils/inifile.h"
 
 /****************************************************************************
  * Pre-processor Definitions

include/netutils/httpd.h

@@ -189,6 +189,9 @@ extern "C"
 #  define EXTERN extern
 #endif
 
+EXTERN const struct httpd_fsdata_file g_httpdfs_root[];
+EXTERN const int g_httpd_numfiles;
+
 /****************************************************************************
  * Public Function Prototypes
  ****************************************************************************/
@@ -198,9 +201,6 @@ int httpd_listen(void);
 void httpd_cgi_register(struct httpd_cgi_call *cgi_call);
 uint16_t httpd_fs_count(char *name);
 
-const struct httpd_fsdata_file g_httpdfs_root[];
-const int g_httpd_numfiles;
-
 #undef EXTERN
 #ifdef __cplusplus
 }

interpreters/bas/Makefile

@@ -1,7 +1,7 @@
 ############################################################################
 # apps/bas/Makefile
 #
-#   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -50,10 +50,6 @@ endif
 DEPPATH = --dep-path .
 VPATH = .
 
-ifeq ($(WINTOOL),y)
-INCDIROPT = -w
-endif
-
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 COBJS		= $(CSRCS:.c=$(OBJEXT))
 

interpreters/ficl/Makefile

@@ -1,7 +1,7 @@
 ############################################################################
 # apps/interpreters/ficl/Makefile
 #
-#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2012, 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,10 +40,6 @@ include $(APPDIR)/Make.defs
 
 # Tools
 
-ifeq ($(WINTOOL),y)
-INCDIROPT = -w
-endif
-
 # Include paths
 
 CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(BUILDDIR)/$(FICL_SUBDIR) $(BUILDDIR)/src}

modbus/Makefile

@@ -1,7 +1,7 @@
 ############################################################################
 # apps/modbus/Makefile
 #
-#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -48,10 +48,6 @@ CSRCS += mb.c
 DEPPATH = --dep-path .
 VPATH = .
 
-ifeq ($(WINTOOL),y)
-INCDIROPT = -w
-endif
-
 include ascii/Make.defs
 include functions/Make.defs
 include nuttx/Make.defs

modbus/ascii/mbascii.c

@@ -40,9 +40,9 @@
 
 #include "port.h"
 
-#include <apps/modbus/mb.h>
+#include "modbus/mb.h"
-#include <apps/modbus/mbframe.h>
+#include "modbus/mbframe.h"
-#include <apps/modbus/mbport.h>
+#include "modbus/mbport.h"
 
 #include "mbascii.h"
 #include "mbcrc.h"

modbus/functions/mbfunccoils.c

@@ -39,10 +39,10 @@
 
 #include "port.h"
 
-#include <apps/modbus/mb.h>
+#include "modbus/mb.h"
-#include <apps/modbus/mbframe.h>
+#include "modbus/mbframe.h"
-#include <apps/modbus/mbproto.h>
+#include "modbus/mbproto.h"
-#include <apps/modbus/mbport.h>
+#include "modbus/mbport.h"
 
 /****************************************************************************
  * Pre-processor Definitions

modbus/functions/mbfunccoils_m.c

@@ -39,11 +39,11 @@
 
 #include "port.h"
 
-#include <apps/modbus/mb.h>
+#include "modbus/mb.h"
-#include <apps/modbus/mb_m.h>
+#include "modbus/mb_m.h"
-#include <apps/modbus/mbframe.h>
+#include "modbus/mbframe.h"
-#include <apps/modbus/mbproto.h>
+#include "modbus/mbproto.h"
-#include <apps/modbus/mbport.h>
+#include "modbus/mbport.h"
 
 /****************************************************************************
  * Pre-processor Definitions

modbus/functions/mbfuncdisc.c

@@ -39,9 +39,9 @@
 
 #include "port.h"
 
-#include <apps/modbus/mb.h>
+#include "modbus/mb.h"
-#include <apps/modbus/mbframe.h>
+#include "modbus/mbframe.h"
-#include <apps/modbus/mbproto.h>
+#include "modbus/mbproto.h"
 
 /****************************************************************************
  * Pre-processor Definitions

modbus/functions/mbfuncdisc_m.c

@@ -39,10 +39,10 @@
 
 #include "port.h"
 
-#include <apps/modbus/mb.h>
+#include "modbus/mb.h"
-#include <apps/modbus/mb_m.h>
+#include "modbus/mb_m.h"
-#include <apps/modbus/mbframe.h>
+#include "modbus/mbframe.h"
-#include <apps/modbus/mbproto.h>
+#include "modbus/mbproto.h"
 
 /****************************************************************************
  * Pre-processor Definitions

modbus/functions/mbfuncholding.c

@@ -39,9 +39,9 @@
 
 #include "port.h"
 
-#include <apps/modbus/mb.h>
+#include "modbus/mb.h"
-#include <apps/modbus/mbframe.h>
+#include "modbus/mbframe.h"
-#include <apps/modbus/mbproto.h>
+#include "modbus/mbproto.h"
 
 /****************************************************************************
  * Pre-processor Definitions

modbus/functions/mbfuncholding_m.c

@@ -39,10 +39,10 @@
 
 #include "port.h"
 
-#include <apps/modbus/mb.h>
+#include "modbus/mb.h"
-#include <apps/modbus/mb_m.h>
+#include "modbus/mb_m.h"
-#include <apps/modbus/mbframe.h>
+#include "modbus/mbframe.h"
-#include <apps/modbus/mbproto.h>
+#include "modbus/mbproto.h"
 
 /****************************************************************************
  * Pre-processor Definitions

modbus/functions/mbfuncinput.c

@@ -39,9 +39,9 @@
 
 #include "port.h"
 
-#include <apps/modbus/mb.h>
+#include "modbus/mb.h"
-#include <apps/modbus/mbframe.h>
+#include "modbus/mbframe.h"
-#include <apps/modbus/mbproto.h>
+#include "modbus/mbproto.h"
 
 /****************************************************************************
  * Pre-processor Definitions

modbus/functions/mbfuncinput_m.c

@@ -39,10 +39,10 @@
 
 #include "port.h"
 
-#include <apps/modbus/mb.h>
+#include "modbus/mb.h"
-#include <apps/modbus/mb_m.h>
+#include "modbus/mb_m.h"
-#include <apps/modbus/mbframe.h>
+#include "modbus/mbframe.h"
-#include <apps/modbus/mbproto.h>
+#include "modbus/mbproto.h"
 
 /****************************************************************************
  * Pre-processor Definitions

modbus/functions/mbfuncother.c

@@ -39,9 +39,9 @@
 
 #include "port.h"
 
-#include <apps/modbus/mb.h>
+#include "modbus/mb.h"
-#include <apps/modbus/mbframe.h>
+#include "modbus/mbframe.h"
-#include <apps/modbus/mbproto.h>
+#include "modbus/mbproto.h"
 
 #ifdef CONFIG_MB_FUNC_OTHER_REP_SLAVEID_ENABLED
 

modbus/functions/mbutils.c

@@ -40,8 +40,8 @@
 
 #include "port.h"
 
-#include <apps/modbus/mb.h>
+#include "modbus/mb.h"
-#include <apps/modbus/mbproto.h>
+#include "modbus/mbproto.h"
 
 /****************************************************************************
  * Pre-processor Definitions

modbus/mb.c

@@ -39,12 +39,12 @@
 
 #include "port.h"
 
-#include <apps/modbus/mb.h>
+#include "modbus/mb.h"
-#include <apps/modbus/mbframe.h>
+#include "modbus/mbframe.h"
-#include <apps/modbus/mbproto.h>
+#include "modbus/mbproto.h"
-#include <apps/modbus/mbfunc.h>
+#include "modbus/mbfunc.h"
 
-#include <apps/modbus/mbport.h>
+#include "modbus/mbport.h"
 
 #ifdef CONFIG_MB_RTU_ENABLED
 #  include "mbrtu.h"

modbus/nuttx/portevent.c

@@ -33,8 +33,8 @@
  * Included Files
  ****************************************************************************/
 
-#include <apps/modbus/mb.h>
+#include "modbus/mb.h"
-#include <apps/modbus/mbport.h>
+#include "modbus/mbport.h"
 
 #include "port.h"
 

modbus/nuttx/portother.c

@@ -43,8 +43,8 @@
 
 #include "port.h"
 
-#include <apps/modbus/mb.h>
+#include "modbus/mb.h"
-#include <apps/modbus/mbport.h>
+#include "modbus/mbport.h"
 
 /****************************************************************************
  * Pre-processor Definitions

modbus/nuttx/portserial.c

@@ -52,8 +52,8 @@
 
 #include "port.h"
 
-#include <apps/modbus/mb.h>
+#include "modbus/mb.h"
-#include <apps/modbus/mbport.h>
+#include "modbus/mbport.h"
 
 /****************************************************************************
  * Pre-processor Definitions

modbus/nuttx/porttimer.c

@@ -41,8 +41,8 @@
 
 #include "port.h"
 
-#include <apps/modbus/mb.h>
+#include "modbus/mb.h"
-#include <apps/modbus/mbport.h>
+#include "modbus/mbport.h"
 
 /****************************************************************************
  * Public Data

modbus/rtu/mbrtu.c

@@ -40,9 +40,9 @@
 
 #include "port.h"
 
-#include <apps/modbus/mb.h>
+#include "modbus/mb.h">
-#include <apps/modbus/mbframe.h>
+#include "modbus/mbframe.h"
-#include <apps/modbus/mbport.h>
+#include "modbus/mbport.h"
 
 #include "mbrtu.h"
 #include "mbcrc.h"

modbus/rtu/mbrtu_m.c

@@ -39,14 +39,14 @@
 
 #include "port.h"
 
-#include <apps/modbus/mb.h>
+#include "modbus/mb.h"
-#include <apps/modbus/mb_m.h>
+#include "modbus/mb_m.h"
 #include "mbrtu.h"
-#include <apps/modbus/mbframe.h>
+#include "modbus/mbframe.h"
 
 #include "mbcrc.h"
 
-#include <apps/modbus/mbport.h>
+#include "modbus/mbport.h"
 
 #if defined(CONFIG_RTU_ASCII_MASTER)
 

modbus/tcp/mbtcp.c

@@ -37,7 +37,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <apps/modbus/mb.h>
+#include "modbus/mb.h"
 
 #include "port.h"
 #include "mbtcp.h"

netutils/chat/chat.h

@@ -40,7 +40,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <apps/netutils/chat.h>
+#include "netutils/chat.h"
 
 /****************************************************************************
  * Public Types

netutils/codecs/base64.c

@@ -57,7 +57,7 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include <apps/netutils/base64.h>
+#include "netutils/base64.h"
 
 #ifdef CONFIG_CODECS_BASE64
 

netutils/codecs/md5.c

@@ -65,7 +65,7 @@
 #include <string.h>
 #include <stdint.h>
 
-#include <apps/netutils/md5.h>
+#include "netutils/md5.h"
 
 #ifdef CONFIG_CODECS_HASH_MD5
 

netutils/codecs/urldecode.c

@@ -42,7 +42,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <apps/netutils/urldecode.h>
+#include "netutils/urldecode.h"
 
 /****************************************************************************
  * Pre-processor Definitions

netutils/dhcpc/dhcpc.c

@@ -54,8 +54,8 @@
 
 #include <arpa/inet.h>
 
-#include <apps/netutils/dhcpc.h>
+#include "netutils/dhcpc.h"
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
 
 /****************************************************************************
  * Pre-processor Definitions

netutils/dhcpd/dhcpd.c

@@ -55,7 +55,7 @@
 #  include <nuttx/config.h>          /* NuttX configuration */
 #  include <debug.h>                 /* For nerr, info */
 #  include <nuttx/compiler.h>        /* For CONFIG_CPP_HAVE_WARNING */
-#  include <apps/netutils/dhcpd.h>   /* Advertised DHCPD APIs */
+#  include "netutils/dhcpd.h"        /* Advertised DHCPD APIs */
 #endif
 
 #include <sys/socket.h>
@@ -72,7 +72,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <apps/netutils/netlib.h>
+#include "netutils/netlib.h"
 
 /****************************************************************************
  * Private Data

netutils/discover/discover.c

@@ -58,7 +58,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <apps/netutils/discover.h>
+#include "netutils/discover.h"
 
 /****************************************************************************
  * Pre-processor Definitions

netutils/esp8266/esp8266.c

@@ -58,7 +58,7 @@
 
 #include <arpa/inet.h>
 
-#include "apps/netutils/esp8266.h"
+#include "netutils/esp8266.h"
 
 #ifdef CONFIG_NETUTILS_ESP8266
 

netutils/ftpc/ftpc_cdup.c

@@ -39,7 +39,7 @@
 
 #include "ftpc_config.h"
 
-#include <apps/netutils/ftpc.h>
+#include "netutils/ftpc.h"
 
 #include "ftpc_internal.h"
 

netutils/ftpc/ftpc_chdir.c

@@ -39,7 +39,7 @@
 
 #include "ftpc_config.h"
 
-#include <apps/netutils/ftpc.h>
+#include "netutils/ftpc.h"
 
 #include "ftpc_internal.h"
 

netutils/ftpc/ftpc_chmod.c

@@ -40,7 +40,7 @@
 #include "ftpc_config.h"
 
 #include <debug.h>
-#include <apps/netutils/ftpc.h>
+#include "netutils/ftpc.h"
 
 #include "ftpc_internal.h"
 

netutils/ftpc/ftpc_connect.c

@@ -47,7 +47,7 @@
 
 #include <arpa/inet.h>
 
-#include <apps/netutils/ftpc.h>
+#include "netutils/ftpc.h"
 
 #include "ftpc_internal.h"
 

netutils/ftpc/ftpc_disconnect.c

@@ -41,7 +41,7 @@
 
 #include <stdlib.h>
 
-#include <apps/netutils/ftpc.h>
+#include "netutils/ftpc.h"
 
 #include "ftpc_internal.h"
 

netutils/ftpc/ftpc_filesize.c

@@ -42,7 +42,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include <apps/netutils/ftpc.h>
+#include "netutils/ftpc.h"
 
 #include "ftpc_internal.h"
 

netutils/ftpc/ftpc_filetime.c

@@ -42,7 +42,7 @@
 #include <string.h>
 #include <time.h>
 
-#include <apps/netutils/ftpc.h>
+#include "netutils/ftpc.h"
 
 #include "ftpc_internal.h"
 

netutils/ftpc/ftpc_getfile.c

@@ -46,7 +46,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <apps/netutils/ftpc.h>
+#include "netutils/ftpc.h"
 
 #include "ftpc_internal.h"
 

netutils/ftpc/ftpc_help.c

@@ -39,7 +39,7 @@
 
 #include "ftpc_config.h"
 
-#include <apps/netutils/ftpc.h>
+#include "netutils/ftpc.h"
 
 #include "ftpc_internal.h"
 

netutils/ftpc/ftpc_idle.c

@@ -40,7 +40,7 @@
 #include "ftpc_config.h"
 
 #include <debug.h>
-#include <apps/netutils/ftpc.h>
+#include "netutils/ftpc.h"
 
 #include "ftpc_internal.h"
 

netutils/ftpc/ftpc_internal.h

@@ -54,7 +54,7 @@
 
 #include <netinet/in.h>
 
-#include <apps/netutils/ftpc.h>
+#include "netutils/ftpc.h"
 
 /****************************************************************************
  * Pre-processor Definitions

netutils/ftpc/ftpc_listdir.c

@@ -47,7 +47,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <apps/netutils/ftpc.h>
+#include "netutils/ftpc.h"
 
 #include "ftpc_internal.h"
 

netutils/ftpc/ftpc_login.c

@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <apps/netutils/ftpc.h>
+#include "netutils/ftpc.h"
 
 #include "ftpc_internal.h"