Eliminate some warnings

arch/arm/src/arm/up_dataabort.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 

arch/arm/src/arm/up_prefetchabort.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 

arch/arm/src/arm/up_syscall.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 

arch/arm/src/arm/up_undefinedinsn.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 

arch/arm/src/armv7-a/arm_dataabort.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 

arch/arm/src/armv7-a/arm_prefetchabort.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 

arch/arm/src/armv7-a/arm_syscall.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 

arch/arm/src/armv7-a/arm_undefinedinsn.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 

arch/arm/src/armv7-r/arm_assert.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 
@@ -69,6 +73,7 @@
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
+
 /* USB trace dumping */
 
 #ifndef CONFIG_USBDEV_TRACE

arch/arm/src/armv7-r/arm_dataabort.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 

arch/arm/src/armv7-r/arm_prefetchabort.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 

arch/arm/src/armv7-r/arm_syscall.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 
@@ -66,6 +70,7 @@
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
+
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_SYSCALL)
@@ -75,7 +80,7 @@
 #endif
 
 /****************************************************************************
- * Private Data
+ * Private Functions
  ****************************************************************************/
 
 /****************************************************************************

arch/arm/src/armv7-r/arm_undefinedinsn.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 
@@ -58,18 +62,6 @@
 
 #include "up_internal.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

arch/arm/src/lpc31xx/lpc31_ehci.c

@@ -122,13 +122,6 @@
 #undef CONFIG_USBHOST_ISOC_DISABLE
 #define CONFIG_USBHOST_ISOC_DISABLE 1
 
-/* Simplify DEBUG checks */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_USB
-#endif
-
 /* Registers *******************************************************************/
 /* Traditionally, NuttX specifies register locations using individual
  * register offsets from a base address.  That tradition is broken here and,
@@ -4887,7 +4880,7 @@ FAR struct usbhost_connection_s *lpc31_ehci_initialize(int controller)
 {
   FAR struct usbhost_hubport_s *hport;
   uint32_t regval;
-#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_INFO)
+#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_ASSERTIONS)
   uint16_t regval16;
   unsigned int nports;
 #endif
@@ -5140,7 +5133,7 @@ FAR struct usbhost_connection_s *lpc31_ehci_initialize(int controller)
 
   lpc31_putreg(EHCI_INT_ALLINTS, &HCOR->usbsts);
 
-#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_INFO)
+#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_ASSERTIONS)
   /* Show the EHCI version */
 
   regval16 = lpc31_swap16(HCCR->hciversion);

arch/arm/src/lpc43xx/lpc43_spi.c

@@ -68,14 +68,11 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
+#  define spiwarn llwarn
-#    define spiinfo llerr
+#  define spiinfo llinfo
-#  else
-#    define spiinfo(x...)
-#  endif
 #else
-#  undef CONFIG_DEBUG_INFO
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 

arch/arm/src/sam34/sam_spi.c

@@ -132,16 +132,7 @@
 #define DMA_TIMEOUT_TICKS MSEC2TICK(DMA_TIMEOUT_MS)
 
 /* Debug *******************************************************************/
-/* Check if SPI debut is enabled (non-standard.. no support in
+/* Check if SPI debut is enabled */
- * include/debug.h
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#  undef CONFIG_SAM34_SPI_DMADEBUG
-#  undef CONFIG_SAM34_SPI_REGDEBUG
-#endif
 
 #ifndef CONFIG_DEBUG_DMA
 #  undef CONFIG_SAM34_SPI_DMADEBUG
@@ -149,13 +140,11 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
+#  define spiwarn llwarn
-#    define spiinfo llerr
+#  define spiinfo llinfo
-#  else
-#    define spiinfo(x...)
-#  endif
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 

arch/arm/src/sama5/sam_ehci.c

@@ -127,13 +127,6 @@
 #  undef CONFIG_SAMA5_UHPHS_RHPORT1
 #endif
 
-/* Simplify DEBUG checks */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_USB
-#endif
-
 /* For now, suppress use of PORTA in any event.  I use that for SAM-BA and
  * would prefer that the board not try to drive VBUS on that port!
  */
