From 0f249016a0591c69c017994d39dc1a9989ac4969 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 13 Jun 2016 14:01:32 -0600 Subject: [PATCH] Eliminate some warnings --- arch/arm/src/arm/up_dataabort.c | 12 ++++++++---- arch/arm/src/arm/up_prefetchabort.c | 12 ++++++++---- arch/arm/src/arm/up_syscall.c | 12 ++++++++---- arch/arm/src/arm/up_undefinedinsn.c | 12 ++++++++---- arch/arm/src/armv7-a/arm_dataabort.c | 12 ++++++++---- arch/arm/src/armv7-a/arm_prefetchabort.c | 12 ++++++++---- arch/arm/src/armv7-a/arm_syscall.c | 12 ++++++++---- arch/arm/src/armv7-a/arm_undefinedinsn.c | 12 ++++++++---- arch/arm/src/armv7-r/arm_assert.c | 13 ++++++++---- arch/arm/src/armv7-r/arm_dataabort.c | 12 ++++++++---- arch/arm/src/armv7-r/arm_prefetchabort.c | 12 ++++++++---- arch/arm/src/armv7-r/arm_syscall.c | 15 +++++++++----- arch/arm/src/armv7-r/arm_undefinedinsn.c | 24 ++++++++--------------- arch/arm/src/lpc31xx/lpc31_ehci.c | 11 ++--------- arch/arm/src/lpc43xx/lpc43_spi.c | 9 +++------ arch/arm/src/sam34/sam_spi.c | 21 +++++--------------- arch/arm/src/sama5/sam_ehci.c | 11 ++--------- arch/arm/src/sama5/sam_spi.c | 21 +++++--------------- arch/arm/src/samdl/sam_spi.c | 22 +++++---------------- arch/arm/src/samv7/sam_qspi.c | 25 +++++++----------------- arch/arm/src/samv7/sam_spi.c | 21 +++++--------------- arch/arm/src/samv7/sam_spi_slave.c | 19 +++++------------- arch/arm/src/samv7/sam_ssc.c | 21 +++++++------------- arch/arm/src/stm32/stm32_spi.c | 17 +++++----------- arch/arm/src/stm32l4/stm32l4_qspi.c | 21 +++++--------------- arch/arm/src/stm32l4/stm32l4_spi.c | 18 +++++------------ arch/avr/src/avr/up_dumpstate.c | 4 ++++ arch/avr/src/avr32/up_dumpstate.c | 4 ++++ arch/avr/src/common/up_assert.c | 12 ++++++++---- arch/hc/src/m9s12/m9s12_assert.c | 12 ++++++++---- arch/hc/src/m9s12/m9s12_dumpgpio.c | 11 +++++++++++ arch/mips/src/mips32/up_assert.c | 12 ++++++++---- arch/sh/src/common/up_assert.c | 10 +++++++--- arch/sh/src/m16c/m16c_dumpstate.c | 4 ++++ arch/sh/src/sh1/sh1_dumpstate.c | 4 ++++ arch/sim/src/board_lcd.c | 19 +++++------------- arch/sim/src/up_spiflash.c | 17 +++++----------- arch/x86/src/common/up_assert.c | 12 ++++++++---- arch/x86/src/i486/up_regdump.c | 4 ++++ arch/z16/src/common/up_assert.c | 12 ++++++++---- arch/z16/src/common/up_registerdump.c | 4 ++++ arch/z16/src/common/up_stackdump.c | 4 ++++ arch/z16/src/z16f/z16f_espi.c | 24 +++++++---------------- arch/z80/src/common/up_assert.c | 12 ++++++++---- arch/z80/src/common/up_stackdump.c | 4 ++++ arch/z80/src/common/up_stackframe.c | 8 -------- arch/z80/src/ez80/ez80_registerdump.c | 4 ++++ arch/z80/src/z180/z180_registerdump.c | 4 ++++ arch/z80/src/z8/z8_registerdump.c | 6 ++++++ arch/z80/src/z80/z80_registerdump.c | 4 ++++ drivers/pipes/pipe_common.c | 4 ++-- 51 files changed, 303 insertions(+), 321 deletions(-) diff --git a/arch/arm/src/arm/up_dataabort.c b/arch/arm/src/arm/up_dataabort.c index 264eb5324d..6b547bdea6 100644 --- a/arch/arm/src/arm/up_dataabort.c +++ b/arch/arm/src/arm/up_dataabort.c @@ -44,10 +44,14 @@ */ #ifdef CONFIG_ARCH_STACKDUMP -# undef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# define CONFIG_DEBUG_FEATURES 1 -# define CONFIG_DEBUG_INFO 1 +# 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 #include diff --git a/arch/arm/src/arm/up_prefetchabort.c b/arch/arm/src/arm/up_prefetchabort.c index cbe91d130c..998024a8f9 100644 --- a/arch/arm/src/arm/up_prefetchabort.c +++ b/arch/arm/src/arm/up_prefetchabort.c @@ -44,10 +44,14 @@ */ #ifdef CONFIG_ARCH_STACKDUMP -# undef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# define CONFIG_DEBUG_FEATURES 1 -# define CONFIG_DEBUG_INFO 1 +# 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 #include diff --git a/arch/arm/src/arm/up_syscall.c b/arch/arm/src/arm/up_syscall.c index 1493163120..e6d07f9ecd 100644 --- a/arch/arm/src/arm/up_syscall.c +++ b/arch/arm/src/arm/up_syscall.c @@ -44,10 +44,14 @@ */ #ifdef CONFIG_ARCH_STACKDUMP -# undef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# define CONFIG_DEBUG_FEATURES 1 -# define CONFIG_DEBUG_INFO 1 +# 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 #include diff --git a/arch/arm/src/arm/up_undefinedinsn.c b/arch/arm/src/arm/up_undefinedinsn.c index a51d972a2e..2326ae9b0e 100644 --- a/arch/arm/src/arm/up_undefinedinsn.c +++ b/arch/arm/src/arm/up_undefinedinsn.c @@ -44,10 +44,14 @@ */ #ifdef CONFIG_ARCH_STACKDUMP -# undef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# define CONFIG_DEBUG_FEATURES 1 -# define CONFIG_DEBUG_INFO 1 +# 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 #include diff --git a/arch/arm/src/armv7-a/arm_dataabort.c b/arch/arm/src/armv7-a/arm_dataabort.c index 033d0473c6..0ec5df5513 100644 --- a/arch/arm/src/armv7-a/arm_dataabort.c +++ b/arch/arm/src/armv7-a/arm_dataabort.c @@ -44,10 +44,14 @@ */ #ifdef CONFIG_ARCH_STACKDUMP -# undef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# define CONFIG_DEBUG_FEATURES 1 -# define CONFIG_DEBUG_INFO 1 +# 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 #include diff --git a/arch/arm/src/armv7-a/arm_prefetchabort.c b/arch/arm/src/armv7-a/arm_prefetchabort.c index f65286f2aa..68e88a6f48 100644 --- a/arch/arm/src/armv7-a/arm_prefetchabort.c +++ b/arch/arm/src/armv7-a/arm_prefetchabort.c @@ -44,10 +44,14 @@ */ #ifdef CONFIG_ARCH_STACKDUMP -# undef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# define CONFIG_DEBUG_FEATURES 1 -# define CONFIG_DEBUG_INFO 1 +# 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 #include diff --git a/arch/arm/src/armv7-a/arm_syscall.c b/arch/arm/src/armv7-a/arm_syscall.c index b0b8201756..e331edabd8 100644 --- a/arch/arm/src/armv7-a/arm_syscall.c +++ b/arch/arm/src/armv7-a/arm_syscall.c @@ -44,10 +44,14 @@ */ #ifdef CONFIG_ARCH_STACKDUMP -# undef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# define CONFIG_DEBUG_FEATURES 1 -# define CONFIG_DEBUG_INFO 1 +# 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 #include diff --git a/arch/arm/src/armv7-a/arm_undefinedinsn.c b/arch/arm/src/armv7-a/arm_undefinedinsn.c index 34081e11a0..899d0a099e 100644 --- a/arch/arm/src/armv7-a/arm_undefinedinsn.c +++ b/arch/arm/src/armv7-a/arm_undefinedinsn.c @@ -44,10 +44,14 @@ */ #ifdef CONFIG_ARCH_STACKDUMP -# undef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# define CONFIG_DEBUG_FEATURES 1 -# define CONFIG_DEBUG_INFO 1 +# 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 #include diff --git a/arch/arm/src/armv7-r/arm_assert.c b/arch/arm/src/armv7-r/arm_assert.c index 40dec555cd..790465d843 100644 --- a/arch/arm/src/armv7-r/arm_assert.c +++ b/arch/arm/src/armv7-r/arm_assert.c @@ -44,10 +44,14 @@ */ #ifdef CONFIG_ARCH_STACKDUMP -# undef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# define CONFIG_DEBUG_FEATURES 1 -# define CONFIG_DEBUG_INFO 1 +# 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 #include @@ -69,6 +73,7 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ + /* USB trace dumping */ #ifndef CONFIG_USBDEV_TRACE diff --git a/arch/arm/src/armv7-r/arm_dataabort.c b/arch/arm/src/armv7-r/arm_dataabort.c index 802a67984a..aeb6654452 100644 --- a/arch/arm/src/armv7-r/arm_dataabort.c +++ b/arch/arm/src/armv7-r/arm_dataabort.c @@ -44,10 +44,14 @@ */ #ifdef CONFIG_ARCH_STACKDUMP -# undef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# define CONFIG_DEBUG_FEATURES 1 -# define CONFIG_DEBUG_INFO 1 +# 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 #include diff --git a/arch/arm/src/armv7-r/arm_prefetchabort.c b/arch/arm/src/armv7-r/arm_prefetchabort.c index 26c1c052fe..8d000a16de 100644 --- a/arch/arm/src/armv7-r/arm_prefetchabort.c +++ b/arch/arm/src/armv7-r/arm_prefetchabort.c @@ -44,10 +44,14 @@ */ #ifdef CONFIG_ARCH_STACKDUMP -# undef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# define CONFIG_DEBUG_FEATURES 1 -# define CONFIG_DEBUG_INFO 1 +# 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 #include diff --git a/arch/arm/src/armv7-r/arm_syscall.c b/arch/arm/src/armv7-r/arm_syscall.c index 5bf59d595e..f3d2ae9f10 100644 --- a/arch/arm/src/armv7-r/arm_syscall.c +++ b/arch/arm/src/armv7-r/arm_syscall.c @@ -44,10 +44,14 @@ */ #ifdef CONFIG_ARCH_STACKDUMP -# undef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# define CONFIG_DEBUG_FEATURES 1 -# define CONFIG_DEBUG_INFO 1 +# 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 #include @@ -66,6 +70,7 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ + /* Debug ********************************************************************/ #if defined(CONFIG_DEBUG_SYSCALL) @@ -75,7 +80,7 @@ #endif /**************************************************************************** - * Private Data + * Private Functions ****************************************************************************/ /**************************************************************************** diff --git a/arch/arm/src/armv7-r/arm_undefinedinsn.c b/arch/arm/src/armv7-r/arm_undefinedinsn.c index 0c61b5f19c..8b5f8c689a 100644 --- a/arch/arm/src/armv7-r/arm_undefinedinsn.c +++ b/arch/arm/src/armv7-r/arm_undefinedinsn.c @@ -44,10 +44,14 @@ */ #ifdef CONFIG_ARCH_STACKDUMP -# undef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# define CONFIG_DEBUG_FEATURES 1 -# define CONFIG_DEBUG_INFO 1 +# 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 #include @@ -58,18 +62,6 @@ #include "up_internal.h" -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c index d77700e327..0734e85e51 100644 --- a/arch/arm/src/lpc31xx/lpc31_ehci.c +++ b/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); diff --git a/arch/arm/src/lpc43xx/lpc43_spi.c b/arch/arm/src/lpc43xx/lpc43_spi.c index 1d425bc5ff..16dde2582e 100644 --- a/arch/arm/src/lpc43xx/lpc43_spi.c +++ b/arch/arm/src/lpc43xx/lpc43_spi.c @@ -68,14 +68,11 @@ #ifdef CONFIG_DEBUG_SPI # define spierr llerr -# ifdef CONFIG_DEBUG_INFO -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spiwarn llwarn +# define spiinfo llinfo #else -# undef CONFIG_DEBUG_INFO # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif diff --git a/arch/arm/src/sam34/sam_spi.c b/arch/arm/src/sam34/sam_spi.c index 04860eb4bf..a495bb9007 100644 --- a/arch/arm/src/sam34/sam_spi.c +++ b/arch/arm/src/sam34/sam_spi.c @@ -132,30 +132,19 @@ #define DMA_TIMEOUT_TICKS MSEC2TICK(DMA_TIMEOUT_MS) /* Debug *******************************************************************/ -/* Check if SPI debut is enabled (non-standard.. no support in - * 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 +/* Check if SPI debut is enabled */ #ifndef CONFIG_DEBUG_DMA # undef CONFIG_SAM34_SPI_DMADEBUG #endif #ifdef CONFIG_DEBUG_SPI -# define spierr llerr -# ifdef CONFIG_DEBUG_INFO -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spierr llerr +# define spiwarn llwarn +# define spiinfo llinfo #else # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif diff --git a/arch/arm/src/sama5/sam_ehci.c b/arch/arm/src/sama5/sam_ehci.c index 9dc19e57ab..731290b6ab 100644 --- a/arch/arm/src/sama5/sam_ehci.c +++ b/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); diff --git a/arch/arm/src/sama5/sam_spi.c b/arch/arm/src/sama5/sam_spi.c index 920257f79f..ed5283af04 100644 --- a/arch/arm/src/sama5/sam_spi.c +++ b/arch/arm/src/sama5/sam_spi.c @@ -125,30 +125,19 @@ #define DMA_TIMEOUT_TICKS MSEC2TICK(DMA_TIMEOUT_MS) /* Debug *******************************************************************/ -/* Check if SPI debut is enabled (non-standard.. no support in - * 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 +/* Check if SPI debug is enabled */ #ifndef CONFIG_DEBUG_DMA # undef CONFIG_SAMA5_SPI_DMADEBUG #endif #ifdef CONFIG_DEBUG_SPI -# define spierr llerr -# ifdef CONFIG_DEBUG_INFO -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spierr llerr +# define spiwarn llwarn +# define spiinfo llinfo #else # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif diff --git a/arch/arm/src/samdl/sam_spi.c b/arch/arm/src/samdl/sam_spi.c index 9a58a954ee..f2108ff368 100644 --- a/arch/arm/src/samdl/sam_spi.c +++ b/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 - * include/debug.h - */ - -#ifndef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# undef CONFIG_DEBUG_SPI -# undef CONFIG_SAMDL_SPI_REGDEBUG -#endif +/* Check if SPI debug is enabled */ #ifdef CONFIG_DEBUG_SPI -# define spierr llerr -# ifdef CONFIG_DEBUG_INFO -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spierr llerr +# define spiwarn llwarn +# define spiinfo llinfo #else # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif diff --git a/arch/arm/src/samv7/sam_qspi.c b/arch/arm/src/samv7/sam_qspi.c index ac0446c2a0..615894f930 100644 --- a/arch/arm/src/samv7/sam_qspi.c +++ b/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 - * 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 +/* Check if QSPI debug is enabled */ #ifndef CONFIG_DEBUG_DMA # undef CONFIG_SAMV7_QSPI_DMADEBUG #endif #ifdef CONFIG_DEBUG_SPI -# define qspierr llerr -# ifdef CONFIG_DEBUG_INFO -# define qspiinfo llerr -# else -# define qspiinfo(x...) -# endif +# define spierr llerr +# define spiwarn llwarn +# define spiinfo llinfo #else -# define qspierr(x...) -# define qspiinfo(x...) +# define spierr(x...) +# define spiwarn(x...) +# define spiinfo(x...) #endif #define DMA_INITIAL 0 diff --git a/arch/arm/src/samv7/sam_spi.c b/arch/arm/src/samv7/sam_spi.c index f9fee7548a..6168c78f9a 100644 --- a/arch/arm/src/samv7/sam_spi.c +++ b/arch/arm/src/samv7/sam_spi.c @@ -120,30 +120,19 @@ #define DMA_TIMEOUT_TICKS MSEC2TICK(DMA_TIMEOUT_MS) /* Debug *******************************************************************/ -/* Check if SPI debug is enabled (non-standard.. no support in - * 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 +/* Check if SPI debug is enabled */ #ifndef CONFIG_DEBUG_DMA # undef CONFIG_SAMV7_SPI_DMADEBUG #endif #ifdef CONFIG_DEBUG_SPI -# define spierr llerr -# ifdef CONFIG_DEBUG_INFO -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spierr llerr +# define spiwarn llwarn +# define spiinfo llinfo #else # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif diff --git a/arch/arm/src/samv7/sam_spi_slave.c b/arch/arm/src/samv7/sam_spi_slave.c index f854b11ba0..fe8d1f6f4b 100644 --- a/arch/arm/src/samv7/sam_spi_slave.c +++ b/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 - * include/debug.h - */ - -#ifndef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# undef CONFIG_DEBUG_SPI -#endif +/* Check if SPI debug is enabled */ #ifdef CONFIG_DEBUG_SPI -# define spierr llerr -# ifdef CONFIG_DEBUG_INFO -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spierr llerr +# define spiwarn llwarn +# define spiinfo llinfo #else # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif diff --git a/arch/arm/src/samv7/sam_ssc.c b/arch/arm/src/samv7/sam_ssc.c index d83471706c..c8be8e850d 100644 --- a/arch/arm/src/samv7/sam_ssc.c +++ b/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 - * include/debug.h - */ - -#ifndef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# undef CONFIG_DEBUG_I2S -#endif +/* Check if SSC debug is enabled */ #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 i2sinfo err -# define i2sllinfo llerr -# else -# define i2sinfo(x...) -# endif +# define i2swarn warn +# define i2sllwarn llwarn +# define i2sinfo info +# define i2sllinfo llinfo #else # define i2serr(x...) # define i2sllerr(x...) +# define i2swarn(x...) +# define i2sllwarn(x...) # define i2sinfo(x...) # define i2sllinfo(x...) #endif diff --git a/arch/arm/src/stm32/stm32_spi.c b/arch/arm/src/stm32/stm32_spi.c index 8b871665a5..d674444145 100644 --- a/arch/arm/src/stm32/stm32_spi.c +++ b/arch/arm/src/stm32/stm32_spi.c @@ -157,22 +157,15 @@ /* Debug ****************************************************************************/ -/* Check if (non-standard) SPI debug is enabled */ - -#ifndef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# undef CONFIG_DEBUG_SPI -#endif +/* Check if SPI debug is enabled */ #ifdef CONFIG_DEBUG_SPI -# define spierr llerr -# ifdef CONFIG_DEBUG_INFO -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spierr llerr +# define spiwarn llwarn +# define spiinfo llinfo #else # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif diff --git a/arch/arm/src/stm32l4/stm32l4_qspi.c b/arch/arm/src/stm32l4/stm32l4_qspi.c index 90fb091d55..c5863cc5de 100644 --- a/arch/arm/src/stm32l4/stm32l4_qspi.c +++ b/arch/arm/src/stm32l4/stm32l4_qspi.c @@ -85,30 +85,19 @@ #define IS_ALIGNED(n) (((uint32_t)(n) & ALIGN_MASK) == 0) /* Debug *******************************************************************/ -/* Check if QSPI debug is enabled (non-standard.. no support in - * 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 +/* Check if QSPI debug is enabled */ #ifndef CONFIG_DEBUG_DMA # undef CONFIG_STM32L4_QSPI_DMADEBUG #endif #ifdef CONFIG_DEBUG_SPI -# define qspierr llerr -# ifdef CONFIG_DEBUG_INFO -# define qspiinfo llerr -# else -# define qspiinfo(x...) -# endif +# define qspierr llerr +# define qspiwarn llwarn +# define qspiinfo llinfo #else # define qspierr(x...) +# define qspiwarn(x...) # define qspiinfo(x...) #endif diff --git a/arch/arm/src/stm32l4/stm32l4_spi.c b/arch/arm/src/stm32l4/stm32l4_spi.c index dc8811dfd9..d64e7d5ccf 100644 --- a/arch/arm/src/stm32l4/stm32l4_spi.c +++ b/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 */ - -#ifndef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# undef CONFIG_DEBUG_SPI -#endif +/* Check if SPI debug is enabled */ #ifdef CONFIG_DEBUG_SPI -# define spierr llerr -# ifdef CONFIG_DEBUG_INFO -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spierr llerr +# define spiwarn llwarn +# define spiinfo llinfo #else # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif diff --git a/arch/avr/src/avr/up_dumpstate.c b/arch/avr/src/avr/up_dumpstate.c index 2a33bff5a5..fa04857067 100644 --- a/arch/avr/src/avr/up_dumpstate.c +++ b/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 diff --git a/arch/avr/src/avr32/up_dumpstate.c b/arch/avr/src/avr32/up_dumpstate.c index 8cdcdb91b0..4f67d1bef4 100644 --- a/arch/avr/src/avr32/up_dumpstate.c +++ b/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 diff --git a/arch/avr/src/common/up_assert.c b/arch/avr/src/common/up_assert.c index 664417fe03..5ef623bd40 100644 --- a/arch/avr/src/common/up_assert.c +++ b/arch/avr/src/common/up_assert.c @@ -44,10 +44,14 @@ */ #ifdef CONFIG_ARCH_STACKDUMP -# undef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# define CONFIG_DEBUG_FEATURES 1 -# define CONFIG_DEBUG_INFO 1 +# 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 #include diff --git a/arch/hc/src/m9s12/m9s12_assert.c b/arch/hc/src/m9s12/m9s12_assert.c index 2805650bcf..c7dc444767 100644 --- a/arch/hc/src/m9s12/m9s12_assert.c +++ b/arch/hc/src/m9s12/m9s12_assert.c @@ -44,10 +44,14 @@ */ #ifdef CONFIG_ARCH_STACKDUMP -# undef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# define CONFIG_DEBUG_FEATURES 1 -# define CONFIG_DEBUG_INFO 1 +# 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 #include diff --git a/arch/hc/src/m9s12/m9s12_dumpgpio.c b/arch/hc/src/m9s12/m9s12_dumpgpio.c index 42313c0e3e..c9a0875176 100644 --- a/arch/hc/src/m9s12/m9s12_dumpgpio.c +++ b/arch/hc/src/m9s12/m9s12_dumpgpio.c @@ -40,6 +40,17 @@ #include +/* 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 #include #include diff --git a/arch/mips/src/mips32/up_assert.c b/arch/mips/src/mips32/up_assert.c index 8742eb468a..1a5174d67d 100644 --- a/arch/mips/src/mips32/up_assert.c +++ b/arch/mips/src/mips32/up_assert.c @@ -44,10 +44,14 @@ */ #ifdef CONFIG_ARCH_STACKDUMP -# undef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# define CONFIG_DEBUG_FEATURES 1 -# define CONFIG_DEBUG_INFO 1 +# 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 #include diff --git a/arch/sh/src/common/up_assert.c b/arch/sh/src/common/up_assert.c index ec63c54098..a82bde6e90 100644 --- a/arch/sh/src/common/up_assert.c +++ b/arch/sh/src/common/up_assert.c @@ -44,9 +44,13 @@ */ #ifdef CONFIG_ARCH_STACKDUMP -# undef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# define CONFIG_DEBUG_FEATURES 1 +# 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 diff --git a/arch/sh/src/m16c/m16c_dumpstate.c b/arch/sh/src/m16c/m16c_dumpstate.c index 39a19252ff..54dfbd8b29 100644 --- a/arch/sh/src/m16c/m16c_dumpstate.c +++ b/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 diff --git a/arch/sh/src/sh1/sh1_dumpstate.c b/arch/sh/src/sh1/sh1_dumpstate.c index 1d36a6e058..a5f7f6c1ef 100644 --- a/arch/sh/src/sh1/sh1_dumpstate.c +++ b/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 diff --git a/arch/sim/src/board_lcd.c b/arch/sim/src/board_lcd.c index e2afcbaeae..7d2fde8aa1 100644 --- a/arch/sim/src/board_lcd.c +++ b/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 /**************************************************************************** diff --git a/arch/sim/src/up_spiflash.c b/arch/sim/src/up_spiflash.c index 3b182a8129..51be923fd3 100644 --- a/arch/sim/src/up_spiflash.c +++ b/arch/sim/src/up_spiflash.c @@ -61,22 +61,15 @@ /* Configuration ********************************************************************/ /* Debug ****************************************************************************/ -/* Check if (non-standard) SPI debug is enabled */ - -#ifndef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# undef CONFIG_DEBUG_SPI -#endif +/* Check if SPI debug is enabled */ #ifdef CONFIG_DEBUG_SPI -# define spierr llerr -# ifdef CONFIG_DEBUG_INFO -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spierr llerr +# define spiwarn llwarn +# define spiinfo llinfo #else # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif diff --git a/arch/x86/src/common/up_assert.c b/arch/x86/src/common/up_assert.c index 1732b8d824..6106e2397e 100644 --- a/arch/x86/src/common/up_assert.c +++ b/arch/x86/src/common/up_assert.c @@ -44,10 +44,14 @@ */ #ifdef CONFIG_ARCH_STACKDUMP -# undef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# define CONFIG_DEBUG_FEATURES 1 -# define CONFIG_DEBUG_INFO 1 +# 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 #include diff --git a/arch/x86/src/i486/up_regdump.c b/arch/x86/src/i486/up_regdump.c index 52c74b1600..3c4137b198 100644 --- a/arch/x86/src/i486/up_regdump.c +++ b/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 diff --git a/arch/z16/src/common/up_assert.c b/arch/z16/src/common/up_assert.c index ea941b805b..f647a9093b 100644 --- a/arch/z16/src/common/up_assert.c +++ b/arch/z16/src/common/up_assert.c @@ -44,10 +44,14 @@ */ #ifdef CONFIG_ARCH_STACKDUMP -# undef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# define CONFIG_DEBUG_FEATURES 1 -# define CONFIG_DEBUG_INFO 1 +# 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 #include diff --git a/arch/z16/src/common/up_registerdump.c b/arch/z16/src/common/up_registerdump.c index 9c7993da51..fd79284b83 100644 --- a/arch/z16/src/common/up_registerdump.c +++ b/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 diff --git a/arch/z16/src/common/up_stackdump.c b/arch/z16/src/common/up_stackdump.c index 48f63bef37..14123807ff 100644 --- a/arch/z16/src/common/up_stackdump.c +++ b/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 diff --git a/arch/z16/src/z16f/z16f_espi.c b/arch/z16/src/z16f/z16f_espi.c index 31971a11fd..6cf1ce07c6 100644 --- a/arch/z16/src/z16f/z16f_espi.c +++ b/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 - * include/debug.h - */ - -#ifndef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# undef CONFIG_DEBUG_SPI -# undef CONFIG_Z16F_ESPI_REGDEBUG -#endif +/* Check if SPI debug is enabled */ #ifdef CONFIG_DEBUG_SPI -# define spierr llerr -# ifdef CONFIG_DEBUG_INFO -# define spiinfo llerr -# else -# define spiinfo (void) -# endif +# define spierr llerr +# define spiwarn llwarn +# define spiinfo llinfo #else -# define spierr (void) -# define spiinfo (void) +# define spierr(x...) +# define spiwarn(x...) +# define spiinfo(x...) #endif /**************************************************************************** diff --git a/arch/z80/src/common/up_assert.c b/arch/z80/src/common/up_assert.c index b459aa00af..53855992bf 100644 --- a/arch/z80/src/common/up_assert.c +++ b/arch/z80/src/common/up_assert.c @@ -44,10 +44,14 @@ */ #ifdef CONFIG_ARCH_STACKDUMP -# undef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# define CONFIG_DEBUG_FEATURES 1 -# define CONFIG_DEBUG_INFO 1 +# 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 #include diff --git a/arch/z80/src/common/up_stackdump.c b/arch/z80/src/common/up_stackdump.c index ee2d5ee31f..e240ed655f 100644 --- a/arch/z80/src/common/up_stackdump.c +++ b/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 diff --git a/arch/z80/src/common/up_stackframe.c b/arch/z80/src/common/up_stackframe.c index 9da978a4f7..8f4a0f1806 100644 --- a/arch/z80/src/common/up_stackframe.c +++ b/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 ****************************************************************************/ diff --git a/arch/z80/src/ez80/ez80_registerdump.c b/arch/z80/src/ez80/ez80_registerdump.c index 350af5a697..0a30eb1c0f 100644 --- a/arch/z80/src/ez80/ez80_registerdump.c +++ b/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 diff --git a/arch/z80/src/z180/z180_registerdump.c b/arch/z80/src/z180/z180_registerdump.c index 322b0fc7c0..d7a9b2d58e 100644 --- a/arch/z80/src/z180/z180_registerdump.c +++ b/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 diff --git a/arch/z80/src/z8/z8_registerdump.c b/arch/z80/src/z8/z8_registerdump.c index ffe393b068..aff6aa88ec 100644 --- a/arch/z80/src/z8/z8_registerdump.c +++ b/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 diff --git a/arch/z80/src/z80/z80_registerdump.c b/arch/z80/src/z80/z80_registerdump.c index b32b3cc7b0..961e763cec 100644 --- a/arch/z80/src/z80/z80_registerdump.c +++ b/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 diff --git a/drivers/pipes/pipe_common.c b/drivers/pipes/pipe_common.c index a22a197fb0..2b9eb67e3a 100644 --- a/drivers/pipes/pipe_common.c +++ b/drivers/pipes/pipe_common.c @@ -795,7 +795,7 @@ int pipecommon_ioctl(FAR struct file *filep, int cmd, unsigned long arg) count = dev->d_wrndx - dev->d_rdndx; } - *(FAR int *)arg = count; + *(FAR int *)((uintptr_t)arg) = count; ret = 0; } break; @@ -815,7 +815,7 @@ int pipecommon_ioctl(FAR struct file *filep, int cmd, unsigned long arg) count = ((CONFIG_DEV_PIPE_SIZE - dev->d_wrndx) + dev->d_rdndx) - 1; } - *(FAR int *)arg = count; + *(FAR int *)((uintptr_t)arg) = count; ret = 0; } break;