Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 23:03:27 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

configs/: Change some err() ERRORS to warn() WARNINGS or info()

Browse Source
This commit is contained in:
Gregory Nutt
2016-06-12 17:02:46 -06:00
parent 26718cee5c
commit a5457987d8
79 changed files with 365 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/stm3210e-eval/src/stm32_adc.c
+1 -1
View File
@@ -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;
}
configs/stm3210e-eval/src/stm32_idle.c
+2 -2
View File
@@ -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
configs/stm3210e-eval/src/stm32_lcd.c
+36 -30
View File
@@ -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 */
configs/stm3210e-eval/src/stm32_spi.c
+7 -17
View File
@@ -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)
configs/stm3210e-eval/src/stm32_usbdev.c
+1 -2
View File
@@ -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);
}
configs/stm3220g-eval/src/stm32_adc.c
+1 -1
View File
@@ -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;
}
configs/stm3220g-eval/src/stm32_lcd.c
+6 -3
View File
@@ -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");
}
}
configs/stm3220g-eval/src/stm32_pwm.c
+2 -2
View File
@@ -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;
}
configs/stm3220g-eval/src/stm32_spi.c
+7 -17
View File
@@ -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)
configs/stm3220g-eval/src/stm32_stmpe811.c
+4 -4
View File
@@ -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;
}
configs/stm3220g-eval/src/stm32_usb.c
+1 -1
View File
@@ -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
configs/stm3240g-eval/src/stm32_adc.c
+1 -1
View File
@@ -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;
}
configs/stm3240g-eval/src/stm32_lcd.c
+6 -3
View File
@@ -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");
}
}
configs/stm3240g-eval/src/stm32_pwm.c
+2 -2
View File
@@ -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;
}
configs/stm3240g-eval/src/stm32_spi.c
+7 -17
View File
@@ -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)
configs/stm3240g-eval/src/stm32_stmpe811.c
+4 -4
View File
@@ -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;
}
configs/stm3240g-eval/src/stm32_usb.c
+1 -1
View File
@@ -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
configs/stm32_tiny/src/stm32_pwm.c
+2 -2
View File
@@ -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;
}
configs/stm32_tiny/src/stm32_usbdev.c
+2 -3
View File
@@ -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);
}
configs/stm32_tiny/src/stm32_wireless.c
+2 -2
View File
@@ -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;
}
}
configs/stm32f103-minimum/src/stm32_usbdev.c
+1 -1
View File
@@ -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);
}
configs/stm32f3discovery/src/stm32_pwm.c
+2 -2
View File
@@ -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;
}
configs/stm32f3discovery/src/stm32_qencoder.c
+1 -1
View File
@@ -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;
}
configs/stm32f3discovery/src/stm32_spi.c
+7 -17
View File
@@ -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)
configs/stm32f3discovery/src/stm32_usb.c
+1 -4
View File
@@ -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 */
configs/stm32f429i-disco/src/stm32_appinit.c
+1 -1
View File
@@ -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;
}
configs/stm32f429i-disco/src/stm32_idle.c
+1 -1
View File
@@ -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();
configs/stm32f429i-disco/src/stm32_ili93414ws.c
+8 -7
View File
@@ -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 */
configs/stm32f429i-disco/src/stm32_lcd.c
+28 -13
View File
@@ -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, &param);
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, &param);
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, &param);
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 */
configs/stm32f429i-disco/src/stm32_spi.c
+8 -14
View File
@@ -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)
configs/stm32f429i-disco/src/stm32_usb.c
+1 -1
View File
@@ -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
configs/stm32f4discovery/src/stm32_bh1750fvi.c
+2 -2
View File
@@ -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;
configs/stm32f4discovery/src/stm32_bmp180.c
+2 -2
View File
@@ -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;
configs/stm32f4discovery/src/stm32_ethernet.c
+5 -5
View File
@@ -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;
}
configs/stm32f4discovery/src/stm32_idle.c
+1 -1
View File
@@ -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();
configs/stm32f4discovery/src/stm32_max31855.c
+1 -1
View File
@@ -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;
configs/stm32f4discovery/src/stm32_max6675.c
+1 -1
View File
@@ -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;
configs/stm32f4discovery/src/stm32_pca9635.c
+1 -1
View File
@@ -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;
}
configs/stm32f4discovery/src/stm32_pwm.c
+2 -2
View File
@@ -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;
}
configs/stm32f4discovery/src/stm32_qencoder.c
+1 -5
View File
@@ -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;
}
configs/stm32f4discovery/src/stm32_rgbled.c
+14 -4
View File
@@ -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;
}
configs/stm32f4discovery/src/stm32_sdio.c
+2 -2
View File
@@ -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;
}
configs/stm32f4discovery/src/stm32_spi.c
+7 -17
View File
@@ -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)
configs/stm32f4discovery/src/stm32_ssd1351.c
+4 -2
View File
@@ -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
{
configs/stm32f4discovery/src/stm32_ug2864ambag01.c
+4 -2
View File
@@ -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
{
configs/stm32f4discovery/src/stm32_ug2864hsweg01.c
+4 -2
View File
@@ -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
{
configs/stm32f4discovery/src/stm32_usb.c
+3 -3
View File
@@ -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
configs/stm32f746g-disco/src/stm32_spi.c
+8 -19
View File
@@ -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)
configs/stm32l476vg-disco/src/stm32_spi.c
+7 -9
View File
@@ -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)
configs/stm32ldiscovery/src/stm32_pwm.c
+2 -2
View File
@@ -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;
}

Some files were not shown because too many files have changed in this diff Show More