@@ -4701,7 +4694,7 @@ FAR struct usbhost_connection_s *sam_ehci_initialize(int controller)
   FAR struct usbhost_hubport_s *hport;
   irqstate_t flags;
   uint32_t regval;
-#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_INFO)
+#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_ASSERTIONS)
   uint16_t regval16;
   unsigned int nports;
 #endif
@@ -4952,7 +4945,7 @@ FAR struct usbhost_connection_s *sam_ehci_initialize(int controller)
 
   sam_putreg(EHCI_INT_ALLINTS, &HCOR->usbsts);
 
-#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_INFO)
+#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_ASSERTIONS)
   /* Show the EHCI version */
 
   regval16 = sam_swap16(HCCR->hciversion);

arch/arm/src/sama5/sam_spi.c

@@ -125,16 +125,7 @@
 #define DMA_TIMEOUT_TICKS MSEC2TICK(DMA_TIMEOUT_MS)
 
 /* Debug *******************************************************************/
-/* Check if SPI debut is enabled (non-standard.. no support in
+/* Check if SPI debug is enabled */
- * include/debug.h
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#  undef CONFIG_SAMA5_SPI_DMADEBUG
-#  undef CONFIG_SAMA5_SPI_REGDEBUG
-#endif
 
 #ifndef CONFIG_DEBUG_DMA
 #  undef CONFIG_SAMA5_SPI_DMADEBUG
@@ -142,13 +133,11 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
+#  define spiwarn llwarn
-#    define spiinfo llerr
+#  define spiinfo llinfo
-#  else
-#    define spiinfo(x...)
-#  endif
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 

arch/arm/src/samdl/sam_spi.c

@@ -77,28 +77,16 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Clocking *****************************************************************/
-
 /* Debug *******************************************************************/
-/* Check if SPI debug is enabled (non-standard.. no support in
+/* Check if SPI debug is enabled */
- * include/debug.h
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#  undef CONFIG_SAMDL_SPI_REGDEBUG
-#endif
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
+#  define spiwarn llwarn
-#    define spiinfo llerr
+#  define spiinfo llinfo
-#  else
-#    define spiinfo(x...)
-#  endif
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 

arch/arm/src/samv7/sam_qspi.c

@@ -138,31 +138,20 @@
 #define IS_ALIGNED(n)     (((uint32_t)(n) & ALIGN_MASK) == 0)
 
 /* Debug *******************************************************************/
-/* Check if QSPI debug is enabled (non-standard.. no support in
+/* Check if QSPI debug is enabled */
- * include/debug.h
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#  undef CONFIG_SAMV7_QSPI_DMADEBUG
-#  undef CONFIG_SAMV7_QSPI_REGDEBUG
-#endif
 
 #ifndef CONFIG_DEBUG_DMA
 #  undef CONFIG_SAMV7_QSPI_DMADEBUG
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define qspierr llerr
+#  define spierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
+#  define spiwarn llwarn
-#    define qspiinfo llerr
+#  define spiinfo llinfo
-#  else
-#    define qspiinfo(x...)
-#  endif
 #else
-#  define qspierr(x...)
+#  define spierr(x...)
-#  define qspiinfo(x...)
+#  define spiwarn(x...)
+#  define spiinfo(x...)
 #endif
 
 #define DMA_INITIAL      0

arch/arm/src/samv7/sam_spi.c

@@ -120,16 +120,7 @@
 #define DMA_TIMEOUT_TICKS MSEC2TICK(DMA_TIMEOUT_MS)
 
 /* Debug *******************************************************************/
-/* Check if SPI debug is enabled (non-standard.. no support in
+/* Check if SPI debug is enabled */
- * include/debug.h
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#  undef CONFIG_SAMV7_SPI_DMADEBUG
-#  undef CONFIG_SAMV7_SPI_REGDEBUG
-#endif
 
 #ifndef CONFIG_DEBUG_DMA
 #  undef CONFIG_SAMV7_SPI_DMADEBUG
@@ -137,13 +128,11 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
+#  define spiwarn llwarn
-#    define spiinfo llerr
+#  define spiinfo llinfo
-#  else
-#    define spiinfo(x...)
-#  endif
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 

arch/arm/src/samv7/sam_spi_slave.c

