From 468bdcf8e6247e1f8032a87a0093566a79e16156 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 11 Jun 2016 14:13:39 -0600 Subject: [PATCH] Rename CONFIG_DEBUG to CONFIG_DEBUG_FEATURES --- examples/README.txt | 6 +- examples/cc3000/telnetd_daemon.c | 2 +- examples/cc3000/telnetd_driver.c | 2 +- examples/elf/elf_main.c | 6 +- examples/helloxx/helloxx_main.cxx | 2 +- examples/nxflat/nxflat_main.c | 6 +- examples/ostest/ostest.h | 4 +- examples/posix_spawn/spawn_main.c | 6 +- examples/usbserial/Kconfig | 10 +- examples/usbterm/Kconfig | 10 +- graphics/tiff/tiff_initialize.c | 4 +- netutils/ftpc/Kconfig | 2 +- netutils/ftpc/ftpc_connect.c | 6 +- netutils/ftpc/ftpc_putfile.c | 4 +- netutils/telnetd/telnetd_daemon.c | 2 +- netutils/tftpc/tftpc_get.c | 2 +- netutils/tftpc/tftpc_internal.h | 2 +- netutils/tftpc/tftpc_packets.c | 2 +- netutils/tftpc/tftpc_put.c | 2 +- netutils/thttpd/Kconfig | 2 +- netutils/thttpd/config.h | 2 +- netutils/thttpd/libhttpd.c | 10 +- netutils/webserver/httpd.c | 4 +- nshlib/Kconfig | 14 +- nshlib/nsh_usbkeyboard.c | 2 +- platform/arduino-due/sam_cxxinitialize.c | 2 +- platform/cloudctrl/stm32_cxxinitialize.c | 2 +- platform/fire-stm32v2/stm32_cxxinitialize.c | 2 +- platform/mikroe-stm32f4/stm32_cxxinitialize.c | 2 +- platform/nucleo-144/stm32_cxxinitialize.c | 2 +- platform/nucleo-f303re/stm32_cxxinitialize.c | 2 +- platform/nucleo-f4x1re/stm32_cxxinitialize.c | 2 +- platform/nucleo-l476rg/stm32_cxxinitialize.c | 2 +- .../olimex-stm32-h405/stm32_cxxinitialize.c | 2 +- .../olimex-stm32-h407/stm32_cxxinitialize.c | 2 +- .../olimex-stm32-p207/stm32_cxxinitialize.c | 2 +- .../olimexino-stm32/stm32_cxxinitialize.c | 2 +- platform/pcduino-a10/a1x_cxxinitialize.c | 2 +- platform/sabre-6quad/imx_cxxinitialize.c | 2 +- platform/sam3u-ek/sam_cxxinitialized.c | 2 +- platform/sam4e-ek/sam_cxxinitialize.c | 2 +- platform/sam4l-xplained/sam_cxxinitialize.c | 2 +- .../sam4s-xplained-pro/sam_cxxinitialize.c | 2 +- platform/sam4s-xplained/sam_cxxinitialize.c | 2 +- platform/sama5d2-xult/sam_cxxinitialize.c | 2 +- platform/sama5d3-xplained/sam_cxxinitialize.c | 2 +- platform/sama5d3x-ek/sam_cxxinitialize.c | 2 +- platform/sama5d4-ek/sam_cxxinitialize.c | 2 +- platform/samd20-xplained/sam_cxxinitialize.c | 2 +- platform/samd21-xplained/sam_cxxinitialize.c | 2 +- platform/same70-xplained/sam_cxxinitialize.c | 2 +- platform/saml21-xplained/sam_cxxinitialize.c | 2 +- platform/samv71-xult/sam_cxxinitialize.c | 2 +- platform/shenzhou/stm32_cxxinitialize.c | 2 +- platform/spark/stm32_cxxinitialize.c | 2 +- platform/stm3220g-eval/stm32_cxxinitialize.c | 2 +- platform/stm3240g-eval/stm32_cxxinitialize.c | 2 +- .../stm32f3discovery/stm32_cxxinitialize.c | 2 +- .../stm32f429i-disco/stm32_cxxinitialize.c | 2 +- .../stm32f4discovery/stm32_cxxinitialize.c | 2 +- .../stm32f746g-disco/stm32_cxxinitialize.c | 2 +- .../stm32l476vg-disco/stm32_cxxinitialize.c | 2 +- .../stm32ldiscovery/stm32_cxxinitialize.c | 2 +- platform/teensy-lc/kl_cxxinitialize.c | 2 +- .../viewtool-stm32f107/stm32_cxxinitialize.c | 2 +- system/cdcacm/Kconfig | 10 +- system/cdcacm/README.txt | 86 ++++----- system/composite/Kconfig | 10 +- system/composite/README.txt | 152 ++++++++-------- system/nxplayer/nxplayer.c | 12 +- system/usbmsc/Kconfig | 10 +- system/usbmsc/README.txt | 164 +++++++++--------- system/zmodem/Makefile.host | 4 +- system/zmodem/README.txt | 2 +- 74 files changed, 322 insertions(+), 322 deletions(-) diff --git a/examples/README.txt b/examples/README.txt index e5b0e9e55..bd053d634 100644 --- a/examples/README.txt +++ b/examples/README.txt @@ -484,7 +484,7 @@ examples/ftpc You may also want to define the following in your configuration file. Otherwise, you will have not feeback about what is going on: - CONFIG_DEBUG=y + CONFIG_DEBUG_FEATURES=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_FTPC=y @@ -2089,7 +2089,7 @@ examples/usbserial CONFIG_EXAMPLES_USBSERIAL_ONLYBIG Send only large, multi-packet messages. Default: Send large and small. - If CONFIG_USBDEV_TRACE is enabled (or CONFIG_DEBUG and CONFIG_DEBUG_USB), then + If CONFIG_USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the example code will also manage the USB trace output. The amount of trace output can be controlled using: @@ -2184,7 +2184,7 @@ examples/usbterm CONFIG_EXAMPLES_USBTERM_BUFLEN - The size of the input and output buffers used for receiving data. Default 256 bytes. - If CONFIG_USBDEV_TRACE is enabled (or CONFIG_DEBUG and CONFIG_DEBUG_USB, or + If CONFIG_USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB, or CONFIG_USBDEV_TRACE), then the example code will also manage the USB trace output. The amount of trace output can be controlled using: diff --git a/examples/cc3000/telnetd_daemon.c b/examples/cc3000/telnetd_daemon.c index 5b9ed2ab9..1e2cb0392 100644 --- a/examples/cc3000/telnetd_daemon.c +++ b/examples/cc3000/telnetd_daemon.c @@ -165,7 +165,7 @@ static int telnetd_daemon(int argc, char *argv[]) * being available. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES close(0); close(1); close(2); diff --git a/examples/cc3000/telnetd_driver.c b/examples/cc3000/telnetd_driver.c index c890ae418..d1a0bc753 100644 --- a/examples/cc3000/telnetd_driver.c +++ b/examples/cc3000/telnetd_driver.c @@ -180,7 +180,7 @@ static inline void telnetd_dumpbuffer(FAR const char *msg, FAR const char *buffer, unsigned int nbytes) { - /* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_NET have to be + /* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_NET have to be * defined or the following does nothing. */ diff --git a/examples/elf/elf_main.c b/examples/elf/elf_main.c index 322ba83c9..bb8c95d72 100644 --- a/examples/elf/elf_main.c +++ b/examples/elf/elf_main.c @@ -100,12 +100,12 @@ # define CONFIG_EXAMPLES_ELF_DEVPATH "/dev/ram0" #endif -/* If CONFIG_DEBUG is enabled, use dbg instead of printf so that the +/* If CONFIG_DEBUG_FEATURES is enabled, use dbg instead of printf so that the * output will be synchronous with the debug output. */ #ifdef CONFIG_CPP_HAVE_VARARGS -# ifdef CONFIG_DEBUG +# ifdef CONFIG_DEBUG_FEATURES # define message(format, ...) dbg(format, ##__VA_ARGS__) # define err(format, ...) dbg(format, ##__VA_ARGS__) # else @@ -113,7 +113,7 @@ # define err(format, ...) fprintf(stderr, format, ##__VA_ARGS__) # endif #else -# ifdef CONFIG_DEBUG +# ifdef CONFIG_DEBUG_FEATURES # define message dbg # define err dbg # else diff --git a/examples/helloxx/helloxx_main.cxx b/examples/helloxx/helloxx_main.cxx index 909e8b31d..064ec121d 100644 --- a/examples/helloxx/helloxx_main.cxx +++ b/examples/helloxx/helloxx_main.cxx @@ -58,7 +58,7 @@ // Debug ******************************************************************** // Non-standard debug that may be enabled just for testing the constructors -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/examples/nxflat/nxflat_main.c b/examples/nxflat/nxflat_main.c index a584a675a..e4190c6ab 100644 --- a/examples/nxflat/nxflat_main.c +++ b/examples/nxflat/nxflat_main.c @@ -96,12 +96,12 @@ #define ROMFSDEV "/dev/ram0" #define MOUNTPT "/mnt/romfs" -/* If CONFIG_DEBUG is enabled, use dbg instead of printf so that the +/* If CONFIG_DEBUG_FEATURES is enabled, use dbg instead of printf so that the * output will be synchronous with the debug output. */ #ifdef CONFIG_CPP_HAVE_VARARGS -# ifdef CONFIG_DEBUG +# ifdef CONFIG_DEBUG_FEATURES # define message(format, ...) dbg(format, ##__VA_ARGS__) # define err(format, ...) dbg(format, ##__VA_ARGS__) # else @@ -109,7 +109,7 @@ # define err(format, ...) fprintf(stderr, format, ##__VA_ARGS__) # endif #else -# ifdef CONFIG_DEBUG +# ifdef CONFIG_DEBUG_FEATURES # define message dbg # define err dbg # else diff --git a/examples/ostest/ostest.h b/examples/ostest/ostest.h index a5af19afa..61e7ef433 100644 --- a/examples/ostest/ostest.h +++ b/examples/ostest/ostest.h @@ -73,7 +73,7 @@ /* Priority inheritance */ -#if defined(CONFIG_DEBUG) && defined(CONFIG_PRIORITY_INHERITANCE) && defined(CONFIG_SEM_PHDEBUG) +#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_PRIORITY_INHERITANCE) && defined(CONFIG_SEM_PHDEBUG) # define dump_nfreeholders(s) printf(s " nfreeholders: %d\n", sem_nfreeholders()) #else # define dump_nfreeholders(s) @@ -215,7 +215,7 @@ int vfork_test(void); * priority inheritance */ -#if defined(CONFIG_DEBUG) && defined(CONFIG_PRIORITY_INHERITANCE) && defined(CONFIG_SEM_PHDEBUG) +#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_PRIORITY_INHERITANCE) && defined(CONFIG_SEM_PHDEBUG) void sem_enumholders(FAR sem_t *sem); int sem_nfreeholders(void); #else diff --git a/examples/posix_spawn/spawn_main.c b/examples/posix_spawn/spawn_main.c index fbd9dc65e..6cc47f08b 100644 --- a/examples/posix_spawn/spawn_main.c +++ b/examples/posix_spawn/spawn_main.c @@ -103,12 +103,12 @@ # define CONFIG_EXAMPLES_ELF_DEVPATH "/dev/ram0" #endif -/* If CONFIG_DEBUG is enabled, use dbg instead of printf so that the +/* If CONFIG_DEBUG_FEATURES is enabled, use dbg instead of printf so that the * output will be synchronous with the debug output. */ #ifdef CONFIG_CPP_HAVE_VARARGS -# ifdef CONFIG_DEBUG +# ifdef CONFIG_DEBUG_FEATURES # define message(format, ...) dbg(format, ##__VA_ARGS__) # define err(format, ...) dbg(format, ##__VA_ARGS__) # else @@ -116,7 +116,7 @@ # define err(format, ...) fprintf(stderr, format, ##__VA_ARGS__) # endif #else -# ifdef CONFIG_DEBUG +# ifdef CONFIG_DEBUG_FEATURES # define message dbg # define err dbg # else diff --git a/examples/usbserial/Kconfig b/examples/usbserial/Kconfig index 5133678ac..dc7def9f8 100644 --- a/examples/usbserial/Kconfig +++ b/examples/usbserial/Kconfig @@ -25,7 +25,7 @@ config EXAMPLES_USBSERIAL_TRACEINIT default n depends on USBDEV_TRACE || DEBUG_USB ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the example code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB initialization events @@ -35,7 +35,7 @@ config EXAMPLES_USBSERIAL_TRACECLASS default n depends on USBDEV_TRACE || DEBUG_USB ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the example code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB class driver events @@ -45,7 +45,7 @@ config EXAMPLES_USBSERIAL_TRACETRANSFERS default n depends on USBDEV_TRACE || DEBUG_USB ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the example code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB data transfer events @@ -55,7 +55,7 @@ config EXAMPLES_USBSERIAL_TRACECONTROLLER default n depends on USBDEV_TRACE || DEBUG_USB ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the example code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB device controller events @@ -65,7 +65,7 @@ config EXAMPLES_USBSERIAL_TRACEINTERRUPTS default n depends on USBDEV_TRACE || DEBUG_USB ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the example code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB device controller interrupt-related events. diff --git a/examples/usbterm/Kconfig b/examples/usbterm/Kconfig index 889b2892c..208aed452 100644 --- a/examples/usbterm/Kconfig +++ b/examples/usbterm/Kconfig @@ -16,7 +16,7 @@ config EXAMPLES_USBTERM_TRACEINIT default n depends on USBDEV_TRACE || DEBUG_USB ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the example code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB initialization events @@ -26,7 +26,7 @@ config EXAMPLES_USBTERM_TRACECLASS default n depends on USBDEV_TRACE || DEBUG_USB ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the example code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB class driver events @@ -36,7 +36,7 @@ config EXAMPLES_USBTERM_TRACETRANSFERS default n depends on USBDEV_TRACE || DEBUG_USB ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the example code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB data transfer events @@ -46,7 +46,7 @@ config EXAMPLES_USBTERM_TRACECONTROLLER default n depends on USBDEV_TRACE || DEBUG_USB ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the example code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB device controller events @@ -56,7 +56,7 @@ config EXAMPLES_USBTERM_TRACEINTERRUPTS default n depends on USBDEV_TRACE || DEBUG_USB ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the example code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB device controller interrupt-related events. diff --git a/graphics/tiff/tiff_initialize.c b/graphics/tiff/tiff_initialize.c index 645743164..f3757ae8a 100644 --- a/graphics/tiff/tiff_initialize.c +++ b/graphics/tiff/tiff_initialize.c @@ -203,12 +203,12 @@ #define TIFF_RGB_STRIPBCOFFSET 248 /* Debug *******************************************************************/ -/* CONFIG_DEBUG_TIFFOFFSETS may be defined (along with CONFIG_DEBUG and +/* CONFIG_DEBUG_TIFFOFFSETS may be defined (along with CONFIG_DEBUG_FEATURES and * CONFIG_DEBUG_GRAPHICS) in order to verify the pre-determined TIFF file * offsets. */ -#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_GRAPHICS) +#if !defined(CONFIG_DEBUG_FEATURES) || !defined(CONFIG_DEBUG_GRAPHICS) # undef CONFIG_DEBUG_TIFFOFFSETS #endif diff --git a/netutils/ftpc/Kconfig b/netutils/ftpc/Kconfig index ca092f5e4..938e8a86c 100644 --- a/netutils/ftpc/Kconfig +++ b/netutils/ftpc/Kconfig @@ -14,7 +14,7 @@ if NETUTILS_FTPC config DEBUG_FTPC bool "Debug FTP client" default n - depends on DEBUG + depends on DEBUG_FEATURES ---help--- Enable debug support for the FTP client. This option simple forces CONFIG_DEBUG_NET to be on, but only for the files within this directory. diff --git a/netutils/ftpc/ftpc_connect.c b/netutils/ftpc/ftpc_connect.c index 74598f931..95abcc1f3 100644 --- a/netutils/ftpc/ftpc_connect.c +++ b/netutils/ftpc/ftpc_connect.c @@ -159,7 +159,7 @@ errout: int ftpc_reconnect(FAR struct ftpc_session_s *session) { struct sockaddr_in addr; -#ifdef CONFIG_DEBUG +#ifdef CONFIG_DEBUG_FEATURES char *tmp; #endif int ret; @@ -190,7 +190,7 @@ int ftpc_reconnect(FAR struct ftpc_session_s *session) /* Connect the socket to the server */ -#ifdef CONFIG_DEBUG +#ifdef CONFIG_DEBUG_FEATURES tmp = inet_ntoa(session->addr); ndbg("Connecting to server address %s:%d\n", tmp, ntohs(session->port)); #endif @@ -236,7 +236,7 @@ int ftpc_reconnect(FAR struct ftpc_session_s *session) goto errout_with_socket; } -#ifdef CONFIG_DEBUG +#ifdef CONFIG_DEBUG_FEATURES ndbg("Connected\n"); tmp = inet_ntoa(addr.sin_addr); ndbg(" Remote address: %s:%d\n", tmp, ntohs(addr.sin_port)); diff --git a/netutils/ftpc/ftpc_putfile.c b/netutils/ftpc/ftpc_putfile.c index 29a8f17f4..0f9da8363 100644 --- a/netutils/ftpc/ftpc_putfile.c +++ b/netutils/ftpc/ftpc_putfile.c @@ -188,7 +188,7 @@ static int ftpc_sendfile(struct ftpc_session_s *session, const char *path, FILE *stream, uint8_t how, uint8_t xfrmode) { long offset = session->offset; -#ifdef CONFIG_DEBUG +#ifdef CONFIG_DEBUG_FEATURES FAR char *rname; FAR char *str; int len; @@ -261,7 +261,7 @@ static int ftpc_sendfile(struct ftpc_session_s *session, const char *path, /* Get the remote filename from the response */ -#ifdef CONFIG_DEBUG +#ifdef CONFIG_DEBUG_FEATURES str = strstr(session->reply, " for "); if (str) { diff --git a/netutils/telnetd/telnetd_daemon.c b/netutils/telnetd/telnetd_daemon.c index 405f980cf..815502974 100644 --- a/netutils/telnetd/telnetd_daemon.c +++ b/netutils/telnetd/telnetd_daemon.c @@ -231,7 +231,7 @@ static int telnetd_daemon(int argc, char *argv[]) * being available. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES close(0); close(1); close(2); diff --git a/netutils/tftpc/tftpc_get.c b/netutils/tftpc/tftpc_get.c index 6b90024f2..2b7ae8fa3 100644 --- a/netutils/tftpc/tftpc_get.c +++ b/netutils/tftpc/tftpc_get.c @@ -119,7 +119,7 @@ static inline int tftp_parsedatapacket(const uint8_t *packet, *blockno = (uint16_t)packet[2] << 8 | (uint16_t)packet[3]; return OK; } -#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_NET) +#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_NET) else if (*opcode == TFTP_ERR) { (void)tftp_parseerrpacket(packet); diff --git a/netutils/tftpc/tftpc_internal.h b/netutils/tftpc/tftpc_internal.h index 18aeabcc6..e25d5365a 100644 --- a/netutils/tftpc/tftpc_internal.h +++ b/netutils/tftpc/tftpc_internal.h @@ -162,7 +162,7 @@ extern int tftp_sockinit(struct sockaddr_in *server, in_addr_t addr); extern int tftp_mkreqpacket(uint8_t *buffer, int opcode, const char *path, bool binary); extern int tftp_mkackpacket(uint8_t *buffer, uint16_t blockno); extern int tftp_mkerrpacket(uint8_t *buffer, uint16_t errorcode, const char *errormsg); -#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_NET) +#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_NET) extern int tftp_parseerrpacket(const uint8_t *packet); #endif diff --git a/netutils/tftpc/tftpc_packets.c b/netutils/tftpc/tftpc_packets.c index 6832cd6e9..ea8a760f3 100644 --- a/netutils/tftpc/tftpc_packets.c +++ b/netutils/tftpc/tftpc_packets.c @@ -207,7 +207,7 @@ int tftp_mkerrpacket(uint8_t *buffer, uint16_t errorcode, const char *errormsg) * ****************************************************************************/ -#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_NET) +#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_NET) int tftp_parseerrpacket(const uint8_t *buffer) { uint16_t opcode = (uint16_t)buffer[0] << 8 | (uint16_t)buffer[1]; diff --git a/netutils/tftpc/tftpc_put.c b/netutils/tftpc/tftpc_put.c index 492febc16..097d64ecf 100644 --- a/netutils/tftpc/tftpc_put.c +++ b/netutils/tftpc/tftpc_put.c @@ -271,7 +271,7 @@ static int tftp_rcvack(int sd, uint8_t *packet, struct sockaddr_in *server, if (opcode != TFTP_ACK) { ninfo("Bad opcode\n"); -#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_NET) +#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_NET) if (opcode == TFTP_ERR) { (void)tftp_parseerrpacket(packet); diff --git a/netutils/thttpd/Kconfig b/netutils/thttpd/Kconfig index 68d6d79b7..4bb5606be 100644 --- a/netutils/thttpd/Kconfig +++ b/netutils/thttpd/Kconfig @@ -194,7 +194,7 @@ config THTTPD_OCCASIONAL_MSEC config THTTPD_MEMDEBUG bool "Enable memory debug" default n - depends on DEBUG && DEBUG_NET + depends on DEBUG_FEATURES && DEBUG_NET ---help--- Enable THTTPD memory usage debug output. Default: n diff --git a/netutils/thttpd/config.h b/netutils/thttpd/config.h index 2d5531794..e7e511348 100644 --- a/netutils/thttpd/config.h +++ b/netutils/thttpd/config.h @@ -215,7 +215,7 @@ /* Memory debug instrumentation depends on other debug options */ -# if (!defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_NET)) && defined(CONFIG_THTTPD_MEMDEBUG) +# if (!defined(CONFIG_DEBUG_FEATURES) || !defined(CONFIG_DEBUG_NET)) && defined(CONFIG_THTTPD_MEMDEBUG) # undef CONFIG_THTTPD_MEMDEBUG # endif diff --git a/netutils/thttpd/libhttpd.c b/netutils/thttpd/libhttpd.c index 04311f95c..6eefa1090 100644 --- a/netutils/thttpd/libhttpd.c +++ b/netutils/thttpd/libhttpd.c @@ -166,7 +166,7 @@ static int check_referer(httpd_conn *hc); #ifdef CONFIG_THTTPD_URLPATTERN static int really_check_referer(httpd_conn *hc); #endif -#ifdef CONFIG_DEBUG +#ifdef CONFIG_DEBUG_FEATURES_FEATURES static int sockaddr_check(httpd_sockaddr *saP); #else # define sockaddr_check(saP) (1) @@ -221,7 +221,7 @@ static int initialize_listen_socket(httpd_sockaddr *saP) /* Check sockaddr. */ -#ifdef CONFIG_DEBUG +#ifdef CONFIG_DEBUG_FEATURES_FEATURES if (!sockaddr_check(saP)) { ndbg("unknown sockaddr family on listen socket\n"); @@ -2038,7 +2038,7 @@ static int really_check_referer(httpd_conn *hc) } #endif /* CONFIG_THTTPD_URLPATTERN */ -#ifdef CONFIG_DEBUG +#ifdef CONFIG_DEBUG_FEATURES_FEATURES static int sockaddr_check(httpd_sockaddr *saP) { switch (saP->sin_family) @@ -2055,7 +2055,7 @@ static int sockaddr_check(httpd_sockaddr *saP) return 0; } } -#endif /* CONFIG_DEBUG */ +#endif /* CONFIG_DEBUG_FEATURES_FEATURES */ static size_t sockaddr_len(httpd_sockaddr *saP) { @@ -2307,7 +2307,7 @@ int httpd_get_conn(httpd_server *hs, int listen_fd, httpd_conn *hc) return GC_FAIL; } -#ifdef CONFIG_DEBUG +#ifdef CONFIG_DEBUG_FEATURES_FEATURES if (!sockaddr_check(&sa)) { ndbg("unknown sockaddr family\n"); diff --git a/netutils/webserver/httpd.c b/netutils/webserver/httpd.c index 774a7f66c..2f73d99af 100644 --- a/netutils/webserver/httpd.c +++ b/netutils/webserver/httpd.c @@ -193,7 +193,7 @@ static int httpd_close(struct httpd_fs_file *file) #ifdef CONFIG_NETUTILS_HTTPD_DUMPBUFFER static void httpd_dumpbuffer(FAR const char *msg, FAR const char *buffer, unsigned int nbytes) { - /* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_NET have to be + /* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_NET have to be * defined or the following does nothing. */ @@ -206,7 +206,7 @@ static void httpd_dumpbuffer(FAR const char *msg, FAR const char *buffer, unsign #ifdef CONFIG_NETUTILS_HTTPD_DUMPPSTATE static void httpd_dumppstate(struct httpd_state *pstate, const char *msg) { -#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_NET) +#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_NET) ninfo("[%d] pstate(%p): [%s]\n", pstate->ht_sockfd, pstate, msg); ninfo(" filename: [%s]\n", pstate->ht_filename); ninfo(" htfile len: %d\n", pstate->ht_file.len); diff --git a/nshlib/Kconfig b/nshlib/Kconfig index f871200d6..c19b304f8 100644 --- a/nshlib/Kconfig +++ b/nshlib/Kconfig @@ -879,7 +879,7 @@ endif #NSH_USBKBD endmenu # Console Configuration menu "USB Device Trace Support" - depends on USBDEV && (DEBUG || USBDEV_TRACE) + depends on USBDEV && (DEBUG_FEATURES || USBDEV_TRACE) config NSH_USBDEV_TRACE bool "Enable Builtin USB Trace Support" @@ -887,9 +887,9 @@ config NSH_USBDEV_TRACE ---help--- Enable builtin USB trace support in NSH. If selected, buffered USB trace data will be presented each time a command is provided to NSH. - The USB trace data will be sent to the console unless DEBUG set or - unless you are using a USB console. In those cases, the trace data - will go to the SYSLOG device. + The USB trace data will be sent to the console unless CONFIG_DEBUG_FEATURES + set or unless you are using a USB console. In those cases, the trace + data will go to the SYSLOG device. If not enabled, the USB trace support can be provided by external logic such as apps/system/usbmonitor. @@ -1038,12 +1038,12 @@ endif # NSH_NETINIT_THREAD config NSH_NETINIT_DEBUG bool "Network init debug" default n - depends on DEBUG + depends on DEBUG_FEATURES ---help--- Normally debug output is controlled by DEBUG_NET. However, that will generate a LOT of debug output, especially if CONFIG_DEBUG_INFO is - also selected. This option is intended to force VERVOSE debug - output from the NSH network initialization logic even if DEBUG_NET + also selected. This option is intended to force vervose debug + output from the NSH network initialization logic even if CONFIG_DEBUG_NET or CONFIG_DEBUG_INFO are not selected. This allows for focused, unit- level debug of the NSH network initialization logic. diff --git a/nshlib/nsh_usbkeyboard.c b/nshlib/nsh_usbkeyboard.c index 145256fee..97f2f206a 100644 --- a/nshlib/nsh_usbkeyboard.c +++ b/nshlib/nsh_usbkeyboard.c @@ -111,7 +111,7 @@ static int nsh_wait_usbready(FAR const char *msg) fd = open(NSH_USBKBD_DEVNAME, O_RDONLY); if (fd < 0) { -#ifdef CONFIG_DEBUG +#ifdef CONFIG_DEBUG_FEATURES int errcode = errno; /* ENOENT means that the USB device is not yet connected and, diff --git a/platform/arduino-due/sam_cxxinitialize.c b/platform/arduino-due/sam_cxxinitialize.c index 53289960d..27ccfea79 100644 --- a/platform/arduino-due/sam_cxxinitialize.c +++ b/platform/arduino-due/sam_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/cloudctrl/stm32_cxxinitialize.c b/platform/cloudctrl/stm32_cxxinitialize.c index 7ffcb6f02..b6685f38f 100644 --- a/platform/cloudctrl/stm32_cxxinitialize.c +++ b/platform/cloudctrl/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/fire-stm32v2/stm32_cxxinitialize.c b/platform/fire-stm32v2/stm32_cxxinitialize.c index 87811ddd7..fc5dd7c1d 100644 --- a/platform/fire-stm32v2/stm32_cxxinitialize.c +++ b/platform/fire-stm32v2/stm32_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/mikroe-stm32f4/stm32_cxxinitialize.c b/platform/mikroe-stm32f4/stm32_cxxinitialize.c index 05c430ba6..2e83a5d1c 100644 --- a/platform/mikroe-stm32f4/stm32_cxxinitialize.c +++ b/platform/mikroe-stm32f4/stm32_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/nucleo-144/stm32_cxxinitialize.c b/platform/nucleo-144/stm32_cxxinitialize.c index 6d592a1a3..1970d880f 100644 --- a/platform/nucleo-144/stm32_cxxinitialize.c +++ b/platform/nucleo-144/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ * constructors */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/nucleo-f303re/stm32_cxxinitialize.c b/platform/nucleo-f303re/stm32_cxxinitialize.c index e915348ac..6dbe6f2bf 100644 --- a/platform/nucleo-f303re/stm32_cxxinitialize.c +++ b/platform/nucleo-f303re/stm32_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/nucleo-f4x1re/stm32_cxxinitialize.c b/platform/nucleo-f4x1re/stm32_cxxinitialize.c index c7f4b9488..933102b0c 100644 --- a/platform/nucleo-f4x1re/stm32_cxxinitialize.c +++ b/platform/nucleo-f4x1re/stm32_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/nucleo-l476rg/stm32_cxxinitialize.c b/platform/nucleo-l476rg/stm32_cxxinitialize.c index f94721ab5..ace93d39e 100644 --- a/platform/nucleo-l476rg/stm32_cxxinitialize.c +++ b/platform/nucleo-l476rg/stm32_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/olimex-stm32-h405/stm32_cxxinitialize.c b/platform/olimex-stm32-h405/stm32_cxxinitialize.c index 786118dd1..05e6248c8 100644 --- a/platform/olimex-stm32-h405/stm32_cxxinitialize.c +++ b/platform/olimex-stm32-h405/stm32_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/olimex-stm32-h407/stm32_cxxinitialize.c b/platform/olimex-stm32-h407/stm32_cxxinitialize.c index 8511cf2b4..98c551164 100644 --- a/platform/olimex-stm32-h407/stm32_cxxinitialize.c +++ b/platform/olimex-stm32-h407/stm32_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/olimex-stm32-p207/stm32_cxxinitialize.c b/platform/olimex-stm32-p207/stm32_cxxinitialize.c index 4aa67c363..6286cba68 100644 --- a/platform/olimex-stm32-p207/stm32_cxxinitialize.c +++ b/platform/olimex-stm32-p207/stm32_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/olimexino-stm32/stm32_cxxinitialize.c b/platform/olimexino-stm32/stm32_cxxinitialize.c index 543956d98..ec4f4393a 100644 --- a/platform/olimexino-stm32/stm32_cxxinitialize.c +++ b/platform/olimexino-stm32/stm32_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/pcduino-a10/a1x_cxxinitialize.c b/platform/pcduino-a10/a1x_cxxinitialize.c index caca40f3d..ce50f2180 100644 --- a/platform/pcduino-a10/a1x_cxxinitialize.c +++ b/platform/pcduino-a10/a1x_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/sabre-6quad/imx_cxxinitialize.c b/platform/sabre-6quad/imx_cxxinitialize.c index ac1b00402..b4bc3698a 100644 --- a/platform/sabre-6quad/imx_cxxinitialize.c +++ b/platform/sabre-6quad/imx_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/sam3u-ek/sam_cxxinitialized.c b/platform/sam3u-ek/sam_cxxinitialized.c index 766b938b2..47f686ddf 100644 --- a/platform/sam3u-ek/sam_cxxinitialized.c +++ b/platform/sam3u-ek/sam_cxxinitialized.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/sam4e-ek/sam_cxxinitialize.c b/platform/sam4e-ek/sam_cxxinitialize.c index 7e4d16a6a..b0abe5b26 100644 --- a/platform/sam4e-ek/sam_cxxinitialize.c +++ b/platform/sam4e-ek/sam_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/sam4l-xplained/sam_cxxinitialize.c b/platform/sam4l-xplained/sam_cxxinitialize.c index 881a1dd4f..7f473e993 100644 --- a/platform/sam4l-xplained/sam_cxxinitialize.c +++ b/platform/sam4l-xplained/sam_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/sam4s-xplained-pro/sam_cxxinitialize.c b/platform/sam4s-xplained-pro/sam_cxxinitialize.c index f6e090322..8d55c47fa 100644 --- a/platform/sam4s-xplained-pro/sam_cxxinitialize.c +++ b/platform/sam4s-xplained-pro/sam_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/sam4s-xplained/sam_cxxinitialize.c b/platform/sam4s-xplained/sam_cxxinitialize.c index 7e8c65993..54e4afa71 100644 --- a/platform/sam4s-xplained/sam_cxxinitialize.c +++ b/platform/sam4s-xplained/sam_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/sama5d2-xult/sam_cxxinitialize.c b/platform/sama5d2-xult/sam_cxxinitialize.c index 283cc6d9d..a47f0c188 100644 --- a/platform/sama5d2-xult/sam_cxxinitialize.c +++ b/platform/sama5d2-xult/sam_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/sama5d3-xplained/sam_cxxinitialize.c b/platform/sama5d3-xplained/sam_cxxinitialize.c index 013e3ded3..20f87c4bf 100644 --- a/platform/sama5d3-xplained/sam_cxxinitialize.c +++ b/platform/sama5d3-xplained/sam_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/sama5d3x-ek/sam_cxxinitialize.c b/platform/sama5d3x-ek/sam_cxxinitialize.c index e65426b13..0d475aae3 100644 --- a/platform/sama5d3x-ek/sam_cxxinitialize.c +++ b/platform/sama5d3x-ek/sam_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/sama5d4-ek/sam_cxxinitialize.c b/platform/sama5d4-ek/sam_cxxinitialize.c index 3630c420a..de17676ec 100644 --- a/platform/sama5d4-ek/sam_cxxinitialize.c +++ b/platform/sama5d4-ek/sam_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/samd20-xplained/sam_cxxinitialize.c b/platform/samd20-xplained/sam_cxxinitialize.c index 8ce87c07a..1bd6fc053 100644 --- a/platform/samd20-xplained/sam_cxxinitialize.c +++ b/platform/samd20-xplained/sam_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/samd21-xplained/sam_cxxinitialize.c b/platform/samd21-xplained/sam_cxxinitialize.c index 39108333b..29d550fcf 100644 --- a/platform/samd21-xplained/sam_cxxinitialize.c +++ b/platform/samd21-xplained/sam_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/same70-xplained/sam_cxxinitialize.c b/platform/same70-xplained/sam_cxxinitialize.c index 745a74a63..ec63fcd1e 100644 --- a/platform/same70-xplained/sam_cxxinitialize.c +++ b/platform/same70-xplained/sam_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/saml21-xplained/sam_cxxinitialize.c b/platform/saml21-xplained/sam_cxxinitialize.c index 7d5fead2c..a60c88967 100644 --- a/platform/saml21-xplained/sam_cxxinitialize.c +++ b/platform/saml21-xplained/sam_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/samv71-xult/sam_cxxinitialize.c b/platform/samv71-xult/sam_cxxinitialize.c index efdff7f76..865d6e60c 100644 --- a/platform/samv71-xult/sam_cxxinitialize.c +++ b/platform/samv71-xult/sam_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/shenzhou/stm32_cxxinitialize.c b/platform/shenzhou/stm32_cxxinitialize.c index f3dfdb106..2498378b7 100644 --- a/platform/shenzhou/stm32_cxxinitialize.c +++ b/platform/shenzhou/stm32_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/spark/stm32_cxxinitialize.c b/platform/spark/stm32_cxxinitialize.c index dbf3bf67f..fa33d21f8 100644 --- a/platform/spark/stm32_cxxinitialize.c +++ b/platform/spark/stm32_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/stm3220g-eval/stm32_cxxinitialize.c b/platform/stm3220g-eval/stm32_cxxinitialize.c index ab6044e94..c3aa574a3 100644 --- a/platform/stm3220g-eval/stm32_cxxinitialize.c +++ b/platform/stm3220g-eval/stm32_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/stm3240g-eval/stm32_cxxinitialize.c b/platform/stm3240g-eval/stm32_cxxinitialize.c index 0356fc6ea..0917f658d 100644 --- a/platform/stm3240g-eval/stm32_cxxinitialize.c +++ b/platform/stm3240g-eval/stm32_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/stm32f3discovery/stm32_cxxinitialize.c b/platform/stm32f3discovery/stm32_cxxinitialize.c index 050930846..59f73ba07 100644 --- a/platform/stm32f3discovery/stm32_cxxinitialize.c +++ b/platform/stm32f3discovery/stm32_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/stm32f429i-disco/stm32_cxxinitialize.c b/platform/stm32f429i-disco/stm32_cxxinitialize.c index c71f79cba..3ffd8a20e 100644 --- a/platform/stm32f429i-disco/stm32_cxxinitialize.c +++ b/platform/stm32f429i-disco/stm32_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/stm32f4discovery/stm32_cxxinitialize.c b/platform/stm32f4discovery/stm32_cxxinitialize.c index 1596b3f51..9a2353f8e 100644 --- a/platform/stm32f4discovery/stm32_cxxinitialize.c +++ b/platform/stm32f4discovery/stm32_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/stm32f746g-disco/stm32_cxxinitialize.c b/platform/stm32f746g-disco/stm32_cxxinitialize.c index ce83890dc..47f3e3ae0 100644 --- a/platform/stm32f746g-disco/stm32_cxxinitialize.c +++ b/platform/stm32f746g-disco/stm32_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/stm32l476vg-disco/stm32_cxxinitialize.c b/platform/stm32l476vg-disco/stm32_cxxinitialize.c index 6141f33f5..096eab010 100644 --- a/platform/stm32l476vg-disco/stm32_cxxinitialize.c +++ b/platform/stm32l476vg-disco/stm32_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/stm32ldiscovery/stm32_cxxinitialize.c b/platform/stm32ldiscovery/stm32_cxxinitialize.c index 726a7c95d..abe57211a 100644 --- a/platform/stm32ldiscovery/stm32_cxxinitialize.c +++ b/platform/stm32ldiscovery/stm32_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/teensy-lc/kl_cxxinitialize.c b/platform/teensy-lc/kl_cxxinitialize.c index 24205a24d..3da6bf4e6 100644 --- a/platform/teensy-lc/kl_cxxinitialize.c +++ b/platform/teensy-lc/kl_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/platform/viewtool-stm32f107/stm32_cxxinitialize.c b/platform/viewtool-stm32f107/stm32_cxxinitialize.c index f5058c2cf..808f8e5e4 100644 --- a/platform/viewtool-stm32f107/stm32_cxxinitialize.c +++ b/platform/viewtool-stm32f107/stm32_cxxinitialize.c @@ -53,7 +53,7 @@ * constructors. */ -#ifndef CONFIG_DEBUG +#ifndef CONFIG_DEBUG_FEATURES # undef CONFIG_DEBUG_CXX #endif diff --git a/system/cdcacm/Kconfig b/system/cdcacm/Kconfig index 4fb293772..0dfa88a7f 100644 --- a/system/cdcacm/Kconfig +++ b/system/cdcacm/Kconfig @@ -29,7 +29,7 @@ config SYSTEM_CDCACM_TRACEINIT default n depends on USBDEV_TRACE || DEBUG_USB ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the add-on code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB initialization events @@ -39,7 +39,7 @@ config SYSTEM_CDCACM_TRACECLASS default n depends on USBDEV_TRACE || DEBUG_USB ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the add-on code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB class driver events @@ -49,7 +49,7 @@ config SYSTEM_CDCACM_TRACETRANSFERS default n depends on USBDEV_TRACE || DEBUG_USB ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the add-on code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB data transfer events @@ -59,7 +59,7 @@ config SYSTEM_CDCACM_TRACECONTROLLER default n depends on USBDEV_TRACE || DEBUG_USB ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the add-on code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB device controller events @@ -69,7 +69,7 @@ config SYSTEM_CDCACM_TRACEINTERRUPTS default n depends on USBDEV_TRACE || DEBUG_USB ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the add-on code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB device controller interrupt-related events. diff --git a/system/cdcacm/README.txt b/system/cdcacm/README.txt index a428cb318..7bb961372 100755 --- a/system/cdcacm/README.txt +++ b/system/cdcacm/README.txt @@ -1,43 +1,43 @@ -system/cdcacm -^^^^^^^^^^^^^^^ - - This very simple add-on allows the USB CDC/ACM serial device can be dynamically - connected and disconnected from a host. This add-on can only be used as - an NSH built-in command. If built-in, then two new NSH commands will be - supported: - - 1. sercon - Connect the CDC/ACM serial device - 2. serdis - Disconnect the CDC/ACM serial device - - Configuration prequisites (not complete): - - CONFIG_USBDEV=y : USB device support must be enabled - CONFIG_CDCACM=y : The CDC/ACM driver must be built - CONFIG_NSH_BUILTIN_APPS : NSH built-in application support must be enabled - - Configuration options specific to this add-on: - - CONFIG_SYSTEM_CDCACM_DEVMINOR : The minor number of the CDC/ACM device. - : i.e., the 'x' in /dev/ttyACMx - - If CONFIG_USBDEV_TRACE is enabled (or CONFIG_DEBUG and CONFIG_DEBUG_USB, or - CONFIG_USBDEV_TRACE), then the add-on code will also initialize the USB trace - output. The amount of trace output can be controlled using: - - CONFIG_SYSTEM_CDCACM_TRACEINIT - Show initialization events - CONFIG_SYSTEM_CDCACM_TRACECLASS - Show class driver events - CONFIG_SYSTEM_CDCACM_TRACETRANSFERS - Show data transfer events - CONFIG_SYSTEM_CDCACM_TRACECONTROLLER - Show controller events - CONFIG_SYSTEM_CDCACM_TRACEINTERRUPTS - Show interrupt-related events. - - Note: This add-on is only enables or disable USB CDC/ACM via the NSH - 'sercon' and 'serdis' command. It will enable and disable tracing per - the settings before enabling and after disabling the CDC/ACM device. It - will not, however, monitor buffered trace data in the interim. If - CONFIG_USBDEV_TRACE is defined (and the debug options are not), other - application logic will need to monitor the buffered trace data. +system/cdcacm +^^^^^^^^^^^^^^^ + + This very simple add-on allows the USB CDC/ACM serial device can be dynamically + connected and disconnected from a host. This add-on can only be used as + an NSH built-in command. If built-in, then two new NSH commands will be + supported: + + 1. sercon - Connect the CDC/ACM serial device + 2. serdis - Disconnect the CDC/ACM serial device + + Configuration prequisites (not complete): + + CONFIG_USBDEV=y : USB device support must be enabled + CONFIG_CDCACM=y : The CDC/ACM driver must be built + CONFIG_NSH_BUILTIN_APPS : NSH built-in application support must be enabled + + Configuration options specific to this add-on: + + CONFIG_SYSTEM_CDCACM_DEVMINOR : The minor number of the CDC/ACM device. + : i.e., the 'x' in /dev/ttyACMx + + If CONFIG_USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB, or + CONFIG_USBDEV_TRACE), then the add-on code will also initialize the USB trace + output. The amount of trace output can be controlled using: + + CONFIG_SYSTEM_CDCACM_TRACEINIT + Show initialization events + CONFIG_SYSTEM_CDCACM_TRACECLASS + Show class driver events + CONFIG_SYSTEM_CDCACM_TRACETRANSFERS + Show data transfer events + CONFIG_SYSTEM_CDCACM_TRACECONTROLLER + Show controller events + CONFIG_SYSTEM_CDCACM_TRACEINTERRUPTS + Show interrupt-related events. + + Note: This add-on is only enables or disable USB CDC/ACM via the NSH + 'sercon' and 'serdis' command. It will enable and disable tracing per + the settings before enabling and after disabling the CDC/ACM device. It + will not, however, monitor buffered trace data in the interim. If + CONFIG_USBDEV_TRACE is defined (and the debug options are not), other + application logic will need to monitor the buffered trace data. diff --git a/system/composite/Kconfig b/system/composite/Kconfig index a787f0934..108ed9b9e 100644 --- a/system/composite/Kconfig +++ b/system/composite/Kconfig @@ -104,7 +104,7 @@ config SYSTEM_COMPOSITE_TRACEINIT bool "USB Trace Initialization" default n ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the add-on code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB initialization events @@ -113,7 +113,7 @@ config SYSTEM_COMPOSITE_TRACECLASS bool "USB Trace Class" default n ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the add-on code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB class driver events @@ -122,7 +122,7 @@ config SYSTEM_COMPOSITE_TRACETRANSFERS bool "USB Trace Transfers" default n ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the add-on code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB data transfer events @@ -131,7 +131,7 @@ config SYSTEM_COMPOSITE_TRACECONTROLLER bool "USB Trace Device Controller Events" default n ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the add-on code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB device controller events @@ -140,7 +140,7 @@ config SYSTEM_COMPOSITE_TRACEINTERRUPTS bool "USB Trace Device Controller Interrupt Events" default n ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the add-on code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB device controller interrupt-related events. diff --git a/system/composite/README.txt b/system/composite/README.txt index 14d912f1c..58922cba7 100755 --- a/system/composite/README.txt +++ b/system/composite/README.txt @@ -1,76 +1,76 @@ -system/composite -^^^^^^^^^^^^^^^^^^ - - This logic adds a NXH command to control a USB composite device. The only - supported composite is CDC/ACM serial with a USB mass storage device. - - Required overall configuration: - - CONFIG_USBDEV=y - USB device support - CONFIG_USBDEV_COMPOSITE=y - USB composite device support - CONFIG_COMPOSITE_IAD=y - Interface associate descriptor needed - - CONFIG_CDCACM=y - USB CDC/ACM serial device support - CONFIG_CDCACM_COMPOSITE=y - USB CDC/ACM serial composite device support - CONFIG_CDCACM_IFNOBASE=0 - CDC/ACM interfaces start with number 0 - CONFIG_CDCACM_STRBASE=4 - Base of string numbers (not really needed) - CONFIG_CDCACM_EPINTIN=1 - Endpoint numbers must be unique - CONFIG_CDCACM_EPBULKIN=2 - CONFIG_CDCACM_EPBULKOUT=3 - - CONFIG_USBMSC - USB mass storage device support - CONFIG_USBMSC_COMPOSITE=y - USB mass storage composite device support - CONFIG_USBMSC_IFNOBASE=2 - USB mass storage interfaces start with number 2 - CONFIG_USBMSC_STRBASE=4 - Base of string numbers (needed) - CONFIG_USBMSC_EPBULKOUT=4 - Endpoint numbers must be unique - CONFIG_USBMSC_EPBULKIN=5 - - CONFIG_NSH_BUILTIN_APPS - This add-on can be built as two NSH "built-in" commands if this option - is selected: 'conn' will connect the USB composite device; 'msdis' - will disconnect the USB composite device. - - Configuration options unique to this add-on: - - CONFIG_SYSTEM_COMPOSITE_DEBUGMM - Enables some debug tests to check for memory usage and memory leaks. - - CONFIG_SYSTEM_COMPOSITE_NLUNS - Defines the number of logical units (LUNs) exported by the USB storage - driver. Each LUN corresponds to one exported block driver (or partition - of a block driver). May be 1, 2, or 3. Default is 1. - CONFIG_SYSTEM_COMPOSITE_DEVMINOR1 - The minor device number of the block driver for the first LUN. For - example, N in /dev/mmcsdN. Used for registering the block driver. Default - is zero. - CONFIG_SYSTEM_COMPOSITE_DEVPATH1 - The full path to the registered block driver. Default is "/dev/mmcsd0" - CONFIG_SYSTEM_COMPOSITE_DEVMINOR2 and CONFIG_SYSTEM_COMPOSITE_DEVPATH2 - Similar parameters that would have to be provided if CONFIG_SYSTEM_COMPOSITE_NLUNS - is 2 or 3. No defaults. - CONFIG_SYSTEM_COMPOSITE_DEVMINOR3 and CONFIG_SYSTEM_COMPOSITE_DEVPATH2 - Similar parameters that would have to be provided if CONFIG_SYSTEM_COMPOSITE_NLUNS - is 3. No defaults. - - CONFIG_SYSTEM_COMPOSITE_TTYUSB - The minor number of the USB serial device. - Default is zero (corresponding to /dev/ttyUSB0 or /dev/ttyACM0). Default is zero. - CCONFIG_SYSTEM_COMPOSITE_SERDEV - The string corresponding to - CONFIG_SYSTEM_COMPOSITE_TTYUSB. The default is "/dev/ttyUSB0" (for the PL2303 - emulation) or "/dev/ttyACM0" (for the CDC/ACM serial device). - CONFIG_SYSTEM_COMPOSITE_BUFSIZE - The size of the serial I/O buffer in - bytes. Default 256 bytes. - - If CONFIG_USBDEV_TRACE is enabled (or CONFIG_DEBUG and CONFIG_DEBUG_USB), then - the add-on code will also manage the USB trace output. The amount of trace output - can be controlled using: - - CONFIG_SYSTEM_COMPOSITE_TRACEINIT - Show initialization events - CONFIG_SYSTEM_COMPOSITE_TRACECLASS - Show class driver events - CONFIG_SYSTEM_COMPOSITE_TRACETRANSFERS - Show data transfer events - CONFIG_SYSTEM_COMPOSITE_TRACECONTROLLER - Show controller events - CONFIG_SYSTEM_COMPOSITE_TRACEINTERRUPTS - Show interrupt-related events. +system/composite +^^^^^^^^^^^^^^^^^^ + + This logic adds a NXH command to control a USB composite device. The only + supported composite is CDC/ACM serial with a USB mass storage device. + + Required overall configuration: + + CONFIG_USBDEV=y - USB device support + CONFIG_USBDEV_COMPOSITE=y - USB composite device support + CONFIG_COMPOSITE_IAD=y - Interface associate descriptor needed + + CONFIG_CDCACM=y - USB CDC/ACM serial device support + CONFIG_CDCACM_COMPOSITE=y - USB CDC/ACM serial composite device support + CONFIG_CDCACM_IFNOBASE=0 - CDC/ACM interfaces start with number 0 + CONFIG_CDCACM_STRBASE=4 - Base of string numbers (not really needed) + CONFIG_CDCACM_EPINTIN=1 - Endpoint numbers must be unique + CONFIG_CDCACM_EPBULKIN=2 + CONFIG_CDCACM_EPBULKOUT=3 + + CONFIG_USBMSC - USB mass storage device support + CONFIG_USBMSC_COMPOSITE=y - USB mass storage composite device support + CONFIG_USBMSC_IFNOBASE=2 - USB mass storage interfaces start with number 2 + CONFIG_USBMSC_STRBASE=4 - Base of string numbers (needed) + CONFIG_USBMSC_EPBULKOUT=4 - Endpoint numbers must be unique + CONFIG_USBMSC_EPBULKIN=5 + + CONFIG_NSH_BUILTIN_APPS + This add-on can be built as two NSH "built-in" commands if this option + is selected: 'conn' will connect the USB composite device; 'msdis' + will disconnect the USB composite device. + + Configuration options unique to this add-on: + + CONFIG_SYSTEM_COMPOSITE_DEBUGMM + Enables some debug tests to check for memory usage and memory leaks. + + CONFIG_SYSTEM_COMPOSITE_NLUNS + Defines the number of logical units (LUNs) exported by the USB storage + driver. Each LUN corresponds to one exported block driver (or partition + of a block driver). May be 1, 2, or 3. Default is 1. + CONFIG_SYSTEM_COMPOSITE_DEVMINOR1 + The minor device number of the block driver for the first LUN. For + example, N in /dev/mmcsdN. Used for registering the block driver. Default + is zero. + CONFIG_SYSTEM_COMPOSITE_DEVPATH1 + The full path to the registered block driver. Default is "/dev/mmcsd0" + CONFIG_SYSTEM_COMPOSITE_DEVMINOR2 and CONFIG_SYSTEM_COMPOSITE_DEVPATH2 + Similar parameters that would have to be provided if CONFIG_SYSTEM_COMPOSITE_NLUNS + is 2 or 3. No defaults. + CONFIG_SYSTEM_COMPOSITE_DEVMINOR3 and CONFIG_SYSTEM_COMPOSITE_DEVPATH2 + Similar parameters that would have to be provided if CONFIG_SYSTEM_COMPOSITE_NLUNS + is 3. No defaults. + + CONFIG_SYSTEM_COMPOSITE_TTYUSB - The minor number of the USB serial device. + Default is zero (corresponding to /dev/ttyUSB0 or /dev/ttyACM0). Default is zero. + CCONFIG_SYSTEM_COMPOSITE_SERDEV - The string corresponding to + CONFIG_SYSTEM_COMPOSITE_TTYUSB. The default is "/dev/ttyUSB0" (for the PL2303 + emulation) or "/dev/ttyACM0" (for the CDC/ACM serial device). + CONFIG_SYSTEM_COMPOSITE_BUFSIZE - The size of the serial I/O buffer in + bytes. Default 256 bytes. + + If CONFIG_USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then + the add-on code will also manage the USB trace output. The amount of trace output + can be controlled using: + + CONFIG_SYSTEM_COMPOSITE_TRACEINIT + Show initialization events + CONFIG_SYSTEM_COMPOSITE_TRACECLASS + Show class driver events + CONFIG_SYSTEM_COMPOSITE_TRACETRANSFERS + Show data transfer events + CONFIG_SYSTEM_COMPOSITE_TRACECONTROLLER + Show controller events + CONFIG_SYSTEM_COMPOSITE_TRACEINTERRUPTS + Show interrupt-related events. diff --git a/system/nxplayer/nxplayer.c b/system/nxplayer/nxplayer.c index 5fbb0006f..ffbce5e1a 100644 --- a/system/nxplayer/nxplayer.c +++ b/system/nxplayer/nxplayer.c @@ -515,7 +515,7 @@ static int nxplayer_readbuffer(FAR struct nxplayer_s *pPlayer, if (apb->nbytes < apb->nmaxbytes) { -#ifdef CONFIG_DEBUG +#ifdef CONFIG_DEBUG_FEATURES int errcode = errno; int readerror = ferror(pPlayer->fileFd); @@ -534,7 +534,7 @@ static int nxplayer_readbuffer(FAR struct nxplayer_s *pPlayer, apb->flags |= AUDIO_APB_FINAL; -#ifdef CONFIG_DEBUG +#ifdef CONFIG_DEBUG_FEATURES /* Was this a file read error */ if (apb->nbytes == 0 && readerror) @@ -632,7 +632,7 @@ static void *nxplayer_playthread(pthread_addr_t pvarg) #else FAR struct ap_buffer_s* pBuffers[CONFIG_AUDIO_NUM_BUFFERS]; #endif -#ifdef CONFIG_DEBUG +#ifdef CONFIG_DEBUG_FEATURES int outstanding = 0; #endif int prio; @@ -772,7 +772,7 @@ static void *nxplayer_playthread(pthread_addr_t pvarg) failed = true; break; } -#ifdef CONFIG_DEBUG +#ifdef CONFIG_DEBUG_FEATURES else { /* The audio driver has one more buffer */ @@ -875,7 +875,7 @@ static void *nxplayer_playthread(pthread_addr_t pvarg) /* An audio buffer is being dequeued by the driver */ case AUDIO_MSG_DEQUEUE: -#ifdef CONFIG_DEBUG +#ifdef CONFIG_DEBUG_FEATURES /* Make sure that we believe that the audio driver has at * least one buffer. */ @@ -929,7 +929,7 @@ static void *nxplayer_playthread(pthread_addr_t pvarg) streaming = false; failed = true; } -#ifdef CONFIG_DEBUG +#ifdef CONFIG_DEBUG_FEATURES else { /* The audio driver has one more buffer */ diff --git a/system/usbmsc/Kconfig b/system/usbmsc/Kconfig index 1bfe307e8..a70cbc33c 100644 --- a/system/usbmsc/Kconfig +++ b/system/usbmsc/Kconfig @@ -90,7 +90,7 @@ config SYSTEM_USBMSC_TRACEINIT bool "USB Trace Initialization" default n ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the add-on code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB initialization events @@ -99,7 +99,7 @@ config SYSTEM_USBMSC_TRACECLASS bool "USB Trace Class" default n ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the add-on code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB class driver events @@ -108,7 +108,7 @@ config SYSTEM_USBMSC_TRACETRANSFERS bool "USB Trace Transfers" default n ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the add-on code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB data transfer events @@ -117,7 +117,7 @@ config SYSTEM_USBMSC_TRACECONTROLLER bool "USB Trace Device Controller Events" default n ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the add-on code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB device controller events @@ -126,7 +126,7 @@ config SYSTEM_USBMSC_TRACEINTERRUPTS bool "USB Trace Device Controller Interrupt Events" default n ---help--- - If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + If USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then the add-on code will also manage the USB trace output. The amount of trace output can be controlled this configuration value: This setting will show USB device controller interrupt-related events. diff --git a/system/usbmsc/README.txt b/system/usbmsc/README.txt index 935687a51..27836b237 100755 --- a/system/usbmsc/README.txt +++ b/system/usbmsc/README.txt @@ -1,82 +1,82 @@ -system/usbmsc -^^^^^^^^^^^^^^^ - - This add-on registers a block device driver, then exports the block - the device using the USB storage class driver. In order to use this - add-on, your board-specific logic must provide the function: - - void board_usbmsc_initialize(void); - - This function will be called by the system/usbmsc indirectly via the - boarctl BOARDIOC_USBDEV_CONTROL command in order to do the actual - registration of the block device drivers. For examples of the - implementation of board_usbmsc_initialize() see - configs/mcu123-lpc124x/src/up_usbmsc.c or - configs/stm3210e-eval/src/usbmsc.c - - Configuration options: - - CONFIG_NSH_BUILTIN_APPS - This add-on can be built as two NSH "built-in" commands if this option - is selected: 'msconn' will connect the USB mass storage device; 'msdis' - will disconnect the USB storage device. - CONFIG_LIB_BOARDCTL - Enables the boardctl() interfaces. - CONFIG_BOARDCTL_USBDEVCTRL - Enables the BOARDIOC_USBDEV_CONTROL boardctl() command. - CONFIG_SYSTEM_USBMSC_NLUNS - Defines the number of logical units (LUNs) exported by the USB storage - driver. Each LUN corresponds to one exported block driver (or partition - of a block driver). May be 1, 2, or 3. Default is 1. - CONFIG_SYSTEM_USBMSC_DEVMINOR1 - The minor device number of the block driver for the first LUN. For - example, N in /dev/mmcsdN. Used for registering the block driver. Default - is zero. - CONFIG_SYSTEM_USBMSC_DEVPATH1 - The full path to the registered block driver. Default is "/dev/mmcsd0" - CONFIG_SYSTEM_USBMSC_DEVMINOR2 and CONFIG_SYSTEM_USBMSC_DEVPATH2 - Similar parameters that would have to be provided if CONFIG_SYSTEM_USBMSC_NLUNS - is 2 or 3. No defaults. - CONFIG_SYSTEM_USBMSC_DEVMINOR3 and CONFIG_SYSTEM_USBMSC_DEVPATH3 - Similar parameters that would have to be provided if CONFIG_SYSTEM_USBMSC_NLUNS - is 3. No defaults. - CONFIG_SYSTEM_USBMSC_DEBUGMM - Enables some debug tests to check for memory usage and memory leaks. - - If CONFIG_USBDEV_TRACE is enabled (or CONFIG_DEBUG and CONFIG_DEBUG_USB), then - the code will also manage the USB trace output. The amount of trace output - can be controlled using: - - CONFIG_SYSTEM_USBMSC_TRACEINIT - Show initialization events - CONFIG_SYSTEM_USBMSC_TRACECLASS - Show class driver events - CONFIG_SYSTEM_USBMSC_TRACETRANSFERS - Show data transfer events - CONFIG_SYSTEM_USBMSC_TRACECONTROLLER - Show controller events - CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS - Show interrupt-related events. - - Error results are always shown in the trace output - - NOTE 1: When built as an NSH add-on command (CONFIG_NSH_BUILTIN_APPS=y), - Caution should be used to assure that the SD drive (or other storage device) is - not in use when the USB storage device is configured. Specifically, the SD - driver should be unmounted like: - - nsh> mount -t vfat /dev/mmcsd0 /mnt/sdcard # Card is mounted in NSH - ... - nsh> umount /mnd/sdcard # Unmount before connecting USB!!! - nsh> msconn # Connect the USB storage device - ... - nsh> msdis # Disconnect USB storate device - nsh> mount -t vfat /dev/mmcsd0 /mnt/sdcard # Restore the mount - - Failure to do this could result in corruption of the SD card format. - - NOTE 2: This add-on used internal USB device driver interfaces. As such, - it relies on internal OS interfaces that are not normally available to a - user-space program. As a result, this add-on cannot be used if a - NuttX is built as a protected, supervisor kernel (CONFIG_BUILD_PROTECTED - or CONFIG_BUILD_KERNEL). +system/usbmsc +^^^^^^^^^^^^^^^ + + This add-on registers a block device driver, then exports the block + the device using the USB storage class driver. In order to use this + add-on, your board-specific logic must provide the function: + + void board_usbmsc_initialize(void); + + This function will be called by the system/usbmsc indirectly via the + boarctl BOARDIOC_USBDEV_CONTROL command in order to do the actual + registration of the block device drivers. For examples of the + implementation of board_usbmsc_initialize() see + configs/mcu123-lpc124x/src/up_usbmsc.c or + configs/stm3210e-eval/src/usbmsc.c + + Configuration options: + + CONFIG_NSH_BUILTIN_APPS + This add-on can be built as two NSH "built-in" commands if this option + is selected: 'msconn' will connect the USB mass storage device; 'msdis' + will disconnect the USB storage device. + CONFIG_LIB_BOARDCTL + Enables the boardctl() interfaces. + CONFIG_BOARDCTL_USBDEVCTRL + Enables the BOARDIOC_USBDEV_CONTROL boardctl() command. + CONFIG_SYSTEM_USBMSC_NLUNS + Defines the number of logical units (LUNs) exported by the USB storage + driver. Each LUN corresponds to one exported block driver (or partition + of a block driver). May be 1, 2, or 3. Default is 1. + CONFIG_SYSTEM_USBMSC_DEVMINOR1 + The minor device number of the block driver for the first LUN. For + example, N in /dev/mmcsdN. Used for registering the block driver. Default + is zero. + CONFIG_SYSTEM_USBMSC_DEVPATH1 + The full path to the registered block driver. Default is "/dev/mmcsd0" + CONFIG_SYSTEM_USBMSC_DEVMINOR2 and CONFIG_SYSTEM_USBMSC_DEVPATH2 + Similar parameters that would have to be provided if CONFIG_SYSTEM_USBMSC_NLUNS + is 2 or 3. No defaults. + CONFIG_SYSTEM_USBMSC_DEVMINOR3 and CONFIG_SYSTEM_USBMSC_DEVPATH3 + Similar parameters that would have to be provided if CONFIG_SYSTEM_USBMSC_NLUNS + is 3. No defaults. + CONFIG_SYSTEM_USBMSC_DEBUGMM + Enables some debug tests to check for memory usage and memory leaks. + + If CONFIG_USBDEV_TRACE is enabled (or CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB), then + the code will also manage the USB trace output. The amount of trace output + can be controlled using: + + CONFIG_SYSTEM_USBMSC_TRACEINIT + Show initialization events + CONFIG_SYSTEM_USBMSC_TRACECLASS + Show class driver events + CONFIG_SYSTEM_USBMSC_TRACETRANSFERS + Show data transfer events + CONFIG_SYSTEM_USBMSC_TRACECONTROLLER + Show controller events + CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS + Show interrupt-related events. + + Error results are always shown in the trace output + + NOTE 1: When built as an NSH add-on command (CONFIG_NSH_BUILTIN_APPS=y), + Caution should be used to assure that the SD drive (or other storage device) is + not in use when the USB storage device is configured. Specifically, the SD + driver should be unmounted like: + + nsh> mount -t vfat /dev/mmcsd0 /mnt/sdcard # Card is mounted in NSH + ... + nsh> umount /mnd/sdcard # Unmount before connecting USB!!! + nsh> msconn # Connect the USB storage device + ... + nsh> msdis # Disconnect USB storate device + nsh> mount -t vfat /dev/mmcsd0 /mnt/sdcard # Restore the mount + + Failure to do this could result in corruption of the SD card format. + + NOTE 2: This add-on used internal USB device driver interfaces. As such, + it relies on internal OS interfaces that are not normally available to a + user-space program. As a result, this add-on cannot be used if a + NuttX is built as a protected, supervisor kernel (CONFIG_BUILD_PROTECTED + or CONFIG_BUILD_KERNEL). diff --git a/system/zmodem/Makefile.host b/system/zmodem/Makefile.host index 288bb0a16..6d7e5fba5 100755 --- a/system/zmodem/Makefile.host +++ b/system/zmodem/Makefile.host @@ -43,7 +43,7 @@ # make -f Makefile.host TOPDIR=/home/me/projects/nuttx # APPDIR=/home/me/projects/apps # -# 2. Add CONFIG_DEBUG=1 to the make command line to enable debug output +# 2. Add CONFIG_DEBUG_FEATURES=1 to the make command line to enable debug output # 3. Make sure to clean old target .o files before making new host .o # files. # @@ -62,7 +62,7 @@ HOSTAPPS = $(ZMODEM)/host/apps HOSTCFLAGS += -isystem $(HOSTDIR) -I $(ZMODEM) HOSTCFLAGS += -Dsz_main=main -Drz_main=main -ifeq ($(CONFIG_DEBUG),y) +ifeq ($(CONFIG_DEBUG_FEATURES),y) HOSTCFLAGS += -DCONFIG_DEBUG_ZMODEM=1 -DCONFIG_SYSTEM_ZMODEM_DUMPBUFFER=1 endif diff --git a/system/zmodem/README.txt b/system/zmodem/README.txt index a9dd7ef10..bf33e798e 100755 --- a/system/zmodem/README.txt +++ b/system/zmodem/README.txt @@ -174,7 +174,7 @@ Building the Zmodem Tools to Run Under Linux make -f Makefile.host TOPDIR=/home/me/projects/nuttx APPDIR=/home/me/projects/apps - 2. Add CONFIG_DEBUG=1 to the make command line to enable debug output + 2. Add CONFIG_DEBUG_FEATURES=1 to the make command line to enable debug output 3. Make sure to clean old target .o files before making new host .o files. This build is has been verified as of 2013-7-16 using Linux to transfer