diff --git a/configs/stm3210e-eval/src/stm32_adc.c b/configs/stm3210e-eval/src/stm32_adc.c index 38a55145cbf..a0c5b87fa36 100644 --- a/configs/stm3210e-eval/src/stm32_adc.c +++ b/configs/stm3210e-eval/src/stm32_adc.c @@ -145,7 +145,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/stm3210e-eval/src/stm32_idle.c b/configs/stm3210e-eval/src/stm32_idle.c index 24bdfde3d11..cbe7e9f812a 100644 --- a/configs/stm3210e-eval/src/stm32_idle.c +++ b/configs/stm3210e-eval/src/stm32_idle.c @@ -229,7 +229,7 @@ static int stm32_rtc_alarm(time_t tv_sec, time_t tv_nsec, bool exti) ret = stm32_rtc_setalarm(&alarmtime, stm32_alarmcb); if (ret < 0) { - llerr("Warning: The alarm is already set\n"); + sllerr("ERROR: Warning: The alarm is already set\n"); } return ret; @@ -366,7 +366,7 @@ static void stm32_idlepm(void) ret = stm32_rtc_cancelalarm(); if (ret < 0) { - llerr("Warning: Cancel alarm failed\n"); + sllwarn("WARNING: Cancel alarm failed\n"); } #endif /* Note: See the additional PM_STANDBY related logic at the diff --git a/configs/stm3210e-eval/src/stm32_lcd.c b/configs/stm3210e-eval/src/stm32_lcd.c index 302a8c25a4f..f4893cb5125 100644 --- a/configs/stm3210e-eval/src/stm32_lcd.c +++ b/configs/stm3210e-eval/src/stm32_lcd.c @@ -36,6 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. * **************************************************************************************/ + /* This driver supports the following LCDs: * * 1. Ampire AM-240320LTNQW00H @@ -81,6 +82,7 @@ /************************************************************************************** * Pre-processor Definitions **************************************************************************************/ + /* Configuration **********************************************************************/ /* Check contrast selection */ @@ -312,9 +314,13 @@ /* Debug ******************************************************************************/ #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 /************************************************************************************** @@ -742,7 +748,7 @@ static int stm3210e_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *bu /* Buffer must be provided and aligned to a 16-bit address boundary */ - lcderr("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0); /* Write the run to GRAM. */ @@ -835,7 +841,7 @@ static int stm3210e_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, /* Buffer must be provided and aligned to a 16-bit address boundary */ - lcderr("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0); /* Configure according to the LCD type */ @@ -1321,7 +1327,7 @@ static inline void stm3210e_lcdinitialize(void) */ id = stm3210e_readreg(LCD_REG_0); - lcderr("LCD ID: %04x\n", id); + lcdinfo("LCD ID: %04x\n", id); /* Check if the ID is for the SPFD5408B */ @@ -1331,7 +1337,7 @@ static inline void stm3210e_lcdinitialize(void) /* Set the LCD type for the SPFD5408B */ g_lcddev.type = LCD_TYPE_SPFD5408B; - lcderr("LCD type: %d\n", g_lcddev.type); + lcdinfo("LCD type: %d\n", g_lcddev.type); /* Start Initial Sequence */ @@ -1436,7 +1442,7 @@ static inline void stm3210e_lcdinitialize(void) /* Set the LCD type for the R61580 */ g_lcddev.type = LCD_TYPE_R61580; - lcderr("LCD type: %d\n", g_lcddev.type); + lcdinfo("LCD type: %d\n", g_lcddev.type); /* Start Initial Sequence */ @@ -1506,7 +1512,7 @@ static inline void stm3210e_lcdinitialize(void) /* Set the LCD type for the AM240320 */ g_lcddev.type = LCD_TYPE_AM240320; - lcderr("LCD type: %d\n", g_lcddev.type); + lcdinfo("LCD type: %d\n", g_lcddev.type); /* Start Initial Sequence */ @@ -1595,7 +1601,7 @@ static inline void stm3210e_lcdinitialize(void) stm3210e_writereg(LCD_REG_3, 0x1018); stm3210e_writereg(LCD_REG_7, 0); /* Display off */ #else - lcderr("Unsupported LCD type\n"); + lcderr("ERROR: Unsupported LCD type\n"); #endif } } @@ -1743,25 +1749,25 @@ static void stm3210e_backlight(void) /* Dump timer1 registers */ - lcderr("APB2ENR: %08x\n", getreg32(STM32_RCC_APB2ENR)); - lcderr("CR1: %04x\n", getreg32(STM32_TIM1_CR1)); - lcderr("CR2: %04x\n", getreg32(STM32_TIM1_CR2)); - lcderr("SMCR: %04x\n", getreg32(STM32_TIM1_SMCR)); - lcderr("DIER: %04x\n", getreg32(STM32_TIM1_DIER)); - lcderr("SR: %04x\n", getreg32(STM32_TIM1_SR)); - lcderr("BDTR: %04x\n", getreg32(STM32_TIM1_BDTR)); - lcderr("CCMR1: %04x\n", getreg32(STM32_TIM1_CCMR1)); - lcderr("CCMR2: %04x\n", getreg32(STM32_TIM1_CCMR2)); - lcderr("CCER: %04x\n", getreg32(STM32_TIM1_CCER)); - lcderr("CNT: %04x\n", getreg32(STM32_TIM1_CNT)); - lcderr("PSC: %04x\n", getreg32(STM32_TIM1_PSC)); - lcderr("ARR: %04x\n", getreg32(STM32_TIM1_ARR)); - lcderr("RCR: %04x\n", getreg32(STM32_TIM1_RCR)); - lcderr("CCR1: %04x\n", getreg32(STM32_TIM1_CCR1)); - lcderr("CCR2: %04x\n", getreg32(STM32_TIM1_CCR2)); - lcderr("CCR3: %04x\n", getreg32(STM32_TIM1_CCR3)); - lcderr("CCR4: %04x\n", getreg32(STM32_TIM1_CCR4)); - lcderr("DMAR: %04x\n", getreg32(STM32_TIM1_DMAR)); + lcdinfo("APB2ENR: %08x\n", getreg32(STM32_RCC_APB2ENR)); + lcdinfo("CR1: %04x\n", getreg32(STM32_TIM1_CR1)); + lcdinfo("CR2: %04x\n", getreg32(STM32_TIM1_CR2)); + lcdinfo("SMCR: %04x\n", getreg32(STM32_TIM1_SMCR)); + lcdinfo("DIER: %04x\n", getreg32(STM32_TIM1_DIER)); + lcdinfo("SR: %04x\n", getreg32(STM32_TIM1_SR)); + lcdinfo("BDTR: %04x\n", getreg32(STM32_TIM1_BDTR)); + lcdinfo("CCMR1: %04x\n", getreg32(STM32_TIM1_CCMR1)); + lcdinfo("CCMR2: %04x\n", getreg32(STM32_TIM1_CCMR2)); + lcdinfo("CCER: %04x\n", getreg32(STM32_TIM1_CCER)); + lcdinfo("CNT: %04x\n", getreg32(STM32_TIM1_CNT)); + lcdinfo("PSC: %04x\n", getreg32(STM32_TIM1_PSC)); + lcdinfo("ARR: %04x\n", getreg32(STM32_TIM1_ARR)); + lcdinfo("RCR: %04x\n", getreg32(STM32_TIM1_RCR)); + lcdinfo("CCR1: %04x\n", getreg32(STM32_TIM1_CCR1)); + lcdinfo("CCR2: %04x\n", getreg32(STM32_TIM1_CCR2)); + lcdinfo("CCR3: %04x\n", getreg32(STM32_TIM1_CCR3)); + lcdinfo("CCR4: %04x\n", getreg32(STM32_TIM1_CCR4)); + lcdinfo("DMAR: %04x\n", getreg32(STM32_TIM1_DMAR)); #endif } #endif @@ -1793,9 +1799,9 @@ int board_lcd_initialize(void) #ifdef CONFIG_PM ret = pm_register(&g_lcdcb); if (ret != OK) - { - lcderr("ERROR: pm_register failed: %d\n", ret); - } + { + lcderr("ERROR: pm_register failed: %d\n", ret); + } #endif /* Configure GPIO pins and configure the FSMC to support the LCD */ diff --git a/configs/stm3210e-eval/src/stm32_spi.c b/configs/stm3210e-eval/src/stm32_spi.c index 623363ca7c4..be83e9618f5 100644 --- a/configs/stm3210e-eval/src/stm32_spi.c +++ b/configs/stm3210e-eval/src/stm32_spi.c @@ -59,26 +59,16 @@ /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ -#undef SPI_DEBUG /* Define to enable debug */ -#undef SPI_VERBOSE /* Define to enable verbose debug */ - -#ifdef SPI_DEBUG +#ifdef CONFIG_DEBUG_SPI # define spierr llerr -# ifdef SPI_VERBOSE -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spiwarn llwarn +# define spiinfo llinfo #else -# undef SPI_VERBOSE # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ @@ -134,7 +124,7 @@ void weak_function stm32_spidev_initialize(void) #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"); if (devid == SPIDEV_FLASH) { @@ -153,7 +143,7 @@ uint8_t stm32_spi1status(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) @@ -165,7 +155,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_STM32_SPI3 void stm32_spi3select(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_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) diff --git a/configs/stm3210e-eval/src/stm32_usbdev.c b/configs/stm3210e-eval/src/stm32_usbdev.c index 58676d1dca2..143c938af15 100644 --- a/configs/stm3210e-eval/src/stm32_usbdev.c +++ b/configs/stm3210e-eval/src/stm32_usbdev.c @@ -110,6 +110,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/stm3220g-eval/src/stm32_adc.c b/configs/stm3220g-eval/src/stm32_adc.c index 2d9041c6ec5..9db71d0bd06 100644 --- a/configs/stm3220g-eval/src/stm32_adc.c +++ b/configs/stm3220g-eval/src/stm32_adc.c @@ -149,7 +149,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/stm3220g-eval/src/stm32_lcd.c b/configs/stm3220g-eval/src/stm32_lcd.c index b7f4b1ec4d3..704433da76d 100644 --- a/configs/stm3220g-eval/src/stm32_lcd.c +++ b/configs/stm3220g-eval/src/stm32_lcd.c @@ -33,6 +33,7 @@ * POSSIBILITY OF SUCH DAMAGE. * **************************************************************************************/ + /* This driver supports the following LCDs on the STM324xG_EVAL board: * * AM-240320L8TNQW00H (LCD_ILI9320 or LCD_ILI9321) OR @@ -266,9 +267,11 @@ #ifdef CONFIG_DEBUG_LCD # define lcderr err +# define lcdwarn warn # define lcdinfo info #else # define lcderr(x...) +# define lcdwarn(x...) # define lcdinfo(x...) #endif @@ -967,7 +970,7 @@ static inline void stm3220g_lcdinitialize(void) /* Check LCD ID */ id = stm3220g_readreg(LCD_REG_0); - lcderr("LCD ID: %04x\n", id); + lcdinfo("LCD ID: %04x\n", id); /* Check if the ID is for the STM32_ILI9320 (or ILI9321) or STM32_ILI9325 */ @@ -996,7 +999,7 @@ static inline void stm3220g_lcdinitialize(void) #else /* if !defined(CONFIG_STM32_ILI9325_DISABLE) */ g_lcddev.type = LCD_TYPE_ILI9325; #endif - lcderr("LCD type: %d\n", g_lcddev.type); + lcdinfo("LCD type: %d\n", g_lcddev.type); /* Start Initial Sequence */ @@ -1114,7 +1117,7 @@ static inline void stm3220g_lcdinitialize(void) } else { - lcderr("Unsupported LCD type\n"); + lcderr("ERROR: Unsupported LCD type\n"); } } diff --git a/configs/stm3220g-eval/src/stm32_pwm.c b/configs/stm3220g-eval/src/stm32_pwm.c index c5c26352e05..b934120856c 100644 --- a/configs/stm3220g-eval/src/stm32_pwm.c +++ b/configs/stm3220g-eval/src/stm32_pwm.c @@ -97,7 +97,7 @@ int board_pwm_setup(void) pwm = stm32_pwminitialize(STM3220G_EVAL_PWMTIMER); if (!pwm) { - err("Failed to get the STM32 PWM lower half\n"); + aerr("ERROR: Failed to get the STM32 PWM lower half\n"); return -ENODEV; } @@ -106,7 +106,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/stm3220g-eval/src/stm32_spi.c b/configs/stm3220g-eval/src/stm32_spi.c index 8cb939c519b..030283e6837 100644 --- a/configs/stm3220g-eval/src/stm32_spi.c +++ b/configs/stm3220g-eval/src/stm32_spi.c @@ -59,26 +59,16 @@ /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ -#undef SPI_DEBUG /* Define to enable debug */ -#undef SPI_VERBOSE /* Define to enable verbose debug */ - -#ifdef SPI_DEBUG +#ifdef CONFIG_DEBUG_SPI # define spierr llerr -# ifdef SPI_VERBOSE -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spiwarn llwarn +# define spiinfo llinfo #else -# undef SPI_VERBOSE # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ @@ -124,7 +114,7 @@ void weak_function stm32_spidev_initialize(void) #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) @@ -136,7 +126,7 @@ uint8_t stm32_spi1status(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) @@ -148,7 +138,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_STM32_SPI3 void stm32_spi3select(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_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) diff --git a/configs/stm3220g-eval/src/stm32_stmpe811.c b/configs/stm3220g-eval/src/stm32_stmpe811.c index 03d5cff876c..5748600e957 100644 --- a/configs/stm3220g-eval/src/stm32_stmpe811.c +++ b/configs/stm3220g-eval/src/stm32_stmpe811.c @@ -279,7 +279,7 @@ int board_tsc_setup(int minor) FAR struct i2c_master_s *dev; int ret; - ierr("minor %d\n", minor); + iinfo("minor %d\n", minor); DEBUGASSERT(minor == 0); /* Check if we are already initialized */ @@ -297,7 +297,7 @@ int board_tsc_setup(int minor) dev = stm32_i2cbus_initialize(CONFIG_STMPE811_I2CDEV); if (!dev) { - ierr("Failed to initialize I2C bus %d\n", CONFIG_STMPE811_I2CDEV); + ierr("ERROR: Failed to initialize I2C bus %d\n", CONFIG_STMPE811_I2CDEV); return -ENODEV; } @@ -307,7 +307,7 @@ int board_tsc_setup(int minor) stmpe811_instantiate(dev, (FAR struct stmpe811_config_s *)&g_stmpe811config); if (!g_stmpe811config.handle) { - ierr("Failed to instantiate the STMPE811 driver\n"); + ierr("ERROR: Failed to instantiate the STMPE811 driver\n"); return -ENODEV; } @@ -316,7 +316,7 @@ int board_tsc_setup(int minor) ret = stmpe811_register(g_stmpe811config.handle, CONFIG_STMPE811_DEVMINOR); if (ret < 0) { - ierr("Failed to register STMPE driver: %d\n", ret); + ierr("ERROR: Failed to register STMPE driver: %d\n", ret); /* stm32_i2cbus_uninitialize(dev); */ return -ENODEV; } diff --git a/configs/stm3220g-eval/src/stm32_usb.c b/configs/stm3220g-eval/src/stm32_usb.c index 1fc1fdf74a1..36b48c2c70c 100644 --- a/configs/stm3220g-eval/src/stm32_usb.c +++ b/configs/stm3220g-eval/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/stm3240g-eval/src/stm32_adc.c b/configs/stm3240g-eval/src/stm32_adc.c index 8ca5ae99b07..1d787970433 100644 --- a/configs/stm3240g-eval/src/stm32_adc.c +++ b/configs/stm3240g-eval/src/stm32_adc.c @@ -149,7 +149,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/stm3240g-eval/src/stm32_lcd.c b/configs/stm3240g-eval/src/stm32_lcd.c index 676bb777e82..71c06380c9a 100644 --- a/configs/stm3240g-eval/src/stm32_lcd.c +++ b/configs/stm3240g-eval/src/stm32_lcd.c @@ -33,6 +33,7 @@ * POSSIBILITY OF SUCH DAMAGE. * **************************************************************************************/ + /* This driver supports the following LCDs on the STM324xG_EVAL board: * * AM-240320L8TNQW00H (LCD_ILI9320 or LCD_ILI9321) OR @@ -266,9 +267,11 @@ #ifdef CONFIG_DEBUG_LCD # define lcderr err +# define lcdwarn warn # define lcdinfo info #else # define lcderr(x...) +# define lcdwarn(x...) # define lcdinfo(x...) #endif @@ -966,7 +969,7 @@ static inline void stm3240g_lcdinitialize(void) /* Check LCD ID */ id = stm3240g_readreg(LCD_REG_0); - lcderr("LCD ID: %04x\n", id); + lcdinfo("LCD ID: %04x\n", id); /* Check if the ID is for the STM32_ILI9320 (or ILI9321) or STM32_ILI9325 */ @@ -995,7 +998,7 @@ static inline void stm3240g_lcdinitialize(void) #else /* if !defined(CONFIG_STM3240G_ILI9325_DISABLE) */ g_lcddev.type = LCD_TYPE_ILI9325; #endif - lcderr("LCD type: %d\n", g_lcddev.type); + lcdinfo("LCD type: %d\n", g_lcddev.type); /* Start Initial Sequence */ @@ -1113,7 +1116,7 @@ static inline void stm3240g_lcdinitialize(void) } else { - lcderr("Unsupported LCD type\n"); + lcderr("ERROR: Unsupported LCD type\n"); } } diff --git a/configs/stm3240g-eval/src/stm32_pwm.c b/configs/stm3240g-eval/src/stm32_pwm.c index bc3054e477e..4ccf6dad9c4 100644 --- a/configs/stm3240g-eval/src/stm32_pwm.c +++ b/configs/stm3240g-eval/src/stm32_pwm.c @@ -97,7 +97,7 @@ int board_pwm_setup(void) pwm = stm32_pwminitialize(STM3240G_EVAL_PWMTIMER); if (!pwm) { - err("Failed to get the STM32 PWM lower half\n"); + aerr("ERROR: Failed to get the STM32 PWM lower half\n"); return -ENODEV; } @@ -106,7 +106,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/stm3240g-eval/src/stm32_spi.c b/configs/stm3240g-eval/src/stm32_spi.c index a89daa6521f..6db6401c85b 100644 --- a/configs/stm3240g-eval/src/stm32_spi.c +++ b/configs/stm3240g-eval/src/stm32_spi.c @@ -59,26 +59,16 @@ /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ -#undef SPI_DEBUG /* Define to enable debug */ -#undef SPI_VERBOSE /* Define to enable verbose debug */ - -#ifdef SPI_DEBUG +#ifdef CONFIG_DEBUG_SPI # define spierr llerr -# ifdef SPI_VERBOSE -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spiwarn llwarn +# define spiinfo llinfo #else -# undef SPI_VERBOSE # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ @@ -124,7 +114,7 @@ void weak_function stm32_spidev_initialize(void) #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) @@ -136,7 +126,7 @@ uint8_t stm32_spi1status(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) @@ -148,7 +138,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_STM32_SPI3 void stm32_spi3select(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_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) diff --git a/configs/stm3240g-eval/src/stm32_stmpe811.c b/configs/stm3240g-eval/src/stm32_stmpe811.c index 77b9ffadf39..0bb25376fa3 100644 --- a/configs/stm3240g-eval/src/stm32_stmpe811.c +++ b/configs/stm3240g-eval/src/stm32_stmpe811.c @@ -279,7 +279,7 @@ int board_tsc_setup(int minor) FAR struct i2c_master_s *dev; int ret; - ierr("minor %d\n", minor); + iinfo("minor %d\n", minor); DEBUGASSERT(minor == 0); /* Check if we are already initialized */ @@ -297,7 +297,7 @@ int board_tsc_setup(int minor) dev = stm32_i2cbus_initialize(CONFIG_STMPE811_I2CDEV); if (!dev) { - ierr("Failed to initialize I2C bus %d\n", CONFIG_STMPE811_I2CDEV); + ierr("ERROR: Failed to initialize I2C bus %d\n", CONFIG_STMPE811_I2CDEV); return -ENODEV; } @@ -307,7 +307,7 @@ int board_tsc_setup(int minor) stmpe811_instantiate(dev, (FAR struct stmpe811_config_s *)&g_stmpe811config); if (!g_stmpe811config.handle) { - ierr("Failed to instantiate the STMPE811 driver\n"); + ierr("ERROR: Failed to instantiate the STMPE811 driver\n"); return -ENODEV; } @@ -316,7 +316,7 @@ int board_tsc_setup(int minor) ret = stmpe811_register(g_stmpe811config.handle, CONFIG_STMPE811_DEVMINOR); if (ret < 0) { - ierr("Failed to register STMPE driver: %d\n", ret); + ierr("ERROR: Failed to register STMPE driver: %d\n", ret); /* stm32_i2cbus_uninitialize(dev); */ return -ENODEV; } diff --git a/configs/stm3240g-eval/src/stm32_usb.c b/configs/stm3240g-eval/src/stm32_usb.c index 48f2f392b9b..e289ad19e86 100644 --- a/configs/stm3240g-eval/src/stm32_usb.c +++ b/configs/stm3240g-eval/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/stm32_tiny/src/stm32_pwm.c b/configs/stm32_tiny/src/stm32_pwm.c index 46bddca1850..8efec614b60 100644 --- a/configs/stm32_tiny/src/stm32_pwm.c +++ b/configs/stm32_tiny/src/stm32_pwm.c @@ -95,7 +95,7 @@ int board_pwm_setup(void) pwm = stm32_pwminitialize(STM32TINY_PWMTIMER); if (!pwm) { - aerr("Failed to get the STM32 PWM lower half\n"); + aerr("ERROR: Failed to get the STM32 PWM lower half\n"); return -ENODEV; } @@ -104,7 +104,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/stm32_tiny/src/stm32_usbdev.c b/configs/stm32_tiny/src/stm32_usbdev.c index d27594b65ab..5331dd7fffa 100644 --- a/configs/stm32_tiny/src/stm32_usbdev.c +++ b/configs/stm32_tiny/src/stm32_usbdev.c @@ -74,7 +74,7 @@ void stm32_usbinitialize(void) { - ullerr("called\n"); + ullinfo("called\n"); /* USB Soft Connect Pullup */ stm32_configgpio(GPIO_USB_PULLUP); @@ -112,6 +112,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/stm32_tiny/src/stm32_wireless.c b/configs/stm32_tiny/src/stm32_wireless.c index 842cb51c594..e13bf24c977 100644 --- a/configs/stm32_tiny/src/stm32_wireless.c +++ b/configs/stm32_tiny/src/stm32_wireless.c @@ -114,14 +114,14 @@ void stm32_wlinitialize(void) spidev = stm32_spibus_initialize(2); if (!spidev) { - err("Failed to initialize SPI bus\n"); + err("ERROR: Failed to initialize SPI bus\n"); return; } result = nrf24l01_register(spidev, &nrf_cfg); if (result != OK) { - err("Failed to register initialize SPI bus\n"); + err("ERROR: Failed to register initialize SPI bus\n"); return; } } diff --git a/configs/stm32f103-minimum/src/stm32_usbdev.c b/configs/stm32f103-minimum/src/stm32_usbdev.c index 092196cd32d..753d292dcd8 100644 --- a/configs/stm32f103-minimum/src/stm32_usbdev.c +++ b/configs/stm32f103-minimum/src/stm32_usbdev.c @@ -103,5 +103,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/stm32f3discovery/src/stm32_pwm.c b/configs/stm32f3discovery/src/stm32_pwm.c index bb419cb6b8c..1cdfb8c9c40 100644 --- a/configs/stm32f3discovery/src/stm32_pwm.c +++ b/configs/stm32f3discovery/src/stm32_pwm.c @@ -119,7 +119,7 @@ int board_pwm_setup(void) pwm = stm32_pwminitialize(STM32F3DISCOVERY_PWMTIMER); if (!pwm) { - err("Failed to get the STM32 PWM lower half\n"); + aerr("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/stm32f3discovery/src/stm32_qencoder.c b/configs/stm32f3discovery/src/stm32_qencoder.c index 45d7f274c43..d4fa6051cc5 100644 --- a/configs/stm32f3discovery/src/stm32_qencoder.c +++ b/configs/stm32f3discovery/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/stm32f3discovery/src/stm32_spi.c b/configs/stm32f3discovery/src/stm32_spi.c index cd082fc9966..0397692abab 100644 --- a/configs/stm32f3discovery/src/stm32_spi.c +++ b/configs/stm32f3discovery/src/stm32_spi.c @@ -60,26 +60,16 @@ /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ -#undef SPI_DEBUG /* Define to enable debug */ -#undef SPI_VERBOSE /* Define to enable verbose debug */ - -#ifdef SPI_DEBUG +#ifdef CONFIG_DEBUG_SPI # define spierr llerr -# ifdef SPI_VERBOSE -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spiwarn llwarn +# define spiinfo llinfo #else -# undef SPI_VERBOSE # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ @@ -129,7 +119,7 @@ void weak_function stm32_spidev_initialize(void) #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"); stm32_gpiowrite(GPIO_MEMS_CS, !selected); } @@ -143,7 +133,7 @@ uint8_t stm32_spi1status(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) @@ -155,7 +145,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_STM32_SPI3 void stm32_spi3select(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_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) diff --git a/configs/stm32f3discovery/src/stm32_usb.c b/configs/stm32f3discovery/src/stm32_usb.c index 7c071b91b9c..658e796c2be 100644 --- a/configs/stm32f3discovery/src/stm32_usb.c +++ b/configs/stm32f3discovery/src/stm32_usb.c @@ -121,10 +121,7 @@ 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); } #endif /* CONFIG_STM32_USB */ - - - diff --git a/configs/stm32f429i-disco/src/stm32_appinit.c b/configs/stm32f429i-disco/src/stm32_appinit.c index 4f2eca3b318..c7f1d4fb765 100644 --- a/configs/stm32f429i-disco/src/stm32_appinit.c +++ b/configs/stm32f429i-disco/src/stm32_appinit.c @@ -284,7 +284,7 @@ int board_app_initialize(uintptr_t arg) if (mtd_part == NULL) { - err("Error: failed to create partition %s\n", partname); + ferr("ERROR: failed to create partition %s\n", partname); return -1; } diff --git a/configs/stm32f429i-disco/src/stm32_idle.c b/configs/stm32f429i-disco/src/stm32_idle.c index c71eaa61f0d..bb23e39065a 100644 --- a/configs/stm32f429i-disco/src/stm32_idle.c +++ b/configs/stm32f429i-disco/src/stm32_idle.c @@ -125,7 +125,7 @@ static void stm32_idlepm(void) if (newstate != oldstate) { - llerr("newstate= %d oldstate=%d\n", newstate, oldstate); + sllinfo("newstate= %d oldstate=%d\n", newstate, oldstate); flags = enter_critical_section(); diff --git a/configs/stm32f429i-disco/src/stm32_ili93414ws.c b/configs/stm32f429i-disco/src/stm32_ili93414ws.c index c2cfffd44a9..a862efdef99 100644 --- a/configs/stm32f429i-disco/src/stm32_ili93414ws.c +++ b/configs/stm32f429i-disco/src/stm32_ili93414ws.c @@ -134,11 +134,13 @@ /* Debug option */ -#ifdef CONFIG_DEBUG_LCD -# define lcderr err -# define lcdinfo info +#ifdef CONFIG_DEBUG_SPI +# define lcderr err +# define lcdwarn warn +# define lcdinfo info #else # define lcderr(x...) +# define lcdwarn(x...) # define lcdinfo(x...) #endif @@ -503,7 +505,6 @@ static int stm32_ili93414ws_sendblock(FAR struct ili93414ws_lcd_s *lcd, return OK; } - /**************************************************************************** * Name: stm32_ili93414ws_recvword * @@ -587,7 +588,7 @@ static uint16_t stm32_ili93414ws_recvword(void) } } - err("Timeout during receiving pixel word\n"); + lcdinfo("Timeout during receiving pixel word\n"); return 0; } @@ -1174,7 +1175,7 @@ FAR struct ili9341_lcd_s *stm32_ili93414ws_initialize(void) FAR struct spi_dev_s *spi; FAR struct ili93414ws_lcd_s *priv = &g_lcddev; - lcderr("initialize ili9341 4-wire serial subdriver\n"); + lcdinfo("initialize ili9341 4-wire serial subdriver\n"); lcdinfo("initialize spi device: %d\n", ILI93414WS_SPI_DEVICE); spi = stm32_spi5initialize(); @@ -1206,7 +1207,7 @@ FAR struct ili9341_lcd_s *stm32_ili93414ws_initialize(void) uint32_t regval; FAR struct ili93414ws_lcd_s *priv = &g_lcddev; - lcderr("initialize ili9341 4-wire serial subdriver\n"); + lcdinfo("initialize ili9341 4-wire serial subdriver\n"); /* Enable spi bus */ diff --git a/configs/stm32f429i-disco/src/stm32_lcd.c b/configs/stm32f429i-disco/src/stm32_lcd.c index 0624b68809d..f674bfdebd7 100644 --- a/configs/stm32f429i-disco/src/stm32_lcd.c +++ b/configs/stm32f429i-disco/src/stm32_lcd.c @@ -57,6 +57,7 @@ /************************************************************************************ * Pre-processor Definitions ************************************************************************************/ + #ifdef CONFIG_STM32F429I_DISCO_ILI9341_LCDDEVICE # define ILI9341_LCD_DEVICE CONFIG_STM32F429I_DISCO_ILI9341_LCDDEVICE #else @@ -279,6 +280,18 @@ #define ILI9341_YRES BOARD_LTDC_HEIGHT #endif /* CONFIG_STM32F429I_DISCO_ILI9341_FBIFACE */ +/* 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 Data ************************************************************************************/ @@ -317,7 +330,7 @@ static int stm32_ili9341_initialize(void) /* Select spi device */ - err("Initialize ili9341 lcd driver\n"); + lcdinfo("Initialize ili9341 lcd driver\n"); lcd->select(lcd); #ifdef CONFIG_DEBUG_LCD @@ -325,36 +338,38 @@ static int stm32_ili9341_initialize(void) lcd->sendcmd(lcd, ILI9341_READ_ID1); lcd->recvparam(lcd, ¶m); - err("ili9341 LCD driver: LCD modules manufacturer ID: %d\n", param); + lcdinfo("ili9341 LCD driver: LCD modules manufacturer ID: %d\n", param); + lcd->sendcmd(lcd, ILI9341_READ_ID2); lcd->recvparam(lcd, ¶m); - err("ili9341 LCD driver: LCD modules driver version ID: %d\n", param); + lcdinfo("ili9341 LCD driver: LCD modules driver version ID: %d\n", param); + lcd->sendcmd(lcd, ILI9341_READ_ID3); lcd->recvparam(lcd, ¶m); - err("ili9341 LCD driver: LCD modules driver ID: %d\n", param); + lcdinfo("ili9341 LCD driver: LCD modules driver ID: %d\n", param); #endif /* Reset the lcd display to the default state */ - info("ili9341 LCD driver: Software Reset\n"); + lcdinfo("ili9341 LCD driver: Software Reset\n"); lcd->sendcmd(lcd, ILI9341_SOFTWARE_RESET); up_mdelay(5); - info("ili9341 LCD driver: set Memory Access Control %08x\n", + lcdinfo("ili9341 LCD driver: set Memory Access Control %08x\n", STM32_ILI9341_MADCTL_PARAM); lcd->sendcmd(lcd, ILI9341_MEMORY_ACCESS_CONTROL); lcd->sendparam(lcd, STM32_ILI9341_MADCTL_PARAM); /* Pixel Format */ - info("ili9341 LCD driver: Set Pixel Format: %02x\n", + lcdinfo("ili9341 LCD driver: Set Pixel Format: %02x\n", STM32_ILI9341_PIXSET_PARAM); lcd->sendcmd(lcd, ILI9341_PIXEL_FORMAT_SET); lcd->sendparam(lcd, STM32_ILI9341_PIXSET_PARAM); /* Select column */ - info("ili9341 LCD driver: Set Column Address\n"); + lcdinfo("ili9341 LCD driver: Set Column Address\n"); lcd->sendcmd(lcd, ILI9341_COLUMN_ADDRESS_SET); lcd->sendparam(lcd, 0); lcd->sendparam(lcd, 0); @@ -363,7 +378,7 @@ static int stm32_ili9341_initialize(void) /* Select page */ - info("ili9341 LCD driver: Set Page Address\n"); + lcdinfo("ili9341 LCD driver: Set Page Address\n"); lcd->sendcmd(lcd, ILI9341_PAGE_ADDRESS_SET); lcd->sendparam(lcd, 0); lcd->sendparam(lcd, 0); @@ -372,14 +387,14 @@ static int stm32_ili9341_initialize(void) /* RGB Interface signal control */ - info("ili9341 LCD driver: Set RGB Interface signal control: %02x\n", + lcdinfo("ili9341 LCD driver: Set RGB Interface signal control: %02x\n", STM32_ILI9341_IFMODE_PARAM); lcd->sendcmd(lcd, ILI9341_RGB_SIGNAL_CONTROL); lcd->sendparam(lcd, STM32_ILI9341_IFMODE_PARAM); /* Interface control */ - info("ili9341 LCD driver: Set Interface control: %d:%d:%d\n", + lcdinfo("ili9341 LCD driver: Set Interface control: %d:%d:%d\n", STM32_ILI9341_IFCTL_PARAM1, STM32_ILI9341_IFCTL_PARAM2, STM32_ILI9341_IFCTL_PARAM3); @@ -391,13 +406,13 @@ static int stm32_ili9341_initialize(void) /* Sleep out set to the end */ - info("ili9341 LCD driver: Sleep Out\n"); + lcdinfo("ili9341 LCD driver: Sleep Out\n"); lcd->sendcmd(lcd, ILI9341_SLEEP_OUT); up_mdelay(5); /* 120? */ /* Display on */ - info("ili9341 LCD driver: Display On\n"); + lcdinfo("ili9341 LCD driver: Display On\n"); lcd->sendcmd(lcd, ILI9341_DISPLAY_ON); /* Deselect spi device */ diff --git a/configs/stm32f429i-disco/src/stm32_spi.c b/configs/stm32f429i-disco/src/stm32_spi.c index 90cd6cab82a..b9538bcd60a 100644 --- a/configs/stm32f429i-disco/src/stm32_spi.c +++ b/configs/stm32f429i-disco/src/stm32_spi.c @@ -62,19 +62,13 @@ /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ -#undef SPI_DEBUG /* Define to enable debug */ -#undef SPI_VERBOSE /* Define to enable verbose debug */ - -#ifdef SPI_DEBUG +#ifdef CONFIG_DEBUG_SPI # define spierr llerr -# ifdef SPI_VERBOSE -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spiwarn llwarn +# define spiinfo llinfo #else -# undef SPI_VERBOSE # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif @@ -143,7 +137,7 @@ void weak_function stm32_spidev_initialize(void) #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) @@ -155,7 +149,7 @@ uint8_t stm32_spi1status(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) @@ -167,7 +161,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_STM32_SPI3 void stm32_spi3select(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_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) @@ -196,7 +190,7 @@ uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_STM32_SPI5 void stm32_spi5select(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_STM32F429I_DISCO_ILI9341) if (devid == SPIDEV_DISPLAY) diff --git a/configs/stm32f429i-disco/src/stm32_usb.c b/configs/stm32f429i-disco/src/stm32_usb.c index 428dffa81ca..6d6da4d9312 100644 --- a/configs/stm32f429i-disco/src/stm32_usb.c +++ b/configs/stm32f429i-disco/src/stm32_usb.c @@ -306,7 +306,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/stm32f4discovery/src/stm32_bh1750fvi.c b/configs/stm32f4discovery/src/stm32_bh1750fvi.c index a1ea035402d..be896409644 100644 --- a/configs/stm32f4discovery/src/stm32_bh1750fvi.c +++ b/configs/stm32f4discovery/src/stm32_bh1750fvi.c @@ -80,7 +80,7 @@ int stm32_bh1750initialize(FAR const char *devpath) FAR struct i2c_master_s *i2c; int ret; - snerr("Initializing BH1750FVI!\n"); + sninfo("Initializing BH1750FVI!\n"); /* Initialize I2C */ @@ -96,7 +96,7 @@ int stm32_bh1750initialize(FAR const char *devpath) ret = bh1750fvi_register(devpath, i2c, BH1750FVI_I2C_ADDR); if (ret < 0) { - snerr("Error registering BM180\n"); + snerr("ERROR: Error registering BM180\n"); } return ret; diff --git a/configs/stm32f4discovery/src/stm32_bmp180.c b/configs/stm32f4discovery/src/stm32_bmp180.c index 75f0a312759..bd90a808f77 100644 --- a/configs/stm32f4discovery/src/stm32_bmp180.c +++ b/configs/stm32f4discovery/src/stm32_bmp180.c @@ -80,7 +80,7 @@ int stm32_bmp180initialize(FAR const char *devpath) FAR struct i2c_master_s *i2c; int ret; - snerr("Initializing BMP180!\n"); + sninfo("Initializing BMP180!\n"); /* Initialize I2C */ @@ -96,7 +96,7 @@ int stm32_bmp180initialize(FAR const char *devpath) ret = bmp180_register(devpath, i2c); if (ret < 0) { - snerr("Error registering BM180\n"); + snerr("ERROR: Error registering BM180\n"); } return ret; diff --git a/configs/stm32f4discovery/src/stm32_ethernet.c b/configs/stm32f4discovery/src/stm32_ethernet.c index a29d538af2b..6ccd0b72711 100644 --- a/configs/stm32f4discovery/src/stm32_ethernet.c +++ b/configs/stm32f4discovery/src/stm32_ethernet.c @@ -105,7 +105,7 @@ static xcpt_t g_ethmac_handler; #ifdef HAVE_NETMONITOR static void stm32_emac0_phy_enable(bool enable) { - phyerr("enable=%d\n", enable); + phyinfo("enable=%d\n", enable); if (enable && g_ethmac_handler != NULL) { /* Attach and enable GPIO interrupt (and event) on the falling edge */ @@ -138,7 +138,7 @@ void weak_function stm32_netinitialize(void) #ifdef HAVE_NETMONITOR /* Configure the PHY interrupt GPIO */ - phyerr("Configuring %08x\n", GPIO_EMAC_NINT); + phyinfo("Configuring %08x\n", GPIO_EMAC_NINT); stm32_configgpio(GPIO_EMAC_NINT); #endif @@ -218,7 +218,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable) irqstate_t flags; ninfo("%s: handler=%p\n", intf, handler); - phyerr("ETHMAC: devname=%s\n", STM32_ETHMAC_DEVNAME); + phyinfo("ETHMAC: devname=%s\n", STM32_ETHMAC_DEVNAME); DEBUGASSERT(intf); @@ -227,13 +227,13 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable) if (strcmp(intf, STM32_ETHMAC_DEVNAME) == 0) { - phyerr("Select ETHMAC\n"); + phyinfo("Select ETHMAC\n"); g_ethmac_handler = handler; enabler = stm32_emac0_phy_enable; } else { - nerr("Unsupported interface: %s\n", intf); + nerr("ERROR: Unsupported interface: %s\n", intf); enabler = NULL; } diff --git a/configs/stm32f4discovery/src/stm32_idle.c b/configs/stm32f4discovery/src/stm32_idle.c index 6dc0f27b0b9..4fb9a0d0f72 100644 --- a/configs/stm32f4discovery/src/stm32_idle.c +++ b/configs/stm32f4discovery/src/stm32_idle.c @@ -122,7 +122,7 @@ static void stm32_idlepm(void) if (newstate != oldstate) { - llerr("newstate= %d oldstate=%d\n", newstate, oldstate); + sllinfo("newstate= %d oldstate=%d\n", newstate, oldstate); flags = enter_critical_section(); diff --git a/configs/stm32f4discovery/src/stm32_max31855.c b/configs/stm32f4discovery/src/stm32_max31855.c index 378b91fe099..8b4539fa5bc 100644 --- a/configs/stm32f4discovery/src/stm32_max31855.c +++ b/configs/stm32f4discovery/src/stm32_max31855.c @@ -92,7 +92,7 @@ int stm32_max31855initialize(FAR const char *devpath) ret = max31855_register(devpath, spi); if (ret < 0) { - snerr("Error registering MAX31855\n"); + snerr("ERROR: Error registering MAX31855\n"); } return ret; diff --git a/configs/stm32f4discovery/src/stm32_max6675.c b/configs/stm32f4discovery/src/stm32_max6675.c index 852abd5490c..1b298daf9fa 100644 --- a/configs/stm32f4discovery/src/stm32_max6675.c +++ b/configs/stm32f4discovery/src/stm32_max6675.c @@ -92,7 +92,7 @@ int stm32_max6675initialize(FAR const char *devpath) ret = max6675_register(devpath, spi); if (ret < 0) { - snerr("Error registering MAX6675\n"); + snerr("ERROR: Error registering MAX6675\n"); } return ret; diff --git a/configs/stm32f4discovery/src/stm32_pca9635.c b/configs/stm32f4discovery/src/stm32_pca9635.c index 71df0979456..739b43e16a3 100644 --- a/configs/stm32f4discovery/src/stm32_pca9635.c +++ b/configs/stm32f4discovery/src/stm32_pca9635.c @@ -93,7 +93,7 @@ int stm32_pca9635_initialize(void) ret = pca9635pw_register("/dev/leddrv0", i2c, PCA9635_I2CADDR); if (ret < 0) { - snerr("Failed to register PCA9635 driver: %d\n", ret); + snerr("ERROR: Failed to register PCA9635 driver: %d\n", ret); return ret; } diff --git a/configs/stm32f4discovery/src/stm32_pwm.c b/configs/stm32f4discovery/src/stm32_pwm.c index 16f4bfdbba2..9e80b06c7ea 100644 --- a/configs/stm32f4discovery/src/stm32_pwm.c +++ b/configs/stm32f4discovery/src/stm32_pwm.c @@ -117,7 +117,7 @@ int board_pwm_setup(void) pwm = stm32_pwminitialize(STM32F4DISCOVERY_PWMTIMER); if (!pwm) { - aerr("Failed to get the STM32 PWM lower half\n"); + aerr("ERROR: Failed to get the STM32 PWM lower half\n"); return -ENODEV; } @@ -126,7 +126,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/stm32f4discovery/src/stm32_qencoder.c b/configs/stm32f4discovery/src/stm32_qencoder.c index a5b2b23c654..5d0ae6460af 100644 --- a/configs/stm32f4discovery/src/stm32_qencoder.c +++ b/configs/stm32f4discovery/src/stm32_qencoder.c @@ -117,10 +117,6 @@ #ifdef HAVE_QENCODER -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ @@ -149,7 +145,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/stm32f4discovery/src/stm32_rgbled.c b/configs/stm32f4discovery/src/stm32_rgbled.c index 714844e8f41..614fb9b57e2 100644 --- a/configs/stm32f4discovery/src/stm32_rgbled.c +++ b/configs/stm32f4discovery/src/stm32_rgbled.c @@ -86,6 +86,16 @@ # undef HAVE_RGBLED #endif +#ifdef CONFIG_DEBUG_LCD +# define lcderr llerr +# define lcdwarn llwarn +# define lcdinfo llinfo +#else +# define lcderr(x...) +# define lcdwarn(x...) +# define lcdinfo(x...) +#endif + #ifdef HAVE_RGBLED /************************************************************************************ @@ -119,7 +129,7 @@ int stm32_rgbled_setup(void) ledr = stm32_pwminitialize(1); if (!ledr) { - err("Failed to get the STM32 PWM lower half to LEDR\n"); + lcderr("ERROR: Failed to get the STM32 PWM lower half to LEDR\n"); return -ENODEV; } @@ -138,7 +148,7 @@ int stm32_rgbled_setup(void) ledg = stm32_pwminitialize(2); if (!ledg) { - err("Failed to get the STM32 PWM lower half to LEDG\n"); + lcderr("ERROR: Failed to get the STM32 PWM lower half to LEDG\n"); return -ENODEV; } @@ -152,7 +162,7 @@ int stm32_rgbled_setup(void) ledb = stm32_pwminitialize(3); if (!ledb) { - err("Failed to get the STM32 PWM lower half to LEDB\n"); + lcderr("ERROR: Failed to get the STM32 PWM lower half to LEDB\n"); return -ENODEV; } @@ -166,7 +176,7 @@ int stm32_rgbled_setup(void) ret = rgbled_register("/dev/rgbled0", ledr, ledg, ledb); if (ret < 0) { - err("rgbled_register failed: %d\n", ret); + lcderr("ERROR: rgbled_register failed: %d\n", ret); return ret; } diff --git a/configs/stm32f4discovery/src/stm32_sdio.c b/configs/stm32f4discovery/src/stm32_sdio.c index 79b7412c882..a82a38d3488 100644 --- a/configs/stm32f4discovery/src/stm32_sdio.c +++ b/configs/stm32f4discovery/src/stm32_sdio.c @@ -139,7 +139,7 @@ int stm32_sdio_initialize(void) g_sdio_dev = sdio_initialize(SDIO_SLOTNO); if (!g_sdio_dev) { - ferr("Failed to initialize SDIO slot %d\n", SDIO_SLOTNO); + ferr("ERROR: Failed to initialize SDIO slot %d\n", SDIO_SLOTNO); return -ENODEV; } @@ -150,7 +150,7 @@ int stm32_sdio_initialize(void) ret = mmcsd_slotinitialize(SDIO_MINOR, g_sdio_dev); if (ret != OK) { - ferr("Failed to bind SDIO to the MMC/SD driver: %d\n", ret); + ferr("ERROR: Failed to bind SDIO to the MMC/SD driver: %d\n", ret); return ret; } diff --git a/configs/stm32f4discovery/src/stm32_spi.c b/configs/stm32f4discovery/src/stm32_spi.c index 45441059bd2..9ff8a256d1e 100644 --- a/configs/stm32f4discovery/src/stm32_spi.c +++ b/configs/stm32f4discovery/src/stm32_spi.c @@ -61,26 +61,16 @@ /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ -#undef SPI_DEBUG /* Define to enable debug */ -#undef SPI_VERBOSE /* Define to enable verbose debug */ - -#ifdef SPI_DEBUG +#ifdef CONFIG_DEBUG_SPI # define spierr llerr -# ifdef SPI_VERBOSE -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spiwarn llwarn +# define spiinfo llinfo #else -# undef SPI_VERBOSE # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ @@ -144,7 +134,7 @@ void weak_function stm32_spidev_initialize(void) #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"); #if defined(CONFIG_LCD_UG2864AMBAG01) || defined(CONFIG_LCD_UG2864HSWEG01) || \ defined(CONFIG_LCD_SSD1351) @@ -168,7 +158,7 @@ uint8_t stm32_spi1status(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"); #if defined(CONFIG_MAX31855) if (devid == SPIDEV_TEMPERATURE) @@ -193,7 +183,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_STM32_SPI3 void stm32_spi3select(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_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) diff --git a/configs/stm32f4discovery/src/stm32_ssd1351.c b/configs/stm32f4discovery/src/stm32_ssd1351.c index 261ee51c73d..c7996ff08bf 100644 --- a/configs/stm32f4discovery/src/stm32_ssd1351.c +++ b/configs/stm32f4discovery/src/stm32_ssd1351.c @@ -75,9 +75,11 @@ #ifdef CONFIG_DEBUG_LCD # 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 @@ -114,7 +116,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) spi = stm32_spibus_initialize(1); if (spi == NULL) { - lcderr("Failed to initialize SPI port 1\n"); + lcderr("ERROR: Failed to initialize SPI port 1\n"); } else { @@ -123,7 +125,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) dev = ssd1351_initialize(spi, devno); if (dev == NULL) { - lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno); + lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno); } else { diff --git a/configs/stm32f4discovery/src/stm32_ug2864ambag01.c b/configs/stm32f4discovery/src/stm32_ug2864ambag01.c index 73f8f9920dd..8395d3830cf 100644 --- a/configs/stm32f4discovery/src/stm32_ug2864ambag01.c +++ b/configs/stm32f4discovery/src/stm32_ug2864ambag01.c @@ -97,9 +97,11 @@ #ifdef CONFIG_DEBUG_LCD # 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 @@ -136,7 +138,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) spi = stm32_spibus_initialize(1); if (!spi) { - lcderr("Failed to initialize SPI port 1\n"); + lcderr("ERROR: Failed to initialize SPI port 1\n"); } else { @@ -145,7 +147,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) dev = ug2864ambag01_initialize(spi, devno); if (!dev) { - lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno); + lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno); } else { diff --git a/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c b/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c index 42b04ce7e6c..b2711d89d01 100644 --- a/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c +++ b/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c @@ -97,9 +97,11 @@ #ifdef CONFIG_DEBUG_LCD # 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 @@ -136,7 +138,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) spi = stm32_spibus_initialize(1); if (!spi) { - lcderr("Failed to initialize SPI port 1\n"); + lcderr("ERROR: Failed to initialize SPI port 1\n"); } else { @@ -145,7 +147,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) dev = ssd1306_initialize(spi, devno); if (!dev) { - lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno); + lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno); } else { diff --git a/configs/stm32f4discovery/src/stm32_usb.c b/configs/stm32f4discovery/src/stm32_usb.c index 457f9d9bf18..b77b34c72e3 100644 --- a/configs/stm32f4discovery/src/stm32_usb.c +++ b/configs/stm32f4discovery/src/stm32_usb.c @@ -213,7 +213,7 @@ int stm32_usbhost_initialize(void) ret = usbhost_kbdinit(); if (ret != OK) { - uerr("Failed to register the HID keyboard class\n"); + uerr("ERROR: Failed to register the HID keyboard class\n"); } #endif @@ -223,7 +223,7 @@ int stm32_usbhost_initialize(void) ret = usbhost_mouse_init(); if (ret != OK) { - uerr("Failed to register the HID mouse class\n"); + uerr("ERROR: Failed to register the HID mouse class\n"); } #endif @@ -329,7 +329,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/stm32f746g-disco/src/stm32_spi.c b/configs/stm32f746g-disco/src/stm32_spi.c index f52f454ae30..54495266bbd 100644 --- a/configs/stm32f746g-disco/src/stm32_spi.c +++ b/configs/stm32f746g-disco/src/stm32_spi.c @@ -63,25 +63,14 @@ #ifdef CONFIG_DEBUG_SPI # define spierr llerr -# ifdef SPI_VERBOSE -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spiwarn llwarn +# define spiinfo llinfo #else -# undef SPI_VERBOSE # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif -/************************************************************************************ - * Private Data - ************************************************************************************/ - -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ @@ -126,7 +115,7 @@ void weak_function stm32_spidev_initialize(void) #ifdef CONFIG_STM32F7_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) @@ -138,7 +127,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_STM32F7_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) @@ -150,7 +139,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_STM32F7_SPI3 void stm32_spi3select(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_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) @@ -162,7 +151,7 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_STM32F7_SPI4 void stm32_spi4select(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_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) @@ -174,7 +163,7 @@ uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_STM32F7_SPI5 void stm32_spi5select(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_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) diff --git a/configs/stm32l476vg-disco/src/stm32_spi.c b/configs/stm32l476vg-disco/src/stm32_spi.c index 506bd9f1e45..4de5480adf6 100644 --- a/configs/stm32l476vg-disco/src/stm32_spi.c +++ b/configs/stm32l476vg-disco/src/stm32_spi.c @@ -68,13 +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 # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif @@ -113,7 +111,7 @@ void weak_function stm32_spiinitialize(void) g_spi1 = up_spiinitialize(1); if (!g_spi1) { - spierr("[boot] FAILED to initialize SPI port 1\n"); + spierr("ERROR: [boot] FAILED to initialize SPI port 1\n"); } #ifdef CONFIG_WL_CC3000 @@ -168,7 +166,7 @@ void weak_function stm32_spiinitialize(void) #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"); #ifdef CONFIG_WL_CC3000 if (devid == SPIDEV_WIRELESS) @@ -194,7 +192,7 @@ uint8_t stm32_spi1status(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"); #ifdef CONFIG_WL_CC3000 if (devid == SPIDEV_WIRELESS) @@ -213,7 +211,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_STM32_SPI3 void stm32_spi3select(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_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) diff --git a/configs/stm32ldiscovery/src/stm32_pwm.c b/configs/stm32ldiscovery/src/stm32_pwm.c index 8bf395e297d..9285c2a821a 100644 --- a/configs/stm32ldiscovery/src/stm32_pwm.c +++ b/configs/stm32ldiscovery/src/stm32_pwm.c @@ -120,7 +120,7 @@ int board_pwm_setup(void) pwm = stm32_pwminitialize(STM32F3DISCOVERY_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; } @@ -129,7 +129,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/stm32ldiscovery/src/stm32_qencoder.c b/configs/stm32ldiscovery/src/stm32_qencoder.c index ca38ecb56d2..ebd78514aa1 100644 --- a/configs/stm32ldiscovery/src/stm32_qencoder.c +++ b/configs/stm32ldiscovery/src/stm32_qencoder.c @@ -118,10 +118,6 @@ #ifdef HAVE_QENCODER -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ @@ -150,7 +146,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/stm32ldiscovery/src/stm32_spi.c b/configs/stm32ldiscovery/src/stm32_spi.c index 3d86fcea1f9..d4a82df275d 100644 --- a/configs/stm32ldiscovery/src/stm32_spi.c +++ b/configs/stm32ldiscovery/src/stm32_spi.c @@ -61,26 +61,16 @@ /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ -#undef SPI_DEBUG /* Define to enable debug */ -#undef SPI_VERBOSE /* Define to enable verbose debug */ - -#ifdef SPI_DEBUG +#ifdef CONFIG_DEBUG_SPI # define spierr llerr -# ifdef SPI_VERBOSE -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spiwarn llwarn +# define spiinfo llinfo #else -# undef SPI_VERBOSE # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ @@ -130,7 +120,7 @@ void weak_function stm32_spidev_initialize(void) #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"); stm32_gpiowrite(GPIO_MEMS_CS, !selected); } @@ -144,7 +134,7 @@ uint8_t stm32_spi1status(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) @@ -156,7 +146,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_STM32_SPI3 void stm32_spi3select(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_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) diff --git a/configs/teensy-2.0/src/at90usb_spi.c b/configs/teensy-2.0/src/at90usb_spi.c index 6a130d8bbbf..ca651a189ce 100644 --- a/configs/teensy-2.0/src/at90usb_spi.c +++ b/configs/teensy-2.0/src/at90usb_spi.c @@ -88,21 +88,14 @@ #ifdef CONFIG_SPI_DEBUG # define ssperr llerr -# ifdef CONFIG_SPI_VERBOSE -# define sspinfo llerr -# else -# define sspinfo(x...) -# endif +# define sspwarn llwarn +# define sspinfo llinfo #else -# undef CONFIG_SPI_VERBOSE # define ssperr(x...) +# define sspwarn(x...) # define sspinfo(x...) #endif -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ @@ -161,7 +154,7 @@ void weak_function at90usb_spidev_initialize(void) void avr_spiselect(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"); /* Assert/de-assert the CS pin to the card */ @@ -194,7 +187,7 @@ uint8_t avr_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) ret |= SPI_STATUS_WRPROTECTED; } - ssperr("Returning %02x\n", ret); + sspinfo("Returning %02x\n", ret); return ret; } diff --git a/configs/teensy-3.x/src/k20_pwm.c b/configs/teensy-3.x/src/k20_pwm.c index 281cea3af90..97658c9e2b1 100644 --- a/configs/teensy-3.x/src/k20_pwm.c +++ b/configs/teensy-3.x/src/k20_pwm.c @@ -99,7 +99,7 @@ int board_pwm_setup(void) pwm = kinetis_pwminitialize(0); if (!pwm) { - aerr("Failed to get the KL20 PWM lower half\n"); + aerr("ERROR: Failed to get the KL20 PWM lower half\n"); return -ENODEV; } @@ -108,7 +108,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; } @@ -119,7 +119,7 @@ int board_pwm_setup(void) pwm = kinetis_pwminitialize(1); if (!pwm) { - aerr("Failed to get the KL20 PWM lower half\n"); + aerr("ERROR: Failed to get the KL20 PWM lower half\n"); return -ENODEV; } @@ -128,7 +128,7 @@ int board_pwm_setup(void) ret = pwm_register("/dev/pwm1", pwm); if (ret < 0) { - aerr("pwm_register failed: %d\n", ret); + aerr("ERROR: pwm_register failed: %d\n", ret); return ret; } @@ -139,7 +139,7 @@ int board_pwm_setup(void) pwm = kinetis_pwminitialize(2); if (!pwm) { - aerr("Failed to get the KL20 PWM lower half\n"); + aerr("ERROR: Failed to get the KL20 PWM lower half\n"); return -ENODEV; } @@ -148,7 +148,7 @@ int board_pwm_setup(void) ret = pwm_register("/dev/pwm2", 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/teensy-3.x/src/k20_spi.c b/configs/teensy-3.x/src/k20_spi.c index 73cf6179652..be31459de83 100644 --- a/configs/teensy-3.x/src/k20_spi.c +++ b/configs/teensy-3.x/src/k20_spi.c @@ -61,21 +61,14 @@ #ifdef CONFIG_DEBUG_SPI # define spierr llerr -# ifdef CONFIG_DEBUG_SPI_VERBOSE -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spiwarn llwarn +# define spiinfo llinfo #else -# undef CONFIG_DEBUG_SPI_VERBOSE # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ @@ -121,7 +114,7 @@ void weak_function kinetis_spidev_initialize(void) #ifdef CONFIG_KINETIS_SPI1 void kinetis_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"); # warning "Missing logic" } @@ -135,7 +128,7 @@ uint8_t kinetis_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_KINETIS_SPI2 void kinetis_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"); # warning "Missing logic" } @@ -149,7 +142,7 @@ uint8_t kinetis_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_KINETIS_SPI3 void kinetis_spi3select(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"); # warning "Missing logic" } diff --git a/configs/teensy-3.x/src/k20_usbdev.c b/configs/teensy-3.x/src/k20_usbdev.c index 7df3d8d9901..ae8e2976d6b 100644 --- a/configs/teensy-3.x/src/k20_usbdev.c +++ b/configs/teensy-3.x/src/k20_usbdev.c @@ -136,6 +136,6 @@ int kinetis_usbpullup(FAR struct usbdev_s *dev, bool enable) void kinetis_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ullerr("resume: %d\n", resume); + ullinfo("resume: %d\n", resume); #warning "Missing logic" } diff --git a/configs/teensy-lc/src/kl_pwm.c b/configs/teensy-lc/src/kl_pwm.c index 40d5e87e6dd..91623d9e98b 100644 --- a/configs/teensy-lc/src/kl_pwm.c +++ b/configs/teensy-lc/src/kl_pwm.c @@ -98,7 +98,7 @@ int board_pwm_setup(void) pwm = kl_pwminitialize(0); if (!pwm) { - aerr("Failed to get the KL25 PWM lower half\n"); + aerr("ERROR: Failed to get the KL25 PWM lower half\n"); return -ENODEV; } @@ -107,7 +107,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/tm4c123g-launchpad/src/tm4c_autoleds.c b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c index 367569b67fb..a7b4a762421 100644 --- a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c +++ b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c @@ -103,9 +103,11 @@ #ifdef CONFIG_DEBUG_LEDS # define lederr llerr +# define ledwarn llwarn # define ledinfo llinfo #else # define lederr(x...) +# define ledwarn(x...) # define ledinfo(x...) #endif @@ -117,14 +119,6 @@ # define led_dumpgpio(m) #endif -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -140,7 +134,7 @@ #ifdef CONFIG_ARCH_LEDS void tm4c_led_initialize(void) { - lederr("Initializing\n"); + ledinfo("Initializing\n"); /* Configure Port E, Bit 1 as an output, initial value=OFF */ diff --git a/configs/tm4c123g-launchpad/src/tm4c_ssi.c b/configs/tm4c123g-launchpad/src/tm4c_ssi.c index a884c89534d..c0e39cc3a10 100644 --- a/configs/tm4c123g-launchpad/src/tm4c_ssi.c +++ b/configs/tm4c123g-launchpad/src/tm4c_ssi.c @@ -62,9 +62,13 @@ /* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ #ifdef CONFIG_DEBUG_SPI -# define ssierr llerr +# define ssierr llerr +# define ssiwarn llwarn +# define ssiinfo llinfo #else # define ssierr(x...) +# define ssiwarn(x...) +# define ssiinfo(x...) #endif /* Dump GPIO registers */ @@ -118,14 +122,14 @@ void weak_function tm4c_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"); 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/tm4c1294-launchpad/src/tm4c_ethernet.c b/configs/tm4c1294-launchpad/src/tm4c_ethernet.c index 642b8ac0e65..2460d0f04e0 100644 --- a/configs/tm4c1294-launchpad/src/tm4c_ethernet.c +++ b/configs/tm4c1294-launchpad/src/tm4c_ethernet.c @@ -84,7 +84,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/twr-k60n512/src/k60_spi.c b/configs/twr-k60n512/src/k60_spi.c index 4afe34fe977..79e9e402bc3 100644 --- a/configs/twr-k60n512/src/k60_spi.c +++ b/configs/twr-k60n512/src/k60_spi.c @@ -61,21 +61,14 @@ #ifdef CONFIG_DEBUG_SPI # define spierr llerr -# ifdef CONFIG_DEBUG_SPI_VERBOSE -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spiwarn llwarn +# define spiinfo llinfo #else -# undef CONFIG_DEBUG_SPI_VERBOSE # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ @@ -121,7 +114,7 @@ void weak_function kinetis_spidev_initialize(void) #ifdef CONFIG_KINETIS_SPI1 void kinetis_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"); # warning "Missing logic" } @@ -135,7 +128,7 @@ uint8_t kinetis_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_KINETIS_SPI2 void kinetis_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"); # warning "Missing logic" } @@ -149,7 +142,7 @@ uint8_t kinetis_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_KINETIS_SPI3 void kinetis_spi3select(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"); # warning "Missing logic" } diff --git a/configs/twr-k60n512/src/k60_usbdev.c b/configs/twr-k60n512/src/k60_usbdev.c index c9a7514ad98..7944ccdbc62 100644 --- a/configs/twr-k60n512/src/k60_usbdev.c +++ b/configs/twr-k60n512/src/k60_usbdev.c @@ -108,7 +108,6 @@ int kinetis_usbpullup(FAR struct usbdev_s *dev, bool enable) void kinetis_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ullerr("resume: %d\n", resume); + ullinfo("resume: %d\n", resume); #warning "Missing logic" } - diff --git a/configs/u-blox-c027/src/lpc17_adc.c b/configs/u-blox-c027/src/lpc17_adc.c index e9244045d3a..bc876a8d538 100644 --- a/configs/u-blox-c027/src/lpc17_adc.c +++ b/configs/u-blox-c027/src/lpc17_adc.c @@ -98,7 +98,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/u-blox-c027/src/lpc17_dac.c b/configs/u-blox-c027/src/lpc17_dac.c index f1dd0887ac9..c1924c2f309 100644 --- a/configs/u-blox-c027/src/lpc17_dac.c +++ b/configs/u-blox-c027/src/lpc17_dac.c @@ -92,7 +92,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/u-blox-c027/src/lpc17_pwm.c b/configs/u-blox-c027/src/lpc17_pwm.c index 93c22a8ceb0..435acf34737 100644 --- a/configs/u-blox-c027/src/lpc17_pwm.c +++ b/configs/u-blox-c027/src/lpc17_pwm.c @@ -64,10 +64,6 @@ FAR struct pwm_lowerhalf_s *lpc17_pwminitialize(int timer); FAR struct pwm_lowerhalf_s *lpc17_mcpwminitialize(int timer); FAR struct pwm_lowerhalf_s *lpc17_timerinitialize(int timer); -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ @@ -98,7 +94,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 +103,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 +119,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 +135,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/u-blox-c027/src/lpc17_ssp.c b/configs/u-blox-c027/src/lpc17_ssp.c index 722ec61f4ae..dd8bcb3d0d2 100644 --- a/configs/u-blox-c027/src/lpc17_ssp.c +++ b/configs/u-blox-c027/src/lpc17_ssp.c @@ -60,19 +60,13 @@ /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ -#undef SSP_DEBUG /* Define to enable debug */ -#undef SSP_VERBOSE /* Define to enable verbose debug */ - -#ifdef SSP_DEBUG +#ifdef CONFIG_DEBUG_SPI # define ssperr llerr -# ifdef SSP_VERBOSE -# define sspinfo llerr -# else -# define sspinfo(x...) -# endif +# define sspwarn llwarn +# define sspinfo llinfo #else -# undef SSP_VERBOSE # define ssperr(x...) +# define sspwarn(x...) # define sspinfo(x...) #endif @@ -140,7 +134,7 @@ void weak_function c027_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)" @@ -150,7 +144,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 @@ -158,7 +152,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) @@ -186,12 +180,12 @@ uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) if (lpc17_gpioread(C027_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/viewtool-stm32f107/src/stm32_mmcsd.c b/configs/viewtool-stm32f107/src/stm32_mmcsd.c index 9b9aa9030fc..d40b86899ca 100644 --- a/configs/viewtool-stm32f107/src/stm32_mmcsd.c +++ b/configs/viewtool-stm32f107/src/stm32_mmcsd.c @@ -100,7 +100,7 @@ int stm32_sdinitialize(int minor) sdio = sdio_initialize(STM32_MMCSDSLOTNO); if (!sdio) { - ferr("Failed to initialize SDIO slot %d\n", STM32_MMCSDSLOTNO); + ferr("ERROR: Failed to initialize SDIO slot %d\n", STM32_MMCSDSLOTNO); return -ENODEV; } @@ -111,8 +111,8 @@ int stm32_sdinitialize(int minor) ret = mmcsd_slotinitialize(minor, sdio); if (ret != OK) { - ferr("Failed to bind SDIO slot %d to the MMC/SD driver, minor=%d\n", - STM32_MMCSDSLOTNO, minor); + ferr("ERROR: Failed to bind SDIO slot %d to the MMC/SD driver, minor=%d\n", + STM32_MMCSDSLOTNO, minor); } finfo("Bound SDIO slot %d to the MMC/SD driver, minor=%d\n", diff --git a/configs/viewtool-stm32f107/src/stm32_mpl115a.c b/configs/viewtool-stm32f107/src/stm32_mpl115a.c index abd27ca3d22..487f7392f41 100644 --- a/configs/viewtool-stm32f107/src/stm32_mpl115a.c +++ b/configs/viewtool-stm32f107/src/stm32_mpl115a.c @@ -92,7 +92,7 @@ int stm32_mpl115ainitialize(FAR const char *devpath) ret = mpl115a_register(devpath, spi); if (ret < 0) { - snerr("Error registering MPL115A\n"); + snerr("ERROR: Error registering MPL115A\n"); } return ret; diff --git a/configs/viewtool-stm32f107/src/stm32_spi.c b/configs/viewtool-stm32f107/src/stm32_spi.c index 5acc91c134b..f27c43bc358 100644 --- a/configs/viewtool-stm32f107/src/stm32_spi.c +++ b/configs/viewtool-stm32f107/src/stm32_spi.c @@ -57,28 +57,18 @@ * Pre-processor Definitions ************************************************************************************/ -/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ +/* Enables debug output from this file */ -#undef SPI_DEBUG /* Define to enable debug */ -#undef SPI_VERBOSE /* Define to enable verbose debug */ - -#ifdef SPI_DEBUG +#ifdef CONFIG_DEBUG_SPI # define spierr llerr -# ifdef SPI_VERBOSE -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spiwarn llwarn +# define spiinfo llinfo #else -# undef SPI_VERBOSE # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ @@ -141,7 +131,7 @@ void weak_function stm32_spidev_initialize(void) #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) @@ -153,7 +143,7 @@ uint8_t stm32_spi1status(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"); #ifdef CONFIG_INPUT_ADS7843E /* Select/de-select the touchscreen */ @@ -174,7 +164,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) #ifdef CONFIG_STM32_SPI3 void stm32_spi3select(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_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) diff --git a/configs/viewtool-stm32f107/src/stm32_ssd1289.c b/configs/viewtool-stm32f107/src/stm32_ssd1289.c index 421ed2abd98..a19b0a5695b 100644 --- a/configs/viewtool-stm32f107/src/stm32_ssd1289.c +++ b/configs/viewtool-stm32f107/src/stm32_ssd1289.c @@ -105,9 +105,11 @@ #ifdef CONFIG_DEBUG_LCD # define lcderr err +# define lcdwarn warn # define lcdinfo info #else # define lcderr(x...) +# define lcdwarn(x...) # define lcdinfo(x...) #endif @@ -425,26 +427,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/viewtool-stm32f107/src/stm32_touchscreen.c b/configs/viewtool-stm32f107/src/stm32_touchscreen.c index 08399b2903f..6abba71e5cd 100644 --- a/configs/viewtool-stm32f107/src/stm32_touchscreen.c +++ b/configs/viewtool-stm32f107/src/stm32_touchscreen.c @@ -260,7 +260,7 @@ int board_tsc_setup(int minor) static bool initialized = false; int ret; - ierr("minor %d\n", minor); + iinfo("minor %d\n", minor); DEBUGASSERT(minor == 0); /* Have we already initialized? Since we never uninitialize we must prevent @@ -280,7 +280,7 @@ int board_tsc_setup(int minor) dev = stm32_spibus_initialize(TSC_DEVNUM); if (!dev) { - ierr("Failed to initialize SPI%d\n", TSC_DEVNUM); + ierr("ERROR: Failed to initialize SPI%d\n", TSC_DEVNUM); return -ENODEV; } @@ -289,7 +289,7 @@ int board_tsc_setup(int minor) ret = ads7843e_register(dev, &g_tscinfo.config, CONFIG_ADS7843E_DEVMINOR); if (ret < 0) { - ierr("Failed to register touchscreen device\n"); + ierr("ERROR: Failed to register touchscreen device\n"); /* up_spiuninitialize(dev); */ return -ENODEV; } diff --git a/configs/viewtool-stm32f107/src/stm32_usbdev.c b/configs/viewtool-stm32f107/src/stm32_usbdev.c index 54235c462aa..05d91fb36c5 100644 --- a/configs/viewtool-stm32f107/src/stm32_usbdev.c +++ b/configs/viewtool-stm32f107/src/stm32_usbdev.c @@ -118,7 +118,7 @@ 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); } #endif /* CONFIG_STM32_OTGFS || CONFIG_STM32_USB*/ diff --git a/configs/zkit-arm-1769/src/lpc17_adc.c b/configs/zkit-arm-1769/src/lpc17_adc.c index 0d2bcee96f3..3d3628ea9cb 100644 --- a/configs/zkit-arm-1769/src/lpc17_adc.c +++ b/configs/zkit-arm-1769/src/lpc17_adc.c @@ -99,7 +99,7 @@ int board_adc_setup(void) adc = lpc17_adcinitialize(); if (adc == NULL) { - aerr("ERROR: Failed to get ADC interface\n"); + aerr("ERROR: ERROR: Failed to get ADC interface\n"); return -ENODEV; } @@ -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/zkit-arm-1769/src/lpc17_dac.c b/configs/zkit-arm-1769/src/lpc17_dac.c index 71816af9a4b..70616d39a45 100644 --- a/configs/zkit-arm-1769/src/lpc17_dac.c +++ b/configs/zkit-arm-1769/src/lpc17_dac.c @@ -87,7 +87,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/zkit-arm-1769/src/lpc17_lcd.c b/configs/zkit-arm-1769/src/lpc17_lcd.c index e0208467367..b04405f34c6 100644 --- a/configs/zkit-arm-1769/src/lpc17_lcd.c +++ b/configs/zkit-arm-1769/src/lpc17_lcd.c @@ -95,10 +95,6 @@ FAR struct spi_dev_s *g_spidev; FAR struct lcd_dev_s *g_lcddev; -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -118,7 +114,7 @@ int board_lcd_initialize(void) g_spidev = lpc17_sspbus_initialize(0); if (!g_spidev) { - gllerr("Failed to initialize SSP port 0\n"); + gllerr("ERROR: Failed to initialize SSP port 0\n"); return 0; } @@ -137,7 +133,7 @@ FAR struct lcd_dev_s *board_lcd_getdev(int lcddev) g_lcddev = st7567_initialize(g_spidev, lcddev); if (!g_lcddev) { - gllerr("Failed to bind SSI port 0 to OLCD %d: %d\n", lcddev); + gllerr("ERROR: Failed to bind SSI port 0 to OLCD %d: %d\n", lcddev); } else { diff --git a/configs/zkit-arm-1769/src/lpc17_spi.c b/configs/zkit-arm-1769/src/lpc17_spi.c index f7bef7c2ccf..926298699c8 100644 --- a/configs/zkit-arm-1769/src/lpc17_spi.c +++ b/configs/zkit-arm-1769/src/lpc17_spi.c @@ -67,13 +67,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 # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif @@ -143,7 +141,7 @@ void weak_function zkit_spidev_initialize(void) void lpc17_spiselect(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"); spi_dumpgpio("lpc17_spiselect() Entry"); if (devid == SPIDEV_MMCSD) @@ -164,12 +162,12 @@ uint8_t lpc17_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) if (lpc17_gpioread(ZKITARM_SD_CD) == 0) { - spierr("Returning SPI_STATUS_PRESENT\n"); + spiinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; } } - spierr("Returning zero\n"); + spiinfo("Returning zero\n"); return 0; } diff --git a/configs/zkit-arm-1769/src/lpc17_ssp.c b/configs/zkit-arm-1769/src/lpc17_ssp.c index 16288dcce32..cf55667df37 100644 --- a/configs/zkit-arm-1769/src/lpc17_ssp.c +++ b/configs/zkit-arm-1769/src/lpc17_ssp.c @@ -67,13 +67,11 @@ #ifdef CONFIG_DEBUG_SPI # define ssperr llerr -# ifdef CONFIG_DEBUG_INFO -# define sspinfo llerr -# else -# define sspinfo(x...) -# endif +# define sspwarn llwarn +# define sspinfo llinfo #else # define ssperr(x...) +# define sspwarn(x...) # define sspinfo(x...) #endif @@ -146,7 +144,7 @@ void weak_function zkit_sspdev_initialize(void) #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"); #warning "Assert CS here (false)" @@ -156,7 +154,7 @@ void lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel uint8_t lpc17_ssp1status(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; } @@ -180,7 +178,7 @@ int weak_function lpc17_ssp1cmddata(FAR struct spi_dev_s *dev, #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"); #ifdef CONFIG_NX_LCDDRIVER @@ -199,11 +197,11 @@ uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { if (devid == SPIDEV_DISPLAY) { - 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; } diff --git a/configs/zp214xpa/src/lpc2148_spi1.c b/configs/zp214xpa/src/lpc2148_spi1.c index 2a7fdd67bbf..90cc35953ad 100644 --- a/configs/zp214xpa/src/lpc2148_spi1.c +++ b/configs/zp214xpa/src/lpc2148_spi1.c @@ -91,13 +91,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 # define spierr(x...) +# define spiwarn(x...) # define spiinfo(x...) #endif @@ -247,14 +245,14 @@ static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel /* Enable slave select (low enables) */ putreg32(bit, CS_CLR_REGISTER); - spierr("CS asserted: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER)); + spiinfo("CS asserted: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER)); } else { /* Disable slave select (low enables) */ putreg32(bit, CS_SET_REGISTER); - spierr("CS de-asserted: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER)); + spiinfo("CS de-asserted: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER)); /* Wait for the TX FIFO not full indication */ @@ -310,7 +308,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; } @@ -331,7 +329,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) static uint8_t spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { - spierr("Return 0\n"); + spiinfo("Return 0\n"); return 0; } @@ -387,14 +385,14 @@ static int spi_cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd /* L: the inputs at D0 to D7 are transferred to the command registers */ putreg32(bit, CS_CLR_REGISTER); - spierr("Command: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER)); + spiinfo("Command: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER)); } else { /* H: the inputs at D0 to D7 are treated as display data. */ putreg32(bit, CS_SET_REGISTER); - spierr("Data: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER)); + spiinfo("Data: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER)); } return OK; @@ -436,7 +434,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; } @@ -466,7 +464,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 */ @@ -483,7 +481,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? */ @@ -537,7 +535,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... @@ -635,9 +633,9 @@ FAR struct spi_dev_s *lpc214x_spibus_initialize(int port) regval32 |= getreg32(CS_DIR_REGISTER); putreg32(regval32, CS_DIR_REGISTER); - spierr("CS Pin Config: PINSEL1: %08x PIN: %08x DIR: %08x\n", - getreg32(LPC214X_PINSEL1), getreg32(CS_PIN_REGISTER), - getreg32(CS_DIR_REGISTER)); + spiinfo("CS Pin Config: PINSEL1: %08x PIN: %08x DIR: %08x\n", + getreg32(LPC214X_PINSEL1), getreg32(CS_PIN_REGISTER), + getreg32(CS_DIR_REGISTER)); /* Enable peripheral clocking to SPI1 */ diff --git a/configs/zp214xpa/src/lpc2148_ug2864ambag01.c b/configs/zp214xpa/src/lpc2148_ug2864ambag01.c index 24a6be8a0e1..e2e221a9258 100644 --- a/configs/zp214xpa/src/lpc2148_ug2864ambag01.c +++ b/configs/zp214xpa/src/lpc2148_ug2864ambag01.c @@ -101,9 +101,11 @@ #ifdef CONFIG_DEBUG_LCD # 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 lcdwarm(x...) # define lcdinfo(x...) #endif @@ -160,7 +162,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) spi = lpc214x_spibus_initialize(1); if (!spi) { - lcderr("Failed to initialize SPI port 1\n"); + lcderr("ERROR: Failed to initialize SPI port 1\n"); } else { @@ -169,7 +171,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) dev = ug2864ambag01_initialize(spi, devno); if (!dev) { - lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno); + lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno); } else {