@@ -75,24 +75,15 @@
 #endif
 
 /* Debug *******************************************************************/
-/* Check if SPI debug is enabled (non-standard.. no support in
+/* Check if SPI debug is enabled */
- * include/debug.h
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#endif
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
+#  define spiwarn llwarn
-#    define spiinfo llerr
+#  define spiinfo llinfo
-#  else
-#    define spiinfo(x...)
-#  endif
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 

arch/arm/src/samv7/sam_ssc.c

@@ -366,14 +366,7 @@
 #define DMA_TIMEOUT_TICKS MSEC2TICK(DMA_TIMEOUT_MS)
 
 /* Debug *******************************************************************/
-/* Check if SSC debug is enabled (non-standard.. no support in
+/* Check if SSC debug is enabled */
- * include/debug.h
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_I2S
-#endif
 
 #ifndef CONFIG_DEBUG_I2S
 #  undef CONFIG_SAMV7_SSC_DMADEBUG
@@ -389,15 +382,15 @@
 #ifdef CONFIG_DEBUG_I2S
 #  define i2serr         err
 #  define i2sllerr       llerr
-#  ifdef CONFIG_DEBUG_INFO
+#  define i2swarn        warn
-#    define i2sinfo      err
+#  define i2sllwarn      llwarn
-#    define i2sllinfo    llerr
+#  define i2sinfo        info
-#  else
+#  define i2sllinfo      llinfo
-#    define i2sinfo(x...)
-#  endif
 #else
 #  define i2serr(x...)
 #  define i2sllerr(x...)
+#  define i2swarn(x...)
+#  define i2sllwarn(x...)
 #  define i2sinfo(x...)
 #  define i2sllinfo(x...)
 #endif

arch/arm/src/stm32/stm32_spi.c

@@ -157,22 +157,15 @@
 
 
 /* Debug ****************************************************************************/
-/* Check if (non-standard) SPI debug is enabled */
+/* Check if SPI debug is enabled */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#endif
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
+#  define spiwarn llwarn
-#    define spiinfo llerr
+#  define spiinfo llinfo
-#  else
-#    define spiinfo(x...)
-#  endif
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 

arch/arm/src/stm32l4/stm32l4_qspi.c

@@ -85,16 +85,7 @@
 #define IS_ALIGNED(n)     (((uint32_t)(n) & ALIGN_MASK) == 0)
 
 /* Debug *******************************************************************/
-/* Check if QSPI debug is enabled (non-standard.. no support in
+/* Check if QSPI debug is enabled */
- * include/debug.h
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#  undef CONFIG_STM32L4_QSPI_DMADEBUG
-#  undef CONFIG_STM32L4_QSPI_REGDEBUG
-#endif
 
 #ifndef CONFIG_DEBUG_DMA
 #  undef CONFIG_STM32L4_QSPI_DMADEBUG
@@ -102,13 +93,11 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define qspierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
+#  define qspiwarn llwarn
-#    define qspiinfo llerr
+#  define qspiinfo llinfo
-#  else
-#    define qspiinfo(x...)
-#  endif
 #else
 #  define qspierr(x...)
+#  define qspiwarn(x...)
 #  define qspiinfo(x...)
 #endif
 

arch/arm/src/stm32l4/stm32l4_spi.c

@@ -136,24 +136,16 @@
 #define SPI_TXDMA16NULL_CONFIG    (SPI_DMA_PRIO|DMA_CCR_MSIZE_8BITS |DMA_CCR_PSIZE_16BITS             |DMA_CCR_DIR)
 #define SPI_TXDMA8NULL_CONFIG     (SPI_DMA_PRIO|DMA_CCR_MSIZE_8BITS |DMA_CCR_PSIZE_8BITS              |DMA_CCR_DIR)
 
-
 /* Debug ****************************************************************************/
-/* Check if (non-standard) SPI debug is enabled */
+/* Check if SPI debug is enabled */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#endif
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
+#  define spiwarn llwarn
-#    define spiinfo llerr
+#  define spiinfo llinfo
-#  else
-#    define spiinfo(x...)
-#  endif
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 

arch/avr/src/avr/up_dumpstate.c

@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include <stdint.h>

arch/avr/src/avr32/up_dumpstate.c

