diff --git a/arch/arm/src/tiva/tiva_ssi.c b/arch/arm/src/tiva/tiva_ssi.c index eb8972bb0b2..db35b5350c8 100644 --- a/arch/arm/src/tiva/tiva_ssi.c +++ b/arch/arm/src/tiva/tiva_ssi.c @@ -66,18 +66,18 @@ * Pre-processor Definitions ****************************************************************************/ -/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES with - * CONFIG_DEBUG_INFO too) - */ +/* CONFIG_DEBUG_SPI enables debug output from this file */ -#undef SSI_DEBUG /* Define to enable debug */ - -#ifdef SSI_DEBUG +#ifdef CONFIG_DEBUG_SPI # define ssierr llerr +# define ssiwarn llwarn # define ssiinfo llinfo +# define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m) #else # define ssierr(x...) +# define ssiwarn(x...) # define ssiinfo(x...) +# define ssi_dumpgpio(m) #endif /* How many SSI modules does this chip support? The LM3S6918 supports 2 SSI @@ -577,7 +577,7 @@ static void ssi_txuint8(struct tiva_ssidev_s *priv) static void ssi_rxnull(struct tiva_ssidev_s *priv) { -#if defined(SSI_DEBUG) && defined(CONFIG_DEBUG_INFO) +#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO) uint32_t regval = ssi_getreg(priv, TIVA_SSI_DR_OFFSET); ssiinfo("RX: discard %04x\n", regval); #else @@ -1022,7 +1022,7 @@ static int ssi_interrupt(int irq, void *context) /* Check for Rx FIFO overruns */ -#ifdef SSI_DEBUG +#ifdef CONFIG_DEBUG_SPI if ((regval & SSI_RIS_ROR) != 0) { ssierr("Rx FIFO Overrun!\n"); diff --git a/configs/eagle100/src/lm_ssi.c b/configs/eagle100/src/lm_ssi.c index f0a1fbb28f0..066c12d11d7 100644 --- a/configs/eagle100/src/lm_ssi.c +++ b/configs/eagle100/src/lm_ssi.c @@ -59,29 +59,17 @@ * Pre-processor Definitions ************************************************************************************/ -/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ +/* CONFIG_DEBUG_SPI enables debug output from this file */ -#undef SSI_DEBUG /* Define to enable debug */ -#undef SSI_VERBOSE /* Define to enable verbose debug */ - -#ifdef SSI_DEBUG +#ifdef CONFIG_DEBUG_SPI # define ssierr llerr -# ifdef SSI_VERBOSE -# define ssiinfo llerr -# else -# define ssiinfo(x...) -# endif -#else -# undef SSI_VERBOSE -# define ssierr(x...) -# define ssiinfo(x...) -#endif - -/* Dump GPIO registers */ - -#ifdef SSI_VERBOSE +# define ssiwarn llwarn +# define ssiinfo llinfo # define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m) #else +# define ssierr(x...) +# define ssiwarn(x...) +# define ssiinfo(x...) # define ssi_dumpgpio(m) #endif diff --git a/configs/ekk-lm3s9b96/src/lm_ssi.c b/configs/ekk-lm3s9b96/src/lm_ssi.c index 1e4e3792132..f22fc206cf0 100644 --- a/configs/ekk-lm3s9b96/src/lm_ssi.c +++ b/configs/ekk-lm3s9b96/src/lm_ssi.c @@ -58,38 +58,20 @@ * Pre-processor Definitions ************************************************************************************/ -/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ +/* CONFIG_DEBUG_SPI enables debug output from this file */ -#undef SSI_DEBUG /* Define to enable debug */ -#undef SSI_VERBOSE /* Define to enable verbose debug */ - -#ifdef SSI_DEBUG +#ifdef CONFIG_DEBUG_SPI # define ssierr llerr -# ifdef SSI_VERBOSE -# define ssiinfo llerr -# else -# define ssiinfo(x...) -# endif -#else -# undef SSI_VERBOSE -# define ssierr(x...) -# define ssiinfo(x...) -#endif - -/* Dump GPIO registers */ - -#ifdef SSI_VERBOSE -#if 0 +# define ssiwarn llwarn +# define ssiinfo llinfo # define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m) -#endif #else +# define ssierr(x...) +# define ssiwarn(x...) +# define ssiinfo(x...) # define ssi_dumpgpio(m) #endif -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ diff --git a/configs/hymini-stm32v/src/stm32_r61505u.c b/configs/hymini-stm32v/src/stm32_r61505u.c index 8f23b6a3442..40da4c42ecb 100644 --- a/configs/hymini-stm32v/src/stm32_r61505u.c +++ b/configs/hymini-stm32v/src/stm32_r61505u.c @@ -94,9 +94,13 @@ /* Debug ******************************************************************************/ #ifdef CONFIG_DEBUG_LCD -# define lcderr(format, ...) info(format, ##__VA_ARGS__) +# define lcderr err +# define lcdwarn warn +# define lcdinfo info #else -# define lcderr(x...) +# define lcderr(x...) +# define lcdwarn(x...) +# define lcdinfo(x...) #endif /* This should be put elsewhere (possibly include/nuttx/compiler.h) */ @@ -880,26 +884,26 @@ static void lcd_backlight(void) /* Dump timer3 registers */ - lcderr("APB1ENR: %08x\n", getreg32(STM32_RCC_APB1ENR)); - lcderr("CR1: %04x\n", getreg32(STM32_TIM3_CR1)); - lcderr("CR2: %04x\n", getreg32(STM32_TIM3_CR2)); - lcderr("SMCR: %04x\n", getreg32(STM32_TIM3_SMCR)); - lcderr("DIER: %04x\n", getreg32(STM32_TIM3_DIER)); - lcderr("SR: %04x\n", getreg32(STM32_TIM3_SR)); - lcderr("EGR: %04x\n", getreg32(STM32_TIM3_EGR)); - lcderr("CCMR1: %04x\n", getreg32(STM32_TIM3_CCMR1)); - lcderr("CCMR2: %04x\n", getreg32(STM32_TIM3_CCMR2)); - lcderr("CCER: %04x\n", getreg32(STM32_TIM3_CCER)); - lcderr("CNT: %04x\n", getreg32(STM32_TIM3_CNT)); - lcderr("PSC: %04x\n", getreg32(STM32_TIM3_PSC)); - lcderr("ARR: %04x\n", getreg32(STM32_TIM3_ARR)); - lcderr("CCR1: %04x\n", getreg32(STM32_TIM3_CCR1)); - lcderr("CCR2: %04x\n", getreg32(STM32_TIM3_CCR2)); - lcderr("CCR3: %04x\n", getreg32(STM32_TIM3_CCR3)); - lcderr("CCR4: %04x\n", getreg32(STM32_TIM3_CCR4)); - lcderr("CCR4: %04x\n", getreg32(STM32_TIM3_CCR4)); - lcderr("CCR4: %04x\n", getreg32(STM32_TIM3_CCR4)); - lcderr("DMAR: %04x\n", getreg32(STM32_TIM3_DMAR)); + lcdinfo("APB1ENR: %08x\n", getreg32(STM32_RCC_APB1ENR)); + lcdinfo("CR1: %04x\n", getreg32(STM32_TIM3_CR1)); + lcdinfo("CR2: %04x\n", getreg32(STM32_TIM3_CR2)); + lcdinfo("SMCR: %04x\n", getreg32(STM32_TIM3_SMCR)); + lcdinfo("DIER: %04x\n", getreg32(STM32_TIM3_DIER)); + lcdinfo("SR: %04x\n", getreg32(STM32_TIM3_SR)); + lcdinfo("EGR: %04x\n", getreg32(STM32_TIM3_EGR)); + lcdinfo("CCMR1: %04x\n", getreg32(STM32_TIM3_CCMR1)); + lcdinfo("CCMR2: %04x\n", getreg32(STM32_TIM3_CCMR2)); + lcdinfo("CCER: %04x\n", getreg32(STM32_TIM3_CCER)); + lcdinfo("CNT: %04x\n", getreg32(STM32_TIM3_CNT)); + lcdinfo("PSC: %04x\n", getreg32(STM32_TIM3_PSC)); + lcdinfo("ARR: %04x\n", getreg32(STM32_TIM3_ARR)); + lcdinfo("CCR1: %04x\n", getreg32(STM32_TIM3_CCR1)); + lcdinfo("CCR2: %04x\n", getreg32(STM32_TIM3_CCR2)); + lcdinfo("CCR3: %04x\n", getreg32(STM32_TIM3_CCR3)); + lcdinfo("CCR4: %04x\n", getreg32(STM32_TIM3_CCR4)); + lcdinfo("CCR4: %04x\n", getreg32(STM32_TIM3_CCR4)); + lcdinfo("CCR4: %04x\n", getreg32(STM32_TIM3_CCR4)); + lcdinfo("DMAR: %04x\n", getreg32(STM32_TIM3_DMAR)); } #endif @@ -938,7 +942,7 @@ int board_lcd_initialize(void) { /* Not a R61505U ? */ - gerr("board_lcd_initialize: LCD ctrl is not a R61505U"); + lcderr("ERROR: board_lcd_initialize: LCD ctrl is not a R61505U"); return ERROR; } diff --git a/configs/hymini-stm32v/src/stm32_ssd1289.c b/configs/hymini-stm32v/src/stm32_ssd1289.c index 7bd48a15293..dc9c0b964ca 100644 --- a/configs/hymini-stm32v/src/stm32_ssd1289.c +++ b/configs/hymini-stm32v/src/stm32_ssd1289.c @@ -103,21 +103,21 @@ #define LCD_DATA 0x60020000 /* RS = 1 */ /* Debug ******************************************************************************/ + #ifdef CONFIG_DEBUG_LCD # define lcderr err +# define lcdwarn warn # define lcdinfo info #else # define lcderr(x...) +# define lcdwarn(x...) # define lcdinfo(x...) #endif -/************************************************************************************** - * Private Type Definition - **************************************************************************************/ - /************************************************************************************** * Private Function Prototypes **************************************************************************************/ + /* Low Level LCD access */ static void stm32_select(FAR struct ssd1289_lcd_s *dev); @@ -359,26 +359,26 @@ static void init_lcd_backlight(void) /* Dump timer3 registers */ - lcderr("APB1ENR: %08x\n", getreg32(STM32_RCC_APB1ENR)); - lcderr("CR1: %04x\n", getreg32(STM32_TIM3_CR1)); - lcderr("CR2: %04x\n", getreg32(STM32_TIM3_CR2)); - lcderr("SMCR: %04x\n", getreg32(STM32_TIM3_SMCR)); - lcderr("DIER: %04x\n", getreg32(STM32_TIM3_DIER)); - lcderr("SR: %04x\n", getreg32(STM32_TIM3_SR)); - lcderr("EGR: %04x\n", getreg32(STM32_TIM3_EGR)); - lcderr("CCMR1: %04x\n", getreg32(STM32_TIM3_CCMR1)); - lcderr("CCMR2: %04x\n", getreg32(STM32_TIM3_CCMR2)); - lcderr("CCER: %04x\n", getreg32(STM32_TIM3_CCER)); - lcderr("CNT: %04x\n", getreg32(STM32_TIM3_CNT)); - lcderr("PSC: %04x\n", getreg32(STM32_TIM3_PSC)); - lcderr("ARR: %04x\n", getreg32(STM32_TIM3_ARR)); - lcderr("CCR1: %04x\n", getreg32(STM32_TIM3_CCR1)); - lcderr("CCR2: %04x\n", getreg32(STM32_TIM3_CCR2)); - lcderr("CCR3: %04x\n", getreg32(STM32_TIM3_CCR3)); - lcderr("CCR4: %04x\n", getreg32(STM32_TIM3_CCR4)); - lcderr("CCR4: %04x\n", getreg32(STM32_TIM3_CCR4)); - lcderr("CCR4: %04x\n", getreg32(STM32_TIM3_CCR4)); - lcderr("DMAR: %04x\n", getreg32(STM32_TIM3_DMAR)); + lcdinfo("APB1ENR: %08x\n", getreg32(STM32_RCC_APB1ENR)); + lcdinfo("CR1: %04x\n", getreg32(STM32_TIM3_CR1)); + lcdinfo("CR2: %04x\n", getreg32(STM32_TIM3_CR2)); + lcdinfo("SMCR: %04x\n", getreg32(STM32_TIM3_SMCR)); + lcdinfo("DIER: %04x\n", getreg32(STM32_TIM3_DIER)); + lcdinfo("SR: %04x\n", getreg32(STM32_TIM3_SR)); + lcdinfo("EGR: %04x\n", getreg32(STM32_TIM3_EGR)); + lcdinfo("CCMR1: %04x\n", getreg32(STM32_TIM3_CCMR1)); + lcdinfo("CCMR2: %04x\n", getreg32(STM32_TIM3_CCMR2)); + lcdinfo("CCER: %04x\n", getreg32(STM32_TIM3_CCER)); + lcdinfo("CNT: %04x\n", getreg32(STM32_TIM3_CNT)); + lcdinfo("PSC: %04x\n", getreg32(STM32_TIM3_PSC)); + lcdinfo("ARR: %04x\n", getreg32(STM32_TIM3_ARR)); + lcdinfo("CCR1: %04x\n", getreg32(STM32_TIM3_CCR1)); + lcdinfo("CCR2: %04x\n", getreg32(STM32_TIM3_CCR2)); + lcdinfo("CCR3: %04x\n", getreg32(STM32_TIM3_CCR3)); + lcdinfo("CCR4: %04x\n", getreg32(STM32_TIM3_CCR4)); + lcdinfo("CCR4: %04x\n", getreg32(STM32_TIM3_CCR4)); + lcdinfo("CCR4: %04x\n", getreg32(STM32_TIM3_CCR4)); + lcdinfo("DMAR: %04x\n", getreg32(STM32_TIM3_DMAR)); } /************************************************************************************ diff --git a/configs/lm3s6432-s2e/src/lm_ethernet.c b/configs/lm3s6432-s2e/src/lm_ethernet.c index befbdd7c0c2..2d7f2c64148 100644 --- a/configs/lm3s6432-s2e/src/lm_ethernet.c +++ b/configs/lm3s6432-s2e/src/lm_ethernet.c @@ -83,7 +83,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr) user0 = getreg32(TIVA_FLASH_USERREG0); user1 = getreg32(TIVA_FLASH_USERREG1); - nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); + nllinfo("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff); /* Re-format that MAC address the way that the network expects to see it */ diff --git a/configs/lm3s6432-s2e/src/lm_leds.c b/configs/lm3s6432-s2e/src/lm_leds.c index 276a168c4ac..5dc259383fa 100644 --- a/configs/lm3s6432-s2e/src/lm_leds.c +++ b/configs/lm3s6432-s2e/src/lm_leds.c @@ -96,7 +96,7 @@ static uint8_t g_nest; #ifdef CONFIG_ARCH_LEDS void board_autoled_initialize(void) { - lederr("Initializing\n"); + ledinfo("Initializing\n"); /* Configure Port F, Bit 2 as an output, initial value=OFF */ diff --git a/configs/lm3s6432-s2e/src/lm_ssi.c b/configs/lm3s6432-s2e/src/lm_ssi.c index 250b29bddc4..9c3e7ebc5ad 100644 --- a/configs/lm3s6432-s2e/src/lm_ssi.c +++ b/configs/lm3s6432-s2e/src/lm_ssi.c @@ -57,36 +57,20 @@ * Pre-processor Definitions ************************************************************************************/ -/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ +/* CONFIG_DEBUG_SPI enables debug output from this file */ -#undef SSI_DEBUG /* Define to enable debug */ -#undef SSI_VERBOSE /* Define to enable verbose debug */ - -#ifdef SSI_DEBUG +#ifdef CONFIG_DEBUG_SPI # define ssierr llerr -# ifdef SSI_VERBOSE -# define ssiinfo llerr -# else -# define ssiinfo(x...) -# endif -#else -# undef SSI_VERBOSE -# define ssierr(x...) -# define ssiinfo(x...) -#endif - -/* Dump GPIO registers */ - -#ifdef SSI_VERBOSE +# define ssiwarn llwarn +# define ssiinfo llinfo # define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m) #else +# define ssierr(x...) +# define ssiwarn(x...) +# define ssiinfo(x...) # define ssi_dumpgpio(m) #endif -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ @@ -129,7 +113,7 @@ void weak_function lm_ssidev_initialize(void) void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); + ssiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); ssi_dumpgpio("tiva_ssiselect() Entry"); if (devid == SPIDEV_MMCSD) @@ -144,7 +128,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { - ssierr("Returning SPI_STATUS_PRESENT\n"); + ssiinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; } diff --git a/configs/lm3s6965-ek/src/lm_ethernet.c b/configs/lm3s6965-ek/src/lm_ethernet.c index d6e8725de3a..bc26a77ef58 100644 --- a/configs/lm3s6965-ek/src/lm_ethernet.c +++ b/configs/lm3s6965-ek/src/lm_ethernet.c @@ -83,7 +83,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr) user0 = getreg32(TIVA_FLASH_USERREG0); user1 = getreg32(TIVA_FLASH_USERREG1); - nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); + nllinfo("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff); /* Re-format that MAC address the way that the network expects to see it */ diff --git a/configs/lm3s6965-ek/src/lm_leds.c b/configs/lm3s6965-ek/src/lm_leds.c index 95c4695739f..a26dd8cec9b 100644 --- a/configs/lm3s6965-ek/src/lm_leds.c +++ b/configs/lm3s6965-ek/src/lm_leds.c @@ -55,34 +55,20 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ +/* CONFIG_DEBUG_LEDS enables debug output from this file */ #ifdef CONFIG_DEBUG_LEDS # define lederr llerr # define ledinfo llinfo +# define ledinfo llinfo +# define led_dumpgpio(m) tiva_dumpgpio(LED_GPIO, m) #else # define lederr(x...) # define ledinfo(x...) -#endif - -/* Dump GPIO registers */ - -#ifdef CONFIG_DEBUG_LEDS -# define led_dumpgpio(m) tiva_dumpgpio(LED_GPIO, m) -#else +# define ledinfo(x...) # define led_dumpgpio(m) #endif -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -96,7 +82,7 @@ static uint8_t g_nest; #ifdef CONFIG_ARCH_LEDS void board_autoled_initialize(void) { - lederr("Initializing\n"); + ledinfo("Initializing\n"); /* Configure Port E, Bit 1 as an output, initial value=OFF */ diff --git a/configs/lm3s6965-ek/src/lm_oled.c b/configs/lm3s6965-ek/src/lm_oled.c index f9eb8d8644f..de1a4a23e29 100644 --- a/configs/lm3s6965-ek/src/lm_oled.c +++ b/configs/lm3s6965-ek/src/lm_oled.c @@ -114,7 +114,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) spi = tiva_ssibus_initialize(0); if (!spi) { - gllerr("Failed to initialize SSI port 0\n"); + gllerr("ERROR: Failed to initialize SSI port 0\n"); } else { @@ -123,7 +123,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) dev = rit_initialize(spi, devno); if (!dev) { - gllerr("Failed to bind SSI port 0 to OLED %d: %d\n", devno); + gllerr("ERROR: Failed to bind SSI port 0 to OLED %d: %d\n", devno); } else { diff --git a/configs/lm3s6965-ek/src/lm_ssi.c b/configs/lm3s6965-ek/src/lm_ssi.c index 600e1f2ccfe..829567da7e6 100644 --- a/configs/lm3s6965-ek/src/lm_ssi.c +++ b/configs/lm3s6965-ek/src/lm_ssi.c @@ -59,36 +59,20 @@ * Pre-processor Definitions ************************************************************************************/ -/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ +/* CONFIG_DEBUG_SPI enables debug output from this file */ -#undef SSI_DEBUG /* Define to enable debug */ -#undef SSI_VERBOSE /* Define to enable verbose debug */ - -#ifdef SSI_DEBUG +#ifdef CONFIG_DEBUG_SPI # define ssierr llerr -# ifdef SSI_VERBOSE -# define ssiinfo llerr -# else -# define ssiinfo(x...) -# endif -#else -# undef SSI_VERBOSE -# define ssierr(x...) -# define ssiinfo(x...) -#endif - -/* Dump GPIO registers */ - -#ifdef SSI_VERBOSE +# define ssiwarn llwarn +# define ssiinfo llinfo # define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m) #else +# define ssierr(x...) +# define ssiwarn(x...) +# define ssiinfo(x...) # define ssi_dumpgpio(m) #endif -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ @@ -134,7 +118,7 @@ void weak_function lm_ssidev_initialize(void) void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); + ssiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); ssi_dumpgpio("tiva_ssiselect() Entry"); if (devid == SPIDEV_MMCSD) @@ -156,7 +140,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { - ssierr("Returning SPI_STATUS_PRESENT\n"); + ssiinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; } diff --git a/configs/lm3s8962-ek/src/lm_ethernet.c b/configs/lm3s8962-ek/src/lm_ethernet.c index 319e0fac597..d93810f066b 100644 --- a/configs/lm3s8962-ek/src/lm_ethernet.c +++ b/configs/lm3s8962-ek/src/lm_ethernet.c @@ -83,7 +83,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr) user0 = getreg32(TIVA_FLASH_USERREG0); user1 = getreg32(TIVA_FLASH_USERREG1); - nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); + nllinfo("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff); /* Re-format that MAC address the way that the network expects to see it */ diff --git a/configs/lm3s8962-ek/src/lm_leds.c b/configs/lm3s8962-ek/src/lm_leds.c index bf8eb48ddc8..a6a938f2acc 100644 --- a/configs/lm3s8962-ek/src/lm_leds.c +++ b/configs/lm3s8962-ek/src/lm_leds.c @@ -55,23 +55,17 @@ * Pre-processor Definitions ****************************************************************************/ -/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES - * with CONFIG_DEBUG_INFO too) - */ +/* CONFIG_DEBUG_LEDS enables debug output from this file */ #ifdef CONFIG_DEBUG_LEDS # define lederr llerr # define ledinfo llinfo +# define ledinfo llinfo +# define led_dumpgpio(m) tiva_dumpgpio(LED_GPIO, m) #else # define lederr(x...) # define ledinfo(x...) -#endif - -/* Dump GPIO registers */ - -#ifdef CONFIG_DEBUG_LEDS -# define led_dumpgpio(m) tiva_dumpgpio(LED_GPIO, m) -#else +# define ledinfo(x...) # define led_dumpgpio(m) #endif @@ -79,16 +73,12 @@ * Private Data ****************************************************************************/ -/**************************************************************************** - * Private Functions - ****************************************************************************/ +static uint8_t g_nest; /**************************************************************************** * Public Functions ****************************************************************************/ -static uint8_t g_nest; - /**************************************************************************** * Name: board_autoled_initialize ****************************************************************************/ @@ -96,7 +86,7 @@ static uint8_t g_nest; #ifdef CONFIG_ARCH_LEDS void board_autoled_initialize(void) { - lederr("Initializing\n"); + ledinfo("Initializing\n"); /* Configure Port E, Bit 1 as an output, initial value=OFF */ diff --git a/configs/lm3s8962-ek/src/lm_oled.c b/configs/lm3s8962-ek/src/lm_oled.c index d42049227bc..d6298212e50 100644 --- a/configs/lm3s8962-ek/src/lm_oled.c +++ b/configs/lm3s8962-ek/src/lm_oled.c @@ -113,7 +113,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) spi = tiva_ssibus_initialize(0); if (!spi) { - gllerr("Failed to initialize SSI port 0\n"); + gllerr("ERROR: Failed to initialize SSI port 0\n"); } else { @@ -122,7 +122,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) dev = rit_initialize(spi, devno); if (!dev) { - gllerr("Failed to bind SSI port 0 to OLED %d: %d\n", devno); + gllerr("ERROR: Failed to bind SSI port 0 to OLED %d: %d\n", devno); } else { diff --git a/configs/lm3s8962-ek/src/lm_ssi.c b/configs/lm3s8962-ek/src/lm_ssi.c index 60fc30bfecb..c5b9efa53d3 100644 --- a/configs/lm3s8962-ek/src/lm_ssi.c +++ b/configs/lm3s8962-ek/src/lm_ssi.c @@ -59,36 +59,20 @@ * Pre-processor Definitions ************************************************************************************/ -/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ +/* CONFIG_DEBUG_SPI enables debug output from this file */ -#undef SSI_DEBUG /* Define to enable debug */ -#undef SSI_VERBOSE /* Define to enable verbose debug */ - -#ifdef SSI_DEBUG +#ifdef CONFIG_DEBUG_SPI # define ssierr llerr -# ifdef SSI_VERBOSE -# define ssiinfo llerr -# else -# define ssiinfo(x...) -# endif -#else -# undef SSI_VERBOSE -# define ssierr(x...) -# define ssiinfo(x...) -#endif - -/* Dump GPIO registers */ - -#ifdef SSI_VERBOSE +# define ssiwarn llwarn +# define ssiinfo llinfo # define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m) #else +# define ssierr(x...) +# define ssiwarn(x...) +# define ssiinfo(x...) # define ssi_dumpgpio(m) #endif -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ @@ -134,7 +118,7 @@ void weak_function lm_ssidev_initialize(void) void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); + ssiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); ssi_dumpgpio("tiva_ssiselect() Entry"); if (devid == SPIDEV_MMCSD) @@ -156,7 +140,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { - ssierr("Returning SPI_STATUS_PRESENT\n"); + ssiinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; } diff --git a/configs/lm4f120-launchpad/src/lm4f_autoleds.c b/configs/lm4f120-launchpad/src/lm4f_autoleds.c index 0e7fe05da3d..0d905af81ad 100644 --- a/configs/lm4f120-launchpad/src/lm4f_autoleds.c +++ b/configs/lm4f120-launchpad/src/lm4f_autoleds.c @@ -140,7 +140,7 @@ #ifdef CONFIG_ARCH_LEDS void lm4f_led_initialize(void) { - lederr("Initializing\n"); + ledinfo("Initializing\n"); /* Configure Port E, Bit 1 as an output, initial value=OFF */ diff --git a/configs/lm4f120-launchpad/src/lm4f_ssi.c b/configs/lm4f120-launchpad/src/lm4f_ssi.c index 68aaab15534..c89b6d4c131 100644 --- a/configs/lm4f120-launchpad/src/lm4f_ssi.c +++ b/configs/lm4f120-launchpad/src/lm4f_ssi.c @@ -60,28 +60,20 @@ * Pre-processor Definitions ************************************************************************************/ -/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ +/* CONFIG_DEBUG_SPI enables debug output from this file */ #ifdef CONFIG_DEBUG_SPI -# define ssierr llerr -#else -# define ssierr(x...) -#endif - -/* Dump GPIO registers */ - -#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO) -# define ssiinfo llerr +# define ssierr llerr +# define ssiwarn llwarn +# define ssiinfo llinfo # define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m) #else +# define ssierr(x...) +# define ssiwarn(x...) # define ssiinfo(x...) # define ssi_dumpgpio(m) #endif -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ @@ -119,14 +111,14 @@ void weak_function lm4f_spidev_initialize(void) void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); + ssiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); ssi_dumpgpio("tiva_ssiselect() Entry"); ssi_dumpgpio("tiva_ssiselect() Exit"); } uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { - ssierr("Returning SPI_STATUS_PRESENT\n"); + ssiinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; } diff --git a/configs/lpc4337-ws/src/lpc43_adc.c b/configs/lpc4337-ws/src/lpc43_adc.c index 0e5f77ca461..c1cb491f61a 100644 --- a/configs/lpc4337-ws/src/lpc43_adc.c +++ b/configs/lpc4337-ws/src/lpc43_adc.c @@ -95,7 +95,7 @@ int board_adc_setup(void) ret = adc_register("/dev/adc0", adc); if (ret < 0) { - aerr("adc_register failed: %d\n", ret); + aerr("ERROR: adc_register failed: %d\n", ret); return ret; } diff --git a/configs/lpc4370-link2/src/lpc43_adc.c b/configs/lpc4370-link2/src/lpc43_adc.c index 10eeaffcc89..def52a57481 100644 --- a/configs/lpc4370-link2/src/lpc43_adc.c +++ b/configs/lpc4370-link2/src/lpc43_adc.c @@ -95,7 +95,7 @@ int board_adc_setup(void) ret = adc_register("/dev/adc0", adc); if (ret < 0) { - aerr("adc_register failed: %d\n", ret); + aerr("ERROR: adc_register failed: %d\n", ret); return ret; } diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_adc.c b/configs/lpcxpresso-lpc1115/src/lpc11_adc.c index 93d6c0f7b9a..75936ee338f 100644 --- a/configs/lpcxpresso-lpc1115/src/lpc11_adc.c +++ b/configs/lpcxpresso-lpc1115/src/lpc11_adc.c @@ -107,7 +107,7 @@ int adc_devinit(void) ret = adc_register("/dev/adc0", adc); if (ret < 0) { - aerr("adc_register failed: %d\n", ret); + aerr("ERROR: adc_register failed: %d\n", ret); return ret; } diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_dac.c b/configs/lpcxpresso-lpc1115/src/lpc11_dac.c index 420805ae8ed..93730ed0782 100644 --- a/configs/lpcxpresso-lpc1115/src/lpc11_dac.c +++ b/configs/lpcxpresso-lpc1115/src/lpc11_dac.c @@ -90,7 +90,7 @@ int dac_devinit(void) ret = dac_register("/dev/dac0", dac); if (ret < 0) { - aerr("dac_register failed: %d\n", ret); + aerr("ERROR: dac_register failed: %d\n", ret); return ret; } diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_pwm.c b/configs/lpcxpresso-lpc1115/src/lpc11_pwm.c index 1821e4cd5c5..6f303e5f5e4 100644 --- a/configs/lpcxpresso-lpc1115/src/lpc11_pwm.c +++ b/configs/lpcxpresso-lpc1115/src/lpc11_pwm.c @@ -96,7 +96,7 @@ int pwm_devinit(void) pwm = lpc11_pwminitialize(0); if (!pwm) { - aerr("Failed to get the LPC17XX PWM lower half\n"); + aerr("ERROR: Failed to get the LPC17XX PWM lower half\n"); return -ENODEV; } @@ -105,14 +105,14 @@ int pwm_devinit(void) ret = pwm_register("/dev/pwm0", pwm); if (ret < 0) { - aerr("pwm_register failed: %d\n", ret); + aerr("ERROR: pwm_register failed: %d\n", ret); return ret; } mcpwm = lpc11_mcpwminitialize(0); if (!mcpwm) { - aerr("Failed to get the LPC17XX MOTOR PWM lower half\n"); + aerr("ERROR: Failed to get the LPC17XX MOTOR PWM lower half\n"); return -ENODEV; } @@ -121,14 +121,14 @@ int pwm_devinit(void) ret = pwm_register("/dev/mcpwm0", mcpwm); if (ret < 0) { - aerr("mcpwm_register failed: %d\n", ret); + aerr("ERROR: mcpwm_register failed: %d\n", ret); return ret; } timer = lpc11_timerinitialize(0); if (!timer) { - aerr("Failed to get the LPC17XX TIMER lower half\n"); + aerr("ERROR: Failed to get the LPC17XX TIMER lower half\n"); return -ENODEV; } @@ -137,7 +137,7 @@ int pwm_devinit(void) ret = pwm_register("/dev/timer0", timer); if (ret < 0) { - aerr("timer_register failed: %d\n", ret); + aerr("ERROR: timer_register failed: %d\n", ret); return ret; } diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c index 19df11758e6..f7db6c7b29b 100644 --- a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c +++ b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c @@ -148,7 +148,7 @@ void weak_function lpcxpresso_sspdev_initialize(void) #ifdef CONFIG_LPC17_SSP0 void lpc11_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); + sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); ssp_dumpgpio("lpc11_ssp0select() Entry"); #warning "Assert CS here (false)" @@ -158,7 +158,7 @@ void lpc11_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel uint8_t lpc11_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { - ssperr("Returning SPI_STATUS_PRESENT\n"); + sspinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; } #endif @@ -166,7 +166,7 @@ uint8_t lpc11_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_LPC17_SSP1 void lpc11_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); + sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); ssp_dumpgpio("lpc11_ssp1select() Entry"); if (devid == SPIDEV_MMCSD) @@ -194,12 +194,12 @@ uint8_t lpc11_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) if (lpc11_gpioread(LPCXPRESSO_SD_CD) == 0) { - ssperr("Returning SPI_STATUS_PRESENT\n"); + sspinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; } } - ssperr("Returning zero\n"); + sspinfo("Returning zero\n"); return 0; } #endif diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_adc.c b/configs/lpcxpresso-lpc1768/src/lpc17_adc.c index 3cb72e2e936..b7d1b6ddb98 100644 --- a/configs/lpcxpresso-lpc1768/src/lpc17_adc.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_adc.c @@ -108,7 +108,7 @@ int board_adc_setup(void) ret = adc_register("/dev/adc0", adc); if (ret < 0) { - aerr("adc_register failed: %d\n", ret); + aerr("ERROR: adc_register failed: %d\n", ret); return ret; } diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_dac.c b/configs/lpcxpresso-lpc1768/src/lpc17_dac.c index 73657d135a0..1948b4312c2 100644 --- a/configs/lpcxpresso-lpc1768/src/lpc17_dac.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_dac.c @@ -86,7 +86,7 @@ int dac_devinit(void) ret = dac_register("/dev/dac0", dac); if (ret < 0) { - aerr("dac_register failed: %d\n", ret); + aerr("ERROR: dac_register failed: %d\n", ret); return ret; } diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c index 4b3b9f5e128..4f3717190dd 100644 --- a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c @@ -128,7 +128,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) spi = lpc17_sspbus_initialize(1); if (!spi) { - gllerr("Failed to initialize SPI port 1\n"); + gllerr("ERROR: Failed to initialize SPI port 1\n"); } else { @@ -137,7 +137,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) dev = ug_initialize(spi, devno); if (!dev) { - gllerr("Failed to bind SPI port 1 to OLED %d: %d\n", devno); + gllerr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno); } else { diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c b/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c index 746a529a3b3..4b261555cb6 100644 --- a/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c @@ -98,7 +98,7 @@ int board_pwm_setup(void) pwm = lpc17_pwminitialize(0); if (!pwm) { - aerr("Failed to get the LPC17XX PWM lower half\n"); + aerr("ERROR: Failed to get the LPC17XX PWM lower half\n"); return -ENODEV; } @@ -107,14 +107,14 @@ int board_pwm_setup(void) ret = pwm_register("/dev/pwm0", pwm); if (ret < 0) { - aerr("pwm_register failed: %d\n", ret); + aerr("ERROR: pwm_register failed: %d\n", ret); return ret; } mcpwm = lpc17_mcpwminitialize(0); if (!mcpwm) { - aerr("Failed to get the LPC17XX MOTOR PWM lower half\n"); + aerr("ERROR: Failed to get the LPC17XX MOTOR PWM lower half\n"); return -ENODEV; } @@ -123,14 +123,14 @@ int board_pwm_setup(void) ret = pwm_register("/dev/mcpwm0", mcpwm); if (ret < 0) { - aerr("mcpwm_register failed: %d\n", ret); + aerr("ERROR: mcpwm_register failed: %d\n", ret); return ret; } timer = lpc17_timerinitialize(0); if (!timer) { - aerr("Failed to get the LPC17XX TIMER lower half\n"); + aerr("ERROR: Failed to get the LPC17XX TIMER lower half\n"); return -ENODEV; } @@ -139,7 +139,7 @@ int board_pwm_setup(void) ret = pwm_register("/dev/timer0", timer); if (ret < 0) { - aerr("timer_register failed: %d\n", ret); + aerr("ERROR: timer_register failed: %d\n", ret); return ret; } diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c index 7974fec8556..c41ac36d461 100644 --- a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c @@ -148,7 +148,7 @@ void weak_function lpcxpresso_sspdev_initialize(void) #ifdef CONFIG_LPC17_SSP0 void lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); + sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); ssp_dumpgpio("lpc17_ssp0select() Entry"); #warning "Assert CS here (false)" @@ -158,7 +158,7 @@ void lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { - ssperr("Returning SPI_STATUS_PRESENT\n"); + sspinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; } #endif @@ -166,7 +166,7 @@ uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_LPC17_SSP1 void lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); + sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); ssp_dumpgpio("lpc17_ssp1select() Entry"); if (devid == SPIDEV_MMCSD) @@ -194,12 +194,12 @@ uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) if (lpc17_gpioread(LPCXPRESSO_SD_CD) == 0) { - ssperr("Returning SPI_STATUS_PRESENT\n"); + sspinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; } } - ssperr("Returning zero\n"); + sspinfo("Returning zero\n"); return 0; } #endif diff --git a/configs/maple/src/stm32_lcd.c b/configs/maple/src/stm32_lcd.c index c273ba54c63..1df1a23709e 100644 --- a/configs/maple/src/stm32_lcd.c +++ b/configs/maple/src/stm32_lcd.c @@ -107,7 +107,7 @@ static int up_lcdextcominisr(int irq, void *context) STM32_TIM_ACKINT(tim, 0); if (g_isr == NULL) { - lcderr("error, irq not attached, disabled\n"); + lcderr("ERROR: error, irq not attached, disabled\n"); STM32_TIM_DISABLEINT(tim, 0); return OK; } @@ -117,7 +117,7 @@ static int up_lcdextcominisr(int irq, void *context) static int up_lcdirqattach(xcpt_t isr) { - lcderr("%s IRQ\n", isr == NULL ? "Detach" : "Attach"); + lcdinfo("%s IRQ\n", isr == NULL ? "Detach" : "Attach"); if (isr != NULL) { @@ -135,7 +135,7 @@ static int up_lcdirqattach(xcpt_t isr) static void up_lcddispcontrol(bool on) { - lcderr("set: %s\n", on ? "on" : "off"); + lcdinfo("set: %s\n", on ? "on" : "off"); if (on) { @@ -159,7 +159,7 @@ static void up_lcdsetpolarity(bool pol) static void up_lcdsetvcomfreq(unsigned int freq) { - lcderr("freq: %d\n", freq); + lcdinfo("freq: %d\n", freq); DEBUGASSERT(freq >= 1 && freq <= 60); STM32_TIM_SETPERIOD(tim, TIMER_FREQ / freq); } @@ -190,17 +190,17 @@ static FAR struct memlcd_priv_s memlcd_priv = FAR int board_lcd_initialize(void) { - lcderr("Initializing lcd\n"); + lcdinfo("Initializing lcd\n"); - lcderr("init spi1\n"); + lcdinfo("init spi1\n"); spi = stm32_spibus_initialize(1); DEBUGASSERT(spi); - lcderr("configure related io\n"); + lcdinfo("configure related io\n"); stm32_configgpio(GPIO_MEMLCD_EXTCOMIN); stm32_configgpio(GPIO_MEMLCD_DISP); - lcderr("configure EXTCOMIN timer\n"); + lcdinfo("configure EXTCOMIN timer\n"); if (tim == NULL) { tim = stm32_tim_init(2); @@ -210,7 +210,7 @@ FAR int board_lcd_initialize(void) STM32_TIM_SETMODE(tim, STM32_TIM_MODE_UP); } - lcderr("init lcd\n"); + lcdinfo("init lcd\n"); l_lcddev = memlcd_initialize(spi, &memlcd_priv, 0); DEBUGASSERT(l_lcddev); diff --git a/configs/maple/src/stm32_spi.c b/configs/maple/src/stm32_spi.c index 881adf8d72a..7c25c23f05c 100644 --- a/configs/maple/src/stm32_spi.c +++ b/configs/maple/src/stm32_spi.c @@ -59,29 +59,18 @@ * Pre-processor Definitions ****************************************************************************/ -/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ - -#ifndef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_INFO -# undef CONFIG_DEBUG_SPI -#endif +/* Enables debug output from this file */ #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 -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -134,7 +123,7 @@ void weak_function stm32_spidev_initialize(void) void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); + spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); # if defined(CONFIG_LCD_SHARP_MEMLCD) if (devid == SPIDEV_DISPLAY) diff --git a/configs/maple/src/stm32_usbdev.c b/configs/maple/src/stm32_usbdev.c index 6fdb963ec8a..d27177a2409 100644 --- a/configs/maple/src/stm32_usbdev.c +++ b/configs/maple/src/stm32_usbdev.c @@ -74,7 +74,7 @@ void stm32_usbinitialize(void) { - ullerr("called\n"); + ullinfo("called\n"); /* USB Soft Connect Pullup */ @@ -113,5 +113,5 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable) void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ullerr("resume: %d\n", resume); + ullinfo("resume: %d\n", resume); } diff --git a/configs/mbed/src/lpc17_adc.c b/configs/mbed/src/lpc17_adc.c index b8f0724d7f0..4cc9b6ad8da 100644 --- a/configs/mbed/src/lpc17_adc.c +++ b/configs/mbed/src/lpc17_adc.c @@ -110,7 +110,7 @@ int board_adc_setup(void) ret = adc_register("/dev/adc0", adc); if (ret < 0) { - aerr("adc_register failed: %d\n", ret); + aerr("ERROR: adc_register failed: %d\n", ret); return ret; } diff --git a/configs/mbed/src/lpc17_dac.c b/configs/mbed/src/lpc17_dac.c index d3a4733278d..dccdbb92f5a 100644 --- a/configs/mbed/src/lpc17_dac.c +++ b/configs/mbed/src/lpc17_dac.c @@ -88,7 +88,7 @@ int dac_devinit(void) ret = dac_register("/dev/dac0", dac); if (ret < 0) { - aerr("dac_register failed: %d\n", ret); + aerr("ERROR: dac_register failed: %d\n", ret); return ret; } diff --git a/configs/mbed/src/lpc17_pwm.c b/configs/mbed/src/lpc17_pwm.c index 6cc6f331015..c8b6881dc9b 100644 --- a/configs/mbed/src/lpc17_pwm.c +++ b/configs/mbed/src/lpc17_pwm.c @@ -100,7 +100,7 @@ int board_pwm_setup(void) pwm = lpc17_pwminitialize(0); if (!pwm) { - aerr("Failed to get the LPC17XX PWM lower half\n"); + aerr("ERROR: Failed to get the LPC17XX PWM lower half\n"); return -ENODEV; } @@ -109,14 +109,14 @@ int board_pwm_setup(void) ret = pwm_register("/dev/pwm0", pwm); if (ret < 0) { - aerr("pwm_register failed: %d\n", ret); + aerr("ERROR: pwm_register failed: %d\n", ret); return ret; } mcpwm = lpc17_mcpwminitialize(0); if (!mcpwm) { - aerr("Failed to get the LPC17XX MOTOR PWM lower half\n"); + aerr("ERROR: Failed to get the LPC17XX MOTOR PWM lower half\n"); return -ENODEV; } @@ -125,14 +125,14 @@ int board_pwm_setup(void) ret = pwm_register("/dev/mcpwm0", mcpwm); if (ret < 0) { - aerr("mcpwm_register failed: %d\n", ret); + aerr("ERROR: mcpwm_register failed: %d\n", ret); return ret; } timer = lpc17_timerinitialize(0); if (!timer) { - aerr("Failed to get the LPC17XX TIMER lower half\n"); + aerr("ERROR: Failed to get the LPC17XX TIMER lower half\n"); return -ENODEV; } @@ -141,7 +141,7 @@ int board_pwm_setup(void) ret = pwm_register("/dev/timer0", timer); if (ret < 0) { - aerr("timer_register failed: %d\n", ret); + aerr("ERROR: timer_register failed: %d\n", ret); return ret; } diff --git a/configs/mcu123-lpc214x/src/lpc2148_spi1.c b/configs/mcu123-lpc214x/src/lpc2148_spi1.c index 336a0b0d61d..99a5fa71171 100644 --- a/configs/mcu123-lpc214x/src/lpc2148_spi1.c +++ b/configs/mcu123-lpc214x/src/lpc2148_spi1.c @@ -232,14 +232,14 @@ static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel { /* Enable slave select (low enables) */ - spierr("CS asserted\n"); + spiinfo("CS asserted\n"); putreg32(bit, CS_CLR_REGISTER); } else { /* Disable slave select (low enables) */ - spierr("CS de-asserted\n"); + spiinfo("CS de-asserted\n"); putreg32(bit, CS_SET_REGISTER); /* Wait for the TX FIFO not full indication */ @@ -296,7 +296,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) divisor = (divisor + 1) & ~1; putreg8(divisor, LPC214X_SPI1_CPSR); - spierr("Frequency %d->%d\n", frequency, LPC214X_PCLKFREQ / divisor); + spiinfo("Frequency %d->%d\n", frequency, LPC214X_PCLKFREQ / divisor); return LPC214X_PCLKFREQ / divisor; } @@ -321,7 +321,7 @@ static uint8_t spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) * board. */ - spierr("Return SPI_STATUS_PRESENT\n"); + spiinfo("Return SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; } @@ -392,7 +392,7 @@ static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd) /* Get the value from the RX FIFO and return it */ regval = getreg16(LPC214X_SPI1_DR); - spierr("%04x->%04x\n", wd, regval); + spiinfo("%04x->%04x\n", wd, regval); return regval; } @@ -422,7 +422,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size /* Loop while thre are bytes remaining to be sent */ - spierr("nwords: %d\n", nwords); + spiinfo("nwords: %d\n", nwords); while (nwords > 0) { /* While the TX FIFO is not full and there are bytes left to send */ @@ -439,7 +439,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size /* Then discard all card responses until the RX & TX FIFOs are emptied. */ - spierr("discarding\n"); + spiinfo("discarding\n"); do { /* Is there anything in the RX fifo? */ @@ -493,7 +493,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw /* While there is remaining to be sent (and no synchronization error has occurred) */ - spierr("nwords: %d\n", nwords); + spiinfo("nwords: %d\n", nwords); while (nwords || rxpending) { /* Fill the transmit FIFO with 0xff... diff --git a/configs/mikroe-stm32f4/src/stm32_idle.c b/configs/mikroe-stm32f4/src/stm32_idle.c index 4af462bb6ba..bde6c700382 100644 --- a/configs/mikroe-stm32f4/src/stm32_idle.c +++ b/configs/mikroe-stm32f4/src/stm32_idle.c @@ -125,7 +125,7 @@ static void up_idlepm(void) if (newstate != oldstate) { - llerr("newstate= %d oldstate=%d\n", newstate, oldstate); + llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); flags = enter_critical_section(); diff --git a/configs/mikroe-stm32f4/src/stm32_pwm.c b/configs/mikroe-stm32f4/src/stm32_pwm.c index 11a0f2b38c3..a7eda309069 100644 --- a/configs/mikroe-stm32f4/src/stm32_pwm.c +++ b/configs/mikroe-stm32f4/src/stm32_pwm.c @@ -119,7 +119,7 @@ int board_pwm_setup(void) pwm = stm32_pwminitialize(STM32F4DISCOVERY_PWMTIMER); if (!pwm) { - err("Failed to get the STM32 PWM lower half\n"); + err("ERROR: Failed to get the STM32 PWM lower half\n"); return -ENODEV; } @@ -128,7 +128,7 @@ int board_pwm_setup(void) ret = pwm_register("/dev/pwm0", pwm); if (ret < 0) { - aerr("pwm_register failed: %d\n", ret); + aerr("ERROR: pwm_register failed: %d\n", ret); return ret; } diff --git a/configs/mikroe-stm32f4/src/stm32_qencoder.c b/configs/mikroe-stm32f4/src/stm32_qencoder.c index 4cd7738402f..33855fbaf5c 100644 --- a/configs/mikroe-stm32f4/src/stm32_qencoder.c +++ b/configs/mikroe-stm32f4/src/stm32_qencoder.c @@ -149,7 +149,7 @@ int qe_devinit(void) ret = stm32_qeinitialize("/dev/qe0", TIMID); if (ret < 0) { - snerr("stm32_qeinitialize failed: %d\n", ret); + snerr("ERROR: stm32_qeinitialize failed: %d\n", ret); return ret; } diff --git a/configs/mikroe-stm32f4/src/stm32_spi.c b/configs/mikroe-stm32f4/src/stm32_spi.c index 2b1ff957480..e4882185ba4 100644 --- a/configs/mikroe-stm32f4/src/stm32_spi.c +++ b/configs/mikroe-stm32f4/src/stm32_spi.c @@ -201,7 +201,7 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_STM32_SPI2 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); + spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) @@ -213,7 +213,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_STM32_SPI1 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); + spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) diff --git a/configs/mikroe-stm32f4/src/stm32_touchscreen.c b/configs/mikroe-stm32f4/src/stm32_touchscreen.c index 35b05c439e0..ea863e8f3d0 100644 --- a/configs/mikroe-stm32f4/src/stm32_touchscreen.c +++ b/configs/mikroe-stm32f4/src/stm32_touchscreen.c @@ -530,7 +530,7 @@ static uint16_t tc_adc_read_sample(void) if (count > 0) { - ierr("Count = %d\n", count); + iinfo("Count = %d\n", count); } return retval; @@ -1017,7 +1017,7 @@ static void tc_worker(FAR void *arg) /* Notify any waiters that new touchscreen data is available */ - ierr("1:X=%d, Y=%d\n", priv->sample.x, priv->sample.y); + iinfo("1:X=%d, Y=%d\n", priv->sample.x, priv->sample.y); tc_notify(priv); } @@ -1089,7 +1089,7 @@ static void tc_worker(FAR void *arg) /* Notify any waiters that nes touchscreen data is available */ - ierr("2:X=%d, Y=%d\n", priv->sample.x, priv->sample.y); + iinfo("2:X=%d, Y=%d\n", priv->sample.x, priv->sample.y); tc_notify(priv); } @@ -1413,7 +1413,7 @@ static int tc_poll(FAR struct file *filep, FAR struct pollfd *fds, if ((fds->events & POLLIN) == 0) { - ierr("Missing POLLIN: revents: %08x\n", fds->revents); + ierr("ERROR: Missing POLLIN: revents: %08x\n", fds->revents); ret = -EDEADLK; goto errout; } @@ -1438,7 +1438,7 @@ static int tc_poll(FAR struct file *filep, FAR struct pollfd *fds, if (i >= CONFIG_TOUCHSCREEN_NPOLLWAITERS) { - ierr("No availabled slot found: %d\n", i); + ierr("ERROR: No availabled slot found: %d\n", i); fds->priv = NULL; ret = -EBUSY; goto errout; @@ -1533,7 +1533,7 @@ int board_tsc_setup(int minor) priv = (FAR struct tc_dev_s *)kmm_malloc(sizeof(struct tc_dev_s)); if (!priv) { - ierr("kmm_malloc(%d) failed\n", sizeof(struct tc_dev_s)); + ierr("ERROR: kmm_malloc(%d) failed\n", sizeof(struct tc_dev_s)); return -ENOMEM; } #endif @@ -1552,7 +1552,7 @@ int board_tsc_setup(int minor) ret = register_driver(devname, &tc_fops, 0666, priv); if (ret < 0) { - ierr("register_driver() failed: %d\n", ret); + ierr("ERROR: register_driver() failed: %d\n", ret); goto errout_with_priv; } @@ -1564,7 +1564,7 @@ int board_tsc_setup(int minor) ret = work_queue(HPWORK, &priv->work, tc_worker, priv, 0); if (ret != 0) { - ierr("Failed to queue work: %d\n", ret); + ierr("ERROR: Failed to queue work: %d\n", ret); goto errout_with_priv; } diff --git a/configs/mikroe-stm32f4/src/stm32_usb.c b/configs/mikroe-stm32f4/src/stm32_usb.c index 2553d0d97d3..c8b819fea30 100644 --- a/configs/mikroe-stm32f4/src/stm32_usb.c +++ b/configs/mikroe-stm32f4/src/stm32_usb.c @@ -300,7 +300,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler) #ifdef CONFIG_USBDEV void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ullerr("resume: %d\n", resume); + ullinfo("resume: %d\n", resume); } #endif diff --git a/configs/mikroe-stm32f4/src/stm32_vs1053.c b/configs/mikroe-stm32f4/src/stm32_vs1053.c index e45ebfad7c8..98b8aeddcc3 100644 --- a/configs/mikroe-stm32f4/src/stm32_vs1053.c +++ b/configs/mikroe-stm32f4/src/stm32_vs1053.c @@ -187,7 +187,7 @@ void up_vs1053initialize(FAR struct spi_dev_s* spi) pVs1053 = vs1053_initialize(spi, &g_vs1053lower.lower, VS1053_DEVNO); if (pVs1053 == NULL) { - audllerr("Failed to bind SPI port %d VS1053 device\n", VS1053_DEVNO); + audllerr("ERROR: Failed to bind SPI port %d VS1053 device\n", VS1053_DEVNO); return; } @@ -197,7 +197,7 @@ void up_vs1053initialize(FAR struct spi_dev_s* spi) ret = audio_register(name, pVs1053); if (ret < 0) { - auderr("up_vs1053initialize: Failed to register VS1053 Audio device\n"); + auderr("ERROR: Failed to register VS1053 Audio device\n"); } audllinfo("Bound SPI port to VS1053 device %s\n", name); diff --git a/configs/mirtoo/src/pic32_spi2.c b/configs/mirtoo/src/pic32_spi2.c index 0a857e97353..a81488facd0 100644 --- a/configs/mirtoo/src/pic32_spi2.c +++ b/configs/mirtoo/src/pic32_spi2.c @@ -99,16 +99,14 @@ #ifdef CONFIG_DEBUG_SPI # define spierr llerr +# define spiwarn llwarn # define spiinfo llinfo #else # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ @@ -175,7 +173,7 @@ enum spi_dev_e; void pic32mx_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); + spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); if (devid == SPIDEV_FLASH) { diff --git a/configs/ntosd-dm320/src/dm320_network.c b/configs/ntosd-dm320/src/dm320_network.c index a08f4a4e3f7..fc8e1592d94 100644 --- a/configs/ntosd-dm320/src/dm320_network.c +++ b/configs/ntosd-dm320/src/dm320_network.c @@ -79,8 +79,8 @@ void up_netinitialize(void) * width is 16-bits. */ - nllerr("CS4CTRL1=%04x CS4CTRL2=%04x\n", - getreg16(DM320_EMIF_CS4CTRL1), getreg16(DM320_EMIF_CS4CTRL2)); + nllinfo("CS4CTRL1=%04x CS4CTRL2=%04x\n", + getreg16(DM320_EMIF_CS4CTRL1), getreg16(DM320_EMIF_CS4CTRL2)); /* It is assumed that bootloader has already configured CS4. Here, * we will only make certain that the GIO is properly configured @@ -91,9 +91,9 @@ void up_netinitialize(void) GIO_INTERRUPT(GIO_DM9000A_INT); GIO_RISINGEDGE(GIO_DM9000A_INT); - nllerr("GIO DIR0=%04x INV0=%04x IRQPORT=%04x IRQEDGE=%04x\n", - getreg16(DM320_GIO_DIR0), getreg16(DM320_GIO_INV0), - getreg16(DM320_GIO_IRQPORT), getreg16(DM320_GIO_IRQEDGE)); + nllinfo("GIO DIR0=%04x INV0=%04x IRQPORT=%04x IRQEDGE=%04x\n", + getreg16(DM320_GIO_DIR0), getreg16(DM320_GIO_INV0), + getreg16(DM320_GIO_IRQPORT), getreg16(DM320_GIO_IRQEDGE)); /* Then initialize the driver */