From 94f5e872227ebdbef1bb3e1d09a62021a7d7904a Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 13 Jun 2016 11:04:19 -0600 Subject: [PATCH] configs/: Change some *err() message to *info() messages if what was a *dbg() message does not indicate and error condition. --- configs/arduino-due/src/sam_mmcsd.c | 4 ++-- configs/arduino-due/src/sam_touchscreen.c | 6 +++--- configs/cloudctrl/src/stm32_adc.c | 2 +- configs/cloudctrl/src/stm32_spi.c | 22 ++++++--------------- configs/cloudctrl/src/stm32_usb.c | 5 +---- configs/compal_e99/src/ssd1783.c | 3 ++- configs/dk-tm4c129x/src/tm4c_ethernet.c | 2 +- configs/dk-tm4c129x/src/tm4c_ssi.c | 24 ++++++++--------------- configs/ea3131/src/lpc31_fillpage.c | 4 ++-- configs/ea3131/src/lpc31_spi.c | 2 +- configs/ea3152/src/lpc31_fillpage.c | 4 ++-- configs/ea3152/src/lpc31_spi.c | 2 +- configs/eagle100/src/lm_ethernet.c | 2 +- configs/eagle100/src/lm_leds.c | 2 +- configs/eagle100/src/lm_ssi.c | 4 ++-- configs/ekk-lm3s9b96/src/lm_ethernet.c | 2 +- configs/ekk-lm3s9b96/src/lm_leds.c | 2 +- configs/ekk-lm3s9b96/src/lm_ssi.c | 4 ++-- configs/fire-stm32v2/src/stm32_enc28j60.c | 4 ++-- configs/fire-stm32v2/src/stm32_mmcsd.c | 4 ++-- configs/fire-stm32v2/src/stm32_spi.c | 4 ++-- configs/fire-stm32v2/src/stm32_usbdev.c | 3 +-- configs/freedom-kl25z/src/kl_adxl345.c | 8 ++++---- configs/freedom-kl25z/src/kl_pwm.c | 4 ++-- configs/freedom-kl25z/src/kl_wifi.c | 6 +++--- configs/freedom-kl26z/src/kl_pwm.c | 4 ++-- configs/hymini-stm32v/src/stm32_spi.c | 6 +++--- configs/hymini-stm32v/src/stm32_ts.c | 4 ++-- configs/hymini-stm32v/src/stm32_usbdev.c | 5 ++--- configs/kwikstik-k40/src/k40_leds.c | 10 ++-------- configs/kwikstik-k40/src/k40_spi.c | 6 +++--- configs/kwikstik-k40/src/k40_usbdev.c | 2 +- configs/stm32f4discovery/src/stm32_spi.c | 2 +- 33 files changed, 70 insertions(+), 98 deletions(-) diff --git a/configs/arduino-due/src/sam_mmcsd.c b/configs/arduino-due/src/sam_mmcsd.c index 3edad36db0..b7556ea082 100644 --- a/configs/arduino-due/src/sam_mmcsd.c +++ b/configs/arduino-due/src/sam_mmcsd.c @@ -259,7 +259,7 @@ int sam_sdinitialize(int minor) spi = sam_mmcsd_spiinitialize(); if (!spi) { - ferr("Failed to bit bang SPI for the MMC/SD slot\n"); + ferr("ERROR: Failed to bit bang SPI for the MMC/SD slot\n"); return -ENODEV; } @@ -273,7 +273,7 @@ int sam_sdinitialize(int minor) ret = mmcsd_spislotinitialize(minor, SAM34_MMCSDSLOTNO, spi); if (ret < 0) { - ferr("Failed to bind bit bang SPI device to MMC/SD slot %d: %d\n", + ferr("ERROR: Failed to bind bit bang SPI device to MMC/SD slot %d: %d\n", SAM34_MMCSDSLOTNO, ret); return ret; } diff --git a/configs/arduino-due/src/sam_touchscreen.c b/configs/arduino-due/src/sam_touchscreen.c index 6f105ff2bf..d16184a6cd 100644 --- a/configs/arduino-due/src/sam_touchscreen.c +++ b/configs/arduino-due/src/sam_touchscreen.c @@ -359,7 +359,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 @@ -383,7 +383,7 @@ int board_tsc_setup(int minor) dev = sam_tsc_spiinitialize(); if (!dev) { - ierr("Failed to initialize bit bang SPI\n"); + ierr("ERROR: Failed to initialize bit bang SPI\n"); return -ENODEV; } @@ -392,7 +392,7 @@ int board_tsc_setup(int minor) ret = ads7843e_register(dev, &g_tscinfo, 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/cloudctrl/src/stm32_adc.c b/configs/cloudctrl/src/stm32_adc.c index ba10061c0b..346100b782 100644 --- a/configs/cloudctrl/src/stm32_adc.c +++ b/configs/cloudctrl/src/stm32_adc.c @@ -155,7 +155,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/cloudctrl/src/stm32_spi.c b/configs/cloudctrl/src/stm32_spi.c index 5bcfe53763..aa28e24f7f 100644 --- a/configs/cloudctrl/src/stm32_spi.c +++ b/configs/cloudctrl/src/stm32_spi.c @@ -58,28 +58,18 @@ * Pre-processor Definitions ************************************************************************************/ -/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ - -#ifndef CONFIG_DEBUG_FEATURES -# undef CONFIG_DEBUG_SPI -#endif +/* Enables debug output from this file */ #ifdef CONFIG_DEBUG_SPI # define spierr llerr -# ifdef CONFIG_DEBUG_INFO -# define spiinfo llerr -# else -# define spiinfo(x...) -# endif +# define spiwarn llwarn +# define spiinfo llinfo #else # 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"); /* SPI1 connects to the SD CARD and to the SPI FLASH */ @@ -163,7 +153,7 @@ uint8_t stm32_spi1status(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"); } diff --git a/configs/cloudctrl/src/stm32_usb.c b/configs/cloudctrl/src/stm32_usb.c index 44b6fd02c6..9af1565f91 100644 --- a/configs/cloudctrl/src/stm32_usb.c +++ b/configs/cloudctrl/src/stm32_usb.c @@ -301,11 +301,8 @@ 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 #endif /* CONFIG_STM32_OTGFS */ - - - diff --git a/configs/compal_e99/src/ssd1783.c b/configs/compal_e99/src/ssd1783.c index 66831938b4..de9cd80494 100644 --- a/configs/compal_e99/src/ssd1783.c +++ b/configs/compal_e99/src/ssd1783.c @@ -250,7 +250,8 @@ static void lcd_write_prepare(unsigned int x1, unsigned int x2, unsigned int y1, { CMD, 0x5c }, /* enter write display ram mode */ { END, 0x00 } }; - err("x1:%d, x2:%d, y1:%d, y2:%d\n",x1, x2,y1, y2); + + info("x1:%d, x2:%d, y1:%d, y2:%d\n",x1, x2,y1, y2); fb_ssd1783_send_cmdlist(prepare_disp_write_cmds); } diff --git a/configs/dk-tm4c129x/src/tm4c_ethernet.c b/configs/dk-tm4c129x/src/tm4c_ethernet.c index abe1dbb53d..927757e16d 100644 --- a/configs/dk-tm4c129x/src/tm4c_ethernet.c +++ b/configs/dk-tm4c129x/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/dk-tm4c129x/src/tm4c_ssi.c b/configs/dk-tm4c129x/src/tm4c_ssi.c index 5eae9d3c87..6e889b94bd 100644 --- a/configs/dk-tm4c129x/src/tm4c_ssi.c +++ b/configs/dk-tm4c129x/src/tm4c_ssi.c @@ -59,28 +59,20 @@ * Pre-processor Definitions ************************************************************************************/ -/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ +/* Enables debug output from this file */ #ifdef CONFIG_DEBUG_SPI -# define ssierr llerr -#else -# define ssierr(x...) -#endif - -/* Dump GPIO registers */ - -#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO) -# define ssiinfo llerr +# define ssierr llerr +# define ssiwarn llwarn +# define ssiinfo llinfo # define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m) #else +# define ssierr(x...) +# define ssiwarn(x...) # define ssiinfo(x...) # define ssi_dumpgpio(m) #endif -/************************************************************************************ - * Private Functions - ************************************************************************************/ - /************************************************************************************ * Public Functions ************************************************************************************/ @@ -118,14 +110,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/ea3131/src/lpc31_fillpage.c b/configs/ea3131/src/lpc31_fillpage.c index 7f1b62b70a..2020c844d9 100644 --- a/configs/ea3131/src/lpc31_fillpage.c +++ b/configs/ea3131/src/lpc31_fillpage.c @@ -412,7 +412,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage) off_t offset; #endif - pgllerr("TCB: %p vpage: %p far: %08x\n", tcb, vpage, tcb->xcp.far); + pgllinfo("TCB: %p vpage: %p far: %08x\n", tcb, vpage, tcb->xcp.far); DEBUGASSERT(tcb->xcp.far >= PG_PAGED_VBASE && tcb->xcp.far < PG_PAGED_VEND); /* If BINPATH is defined, then it is the full path to a file on a mounted file @@ -475,7 +475,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage) int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage, up_pgcallback_t pg_callback) { - pgllerr("TCB: %p vpage: %d far: %08x\n", tcb, vpage, tcb->xcp.far); + pgllinfo("TCB: %p vpage: %d far: %08x\n", tcb, vpage, tcb->xcp.far); DEBUGASSERT(tcb->xcp.far >= PG_PAGED_VBASE && tcb->xcp.far < PG_PAGED_VEND); #if defined(CONFIG_PAGING_BINPATH) diff --git a/configs/ea3131/src/lpc31_spi.c b/configs/ea3131/src/lpc31_spi.c index eb70c52379..a49eba9477 100644 --- a/configs/ea3131/src/lpc31_spi.c +++ b/configs/ea3131/src/lpc31_spi.c @@ -117,7 +117,7 @@ void weak_function lpc31_spidev_intialize(void) void lpc31_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"); #warning "Missing logic" } diff --git a/configs/ea3152/src/lpc31_fillpage.c b/configs/ea3152/src/lpc31_fillpage.c index 62745695cb..33dd4dc08a 100644 --- a/configs/ea3152/src/lpc31_fillpage.c +++ b/configs/ea3152/src/lpc31_fillpage.c @@ -412,7 +412,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage) off_t offset; #endif - pgllerr("TCB: %p vpage: %p far: %08x\n", tcb, vpage, tcb->xcp.far); + pgllinfo("TCB: %p vpage: %p far: %08x\n", tcb, vpage, tcb->xcp.far); DEBUGASSERT(tcb->xcp.far >= PG_PAGED_VBASE && tcb->xcp.far < PG_PAGED_VEND); /* If BINPATH is defined, then it is the full path to a file on a mounted file @@ -475,7 +475,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage) int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage, up_pgcallback_t pg_callback) { - pgllerr("TCB: %p vpage: %d far: %08x\n", tcb, vpage, tcb->xcp.far); + pgllinfo("TCB: %p vpage: %d far: %08x\n", tcb, vpage, tcb->xcp.far); DEBUGASSERT(tcb->xcp.far >= PG_PAGED_VBASE && tcb->xcp.far < PG_PAGED_VEND); #if defined(CONFIG_PAGING_BINPATH) diff --git a/configs/ea3152/src/lpc31_spi.c b/configs/ea3152/src/lpc31_spi.c index 30437379af..a34576b900 100644 --- a/configs/ea3152/src/lpc31_spi.c +++ b/configs/ea3152/src/lpc31_spi.c @@ -117,7 +117,7 @@ void weak_function lpc31_spidev_intialize(void) void lpc31_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"); #warning "Missing logic" } diff --git a/configs/eagle100/src/lm_ethernet.c b/configs/eagle100/src/lm_ethernet.c index b556e1d7cd..cc81b1667e 100644 --- a/configs/eagle100/src/lm_ethernet.c +++ b/configs/eagle100/src/lm_ethernet.c @@ -83,7 +83,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr) user0 = getreg32(TIVA_FLASH_USERREG0); user1 = getreg32(TIVA_FLASH_USERREG1); - nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); + nllinfo("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff); /* Re-format that MAC address the way that the network expects to see it */ diff --git a/configs/eagle100/src/lm_leds.c b/configs/eagle100/src/lm_leds.c index 91cabe6afa..86951bfc3e 100644 --- a/configs/eagle100/src/lm_leds.c +++ b/configs/eagle100/src/lm_leds.c @@ -100,7 +100,7 @@ static uint8_t g_nest; #ifdef CONFIG_ARCH_LEDS void board_autoled_initialize(void) { - lederr("Initializing\n"); + ledinfo("Initializing\n"); /* Configure Port E, Bit 1 as an output, initial value=OFF */ diff --git a/configs/eagle100/src/lm_ssi.c b/configs/eagle100/src/lm_ssi.c index 066c12d11d..9c3f5b04d3 100644 --- a/configs/eagle100/src/lm_ssi.c +++ b/configs/eagle100/src/lm_ssi.c @@ -115,7 +115,7 @@ void weak_function lm_ssidev_initialize(void) void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); + ssiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); if (devid == SPIDEV_MMCSD) { /* Assert the CS pin to the card */ @@ -128,7 +128,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { - ssierr("Returning SPI_STATUS_PRESENT\n"); + ssiinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; } diff --git a/configs/ekk-lm3s9b96/src/lm_ethernet.c b/configs/ekk-lm3s9b96/src/lm_ethernet.c index db8a560be5..16156f0d93 100644 --- a/configs/ekk-lm3s9b96/src/lm_ethernet.c +++ b/configs/ekk-lm3s9b96/src/lm_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/ekk-lm3s9b96/src/lm_leds.c b/configs/ekk-lm3s9b96/src/lm_leds.c index 8df76950a4..dff55f504e 100644 --- a/configs/ekk-lm3s9b96/src/lm_leds.c +++ b/configs/ekk-lm3s9b96/src/lm_leds.c @@ -97,7 +97,7 @@ static uint8_t g_nest; #ifdef CONFIG_ARCH_LEDS void board_autoled_initialize(void) { - lederr("Initializing\n"); + ledinfo("Initializing\n"); /* Configure Port D, Bit 0 as an output, initial value=OFF */ diff --git a/configs/ekk-lm3s9b96/src/lm_ssi.c b/configs/ekk-lm3s9b96/src/lm_ssi.c index f22fc206cf..6fc632f65b 100644 --- a/configs/ekk-lm3s9b96/src/lm_ssi.c +++ b/configs/ekk-lm3s9b96/src/lm_ssi.c @@ -115,7 +115,7 @@ void weak_function lm_ssidev_initialize(void) void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); + ssiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); ssi_dumpgpio("tiva_ssiselect() Entry"); if (devid == SPIDEV_MMCSD) { @@ -136,7 +136,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { - ssierr("Returning SPI_STATUS_PRESENT\n"); + ssiinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; } #endif diff --git a/configs/fire-stm32v2/src/stm32_enc28j60.c b/configs/fire-stm32v2/src/stm32_enc28j60.c index ac1e82381a..41565d288f 100644 --- a/configs/fire-stm32v2/src/stm32_enc28j60.c +++ b/configs/fire-stm32v2/src/stm32_enc28j60.c @@ -188,7 +188,7 @@ void up_netinitialize(void) spi = stm32_spibus_initialize(ENC28J60_SPI_PORTNO); if (!spi) { - nllerr("Failed to initialize SPI port %d\n", ENC28J60_SPI_PORTNO); + nllerr("ERROR: Failed to initialize SPI port %d\n", ENC28J60_SPI_PORTNO); return; } @@ -201,7 +201,7 @@ void up_netinitialize(void) ret = enc_initialize(spi, &g_enclower.lower, ENC28J60_DEVNO); if (ret < 0) { - nllerr("Failed to bind SPI port %d ENC28J60 device %d: %d\n", + nllerr("ERROR: Failed to bind SPI port %d ENC28J60 device %d: %d\n", ENC28J60_SPI_PORTNO, ENC28J60_DEVNO, ret); return; } diff --git a/configs/fire-stm32v2/src/stm32_mmcsd.c b/configs/fire-stm32v2/src/stm32_mmcsd.c index 3bbd49d892..a29276836c 100644 --- a/configs/fire-stm32v2/src/stm32_mmcsd.c +++ b/configs/fire-stm32v2/src/stm32_mmcsd.c @@ -93,7 +93,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; } @@ -104,7 +104,7 @@ 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", + ferr("ERROR: Failed to bind SDIO slot %d to the MMC/SD driver, minor=%d\n", STM32_MMCSDSLOTNO, minor); } diff --git a/configs/fire-stm32v2/src/stm32_spi.c b/configs/fire-stm32v2/src/stm32_spi.c index 83e21852db..b92bbdd2b4 100644 --- a/configs/fire-stm32v2/src/stm32_spi.c +++ b/configs/fire-stm32v2/src/stm32_spi.c @@ -149,7 +149,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 0 /* Need to study this */ if (devid == SPIDEV_LCD) @@ -186,7 +186,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 (devid == SPIDEV_AUDIO) { diff --git a/configs/fire-stm32v2/src/stm32_usbdev.c b/configs/fire-stm32v2/src/stm32_usbdev.c index 5ba1c8cbfd..ca46743f73 100644 --- a/configs/fire-stm32v2/src/stm32_usbdev.c +++ b/configs/fire-stm32v2/src/stm32_usbdev.c @@ -114,6 +114,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/freedom-kl25z/src/kl_adxl345.c b/configs/freedom-kl25z/src/kl_adxl345.c index e0dcd781ea..3560e3d7fa 100644 --- a/configs/freedom-kl25z/src/kl_adxl345.c +++ b/configs/freedom-kl25z/src/kl_adxl345.c @@ -257,7 +257,7 @@ int adxl345_archinitialize(int minor) FAR struct spi_dev_s *dev; int ret; - snerr("minor %d\n", minor); + sninfo("minor %d\n", minor); DEBUGASSERT(minor == 0); /* Check if we are already initialized */ @@ -275,7 +275,7 @@ int adxl345_archinitialize(int minor) dev = kl_spibus_initialize(CONFIG_ADXL345_SPIDEV); if (!dev) { - snerr("Failed to initialize SPI bus %d\n", CONFIG_ADXL345_SPIDEV); + snerr("ERROR: Failed to initialize SPI bus %d\n", CONFIG_ADXL345_SPIDEV); return -ENODEV; } @@ -285,7 +285,7 @@ int adxl345_archinitialize(int minor) adxl345_instantiate(dev, (FAR struct adxl345_config_s *)&g_adxl345config); if (!g_adxl345config.handle) { - snerr("Failed to instantiate the ADXL345 driver\n"); + snerr("ERROR: Failed to instantiate the ADXL345 driver\n"); return -ENODEV; } @@ -294,7 +294,7 @@ int adxl345_archinitialize(int minor) ret = adxl345_register(g_adxl345config.handle, CONFIG_ADXL345_DEVMINOR); if (ret < 0) { - snerr("Failed to register ADXL345 driver: %d\n", ret); + snerr("ERROR: Failed to register ADXL345 driver: %d\n", ret); return ret; } } diff --git a/configs/freedom-kl25z/src/kl_pwm.c b/configs/freedom-kl25z/src/kl_pwm.c index 18b51097d1..e00d1ca52b 100644 --- a/configs/freedom-kl25z/src/kl_pwm.c +++ b/configs/freedom-kl25z/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/freedom-kl25z/src/kl_wifi.c b/configs/freedom-kl25z/src/kl_wifi.c index 12924682d8..5687388571 100644 --- a/configs/freedom-kl25z/src/kl_wifi.c +++ b/configs/freedom-kl25z/src/kl_wifi.c @@ -289,7 +289,7 @@ int wireless_archinitialize(size_t max_rx_size) /* Init SPI bus */ - ierr("minor %d\n", minor); + iinfo("minor %d\n", minor); DEBUGASSERT(CONFIG_CC3000_DEVMINOR == 0); #ifdef CONFIG_CC3000_PROBES @@ -304,7 +304,7 @@ int wireless_archinitialize(size_t max_rx_size) spi = kl_spibus_initialize(CONFIG_CC3000_SPIDEV); if (!spi) { - ierr("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV); + ierr("ERROR: Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV); return -ENODEV; } @@ -314,7 +314,7 @@ int wireless_archinitialize(size_t max_rx_size) int ret = cc3000_register(spi, &g_cc3000_info.dev, CONFIG_CC3000_DEVMINOR); if (ret < 0) { - ierr("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV); + ierr("ERROR: Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV); return -ENODEV; } diff --git a/configs/freedom-kl26z/src/kl_pwm.c b/configs/freedom-kl26z/src/kl_pwm.c index e57a9936bb..672d49e70e 100644 --- a/configs/freedom-kl26z/src/kl_pwm.c +++ b/configs/freedom-kl26z/src/kl_pwm.c @@ -98,7 +98,7 @@ int board_pwm_setup(void) pwm = kl_pwminitialize(0); if (!pwm) { - aerr("Failed to get the KL26 PWM lower half\n"); + aerr("ERROR: Failed to get the KL26 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/hymini-stm32v/src/stm32_spi.c b/configs/hymini-stm32v/src/stm32_spi.c index e803e52e70..757dffb6cc 100644 --- a/configs/hymini-stm32v/src/stm32_spi.c +++ b/configs/hymini-stm32v/src/stm32_spi.c @@ -125,7 +125,7 @@ void 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_TOUCHSCREEN) { @@ -144,7 +144,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 +156,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/hymini-stm32v/src/stm32_ts.c b/configs/hymini-stm32v/src/stm32_ts.c index 77e83d66f2..678dba89a2 100644 --- a/configs/hymini-stm32v/src/stm32_ts.c +++ b/configs/hymini-stm32v/src/stm32_ts.c @@ -153,12 +153,12 @@ int board_tsc_setup(int minor) { FAR struct spi_dev_s *dev; - ierr("minor %d\n", minor); + iinfo("minor %d\n", minor); dev = stm32_spibus_initialize(1); if (!dev) { - ierr("Failed to initialize SPI bus\n"); + ierr("ERROR: Failed to initialize SPI bus\n"); return -ENODEV; } diff --git a/configs/hymini-stm32v/src/stm32_usbdev.c b/configs/hymini-stm32v/src/stm32_usbdev.c index 49f7f83339..c1a21be624 100644 --- a/configs/hymini-stm32v/src/stm32_usbdev.c +++ b/configs/hymini-stm32v/src/stm32_usbdev.c @@ -73,7 +73,7 @@ void stm32_usbinitialize(void) { - ullerr("called\n"); + ullinfo("called\n"); /* USB Soft Connect Pullup */ stm32_configgpio(GPIO_USB_PULLUP); @@ -111,6 +111,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/kwikstik-k40/src/k40_leds.c b/configs/kwikstik-k40/src/k40_leds.c index 277da4de96..8605c334fc 100644 --- a/configs/kwikstik-k40/src/k40_leds.c +++ b/configs/kwikstik-k40/src/k40_leds.c @@ -53,20 +53,14 @@ #ifdef CONFIG_DEBUG_LEDS # define lederr llerr +# define ledwarn llwarn # define ledinfo llinfo #else # define lederr(x...) +# define ledwarn(x...) # define ledinfo(x...) #endif -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/configs/kwikstik-k40/src/k40_spi.c b/configs/kwikstik-k40/src/k40_spi.c index c9bfc1aa08..4c4769bf6c 100644 --- a/configs/kwikstik-k40/src/k40_spi.c +++ b/configs/kwikstik-k40/src/k40_spi.c @@ -114,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" } @@ -128,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" } @@ -142,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/kwikstik-k40/src/k40_usbdev.c b/configs/kwikstik-k40/src/k40_usbdev.c index da038aa0a8..f4e206578c 100644 --- a/configs/kwikstik-k40/src/k40_usbdev.c +++ b/configs/kwikstik-k40/src/k40_usbdev.c @@ -108,6 +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/stm32f4discovery/src/stm32_spi.c b/configs/stm32f4discovery/src/stm32_spi.c index 9ff8a256d1..905dcd41b2 100644 --- a/configs/stm32f4discovery/src/stm32_spi.c +++ b/configs/stm32f4discovery/src/stm32_spi.c @@ -59,7 +59,7 @@ * Pre-processor Definitions ************************************************************************************/ -/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ +/* Enables debug output from this file */ #ifdef CONFIG_DEBUG_SPI # define spierr llerr