@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include <stdint.h>

arch/avr/src/common/up_assert.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 

arch/hc/src/m9s12/m9s12_assert.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 

arch/hc/src/m9s12/m9s12_dumpgpio.c

@@ -40,6 +40,17 @@
 
 #include <nuttx/config.h>
 
+/* Output debug info -- even if debug is not selected. */
+
+#undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
+#undef  CONFIG_DEBUG_INFO
+#define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
+#define CONFIG_DEBUG_INFO 1
+
 #include <stdint.h>
 #include <debug.h>
 #include <nuttx/irq.h>

arch/mips/src/mips32/up_assert.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 

arch/sh/src/common/up_assert.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 

arch/sh/src/m16c/m16c_dumpstate.c

@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include <stdint.h>

arch/sh/src/sh1/sh1_dumpstate.c

@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include <stdint.h>

arch/sim/src/board_lcd.c

@@ -101,24 +101,15 @@
 #endif
 
 /* Debug ********************************************************************/
-/* Define CONFIG_DEBUG_LCD to enable detailed LCD debug output. Verbose debug must
- * also be enabled.
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_GRAPHICS
-#  undef CONFIG_DEBUG_LCD
-#endif
-
-#ifndef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_LCD
-#endif
 
 #ifdef CONFIG_DEBUG_LCD
-# define lcderr(format, ...)  info(format, ##__VA_ARGS__)
+# define lcderr(format, ...)  err(format, ##__VA_ARGS__)
+# define lcdwarn(format, ...) warn(format, ##__VA_ARGS__)
+# define lcdinfo(format, ...) info(format, ##__VA_ARGS__)
 #else
 # define lcderr(x...)
+# define lcdwarn(x...)
+# define lcdinfo(x...)
 #endif
 
 /****************************************************************************

arch/sim/src/up_spiflash.c

@@ -61,22 +61,15 @@
 /* Configuration ********************************************************************/
 
 /* Debug ****************************************************************************/
-/* Check if (non-standard) SPI debug is enabled */
+/* Check if SPI debug is enabled */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#endif
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
+#  define spiwarn llwarn
-#    define spiinfo llerr
+#  define spiinfo llinfo
-#  else
-#    define spiinfo(x...)
-#  endif
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 

arch/x86/src/common/up_assert.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 

arch/x86/src/i486/up_regdump.c

@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include <debug.h>

arch/z16/src/common/up_assert.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 

arch/z16/src/common/up_registerdump.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 

arch/z16/src/common/up_stackdump.c

@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include <debug.h>

arch/z16/src/z16f/z16f_espi.c

@@ -59,26 +59,16 @@
  * Pre-processor Definitions
  ****************************************************************************/
 /* Debug *******************************************************************/
-/* Check if SPI debug is enabled (non-standard.. no support in
+/* Check if SPI debug is enabled */
- * include/debug.h
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#  undef CONFIG_Z16F_ESPI_REGDEBUG
-#endif
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
+#  define spiwarn llwarn
-#    define spiinfo llerr
+#  define spiinfo llinfo
-#  else
-#    define spiinfo (void)
-#  endif
 #else
-#  define spierr    (void)
+#  define spierr(x...)
-#  define spiinfo   (void)
+#  define spiwarn(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************

arch/z80/src/common/up_assert.c

@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 

arch/z80/src/common/up_stackdump.c

@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include <stdint.h>

arch/z80/src/common/up_stackframe.c

@@ -63,14 +63,6 @@
 #define STACK_ALIGN_DOWN(a) ((a) & ~STACK_ALIGN_MASK)
 #define STACK_ALIGN_UP(a)   (((a) + STACK_ALIGN_MASK) & ~STACK_ALIGN_MASK)
 
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/

arch/z80/src/ez80/ez80_registerdump.c

@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include <debug.h>

arch/z80/src/z180/z180_registerdump.c

@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include <debug.h>

arch/z80/src/z8/z8_registerdump.c

@@ -41,9 +41,15 @@
 
 /* Output debug info -- even if debug is not selected. */
 
+/* Output debug info -- even if debug is not selected. */
+
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include <stdint.h>

arch/z80/src/z80/z80_registerdump.c

@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include <debug.h>