configs/: Change some *err() message to *info() messages if what was a *dbg() message does not indicate and error condition.

This commit is contained in:
Gregory Nutt 2016-06-13 11:04:19 -06:00
parent 40f0481478
commit 94f5e87222
33 changed files with 70 additions and 98 deletions

View File

@ -259,7 +259,7 @@ int sam_sdinitialize(int minor)
spi = sam_mmcsd_spiinitialize(); spi = sam_mmcsd_spiinitialize();
if (!spi) 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; return -ENODEV;
} }
@ -273,7 +273,7 @@ int sam_sdinitialize(int minor)
ret = mmcsd_spislotinitialize(minor, SAM34_MMCSDSLOTNO, spi); ret = mmcsd_spislotinitialize(minor, SAM34_MMCSDSLOTNO, spi);
if (ret < 0) 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); SAM34_MMCSDSLOTNO, ret);
return ret; return ret;
} }

View File

@ -359,7 +359,7 @@ int board_tsc_setup(int minor)
static bool initialized = false; static bool initialized = false;
int ret; int ret;
ierr("minor %d\n", minor); iinfo("minor %d\n", minor);
DEBUGASSERT(minor == 0); DEBUGASSERT(minor == 0);
/* Have we already initialized? Since we never uninitialize we must prevent /* 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(); dev = sam_tsc_spiinitialize();
if (!dev) if (!dev)
{ {
ierr("Failed to initialize bit bang SPI\n"); ierr("ERROR: Failed to initialize bit bang SPI\n");
return -ENODEV; return -ENODEV;
} }
@ -392,7 +392,7 @@ int board_tsc_setup(int minor)
ret = ads7843e_register(dev, &g_tscinfo, CONFIG_ADS7843E_DEVMINOR); ret = ads7843e_register(dev, &g_tscinfo, CONFIG_ADS7843E_DEVMINOR);
if (ret < 0) if (ret < 0)
{ {
ierr("Failed to register touchscreen device\n"); ierr("ERROR: Failed to register touchscreen device\n");
/* up_spiuninitialize(dev); */ /* up_spiuninitialize(dev); */
return -ENODEV; return -ENODEV;
} }

View File

@ -155,7 +155,7 @@ int board_adc_setup(void)
ret = adc_register("/dev/adc0", adc); ret = adc_register("/dev/adc0", adc);
if (ret < 0) if (ret < 0)
{ {
aerr("adc_register failed: %d\n", ret); aerr("ERROR: adc_register failed: %d\n", ret);
return ret; return ret;
} }

View File

@ -58,28 +58,18 @@
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ************************************************************************************/
/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ /* Enables debug output from this file */
#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_SPI
#endif
#ifdef CONFIG_DEBUG_SPI #ifdef CONFIG_DEBUG_SPI
# define spierr llerr # define spierr llerr
# ifdef CONFIG_DEBUG_INFO # define spiwarn llwarn
# define spiinfo llerr # define spiinfo llinfo
# else
# define spiinfo(x...)
# endif
#else #else
# define spierr(x...) # define spierr(x...)
# define spiwarn(x...)
# define spiinfo(x...) # define spiinfo(x...)
#endif #endif
/************************************************************************************
* Private Functions
************************************************************************************/
/************************************************************************************ /************************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ************************************************************************************/
@ -141,7 +131,7 @@ void weak_function stm32_spidev_initialize(void)
#ifdef CONFIG_STM32_SPI1 #ifdef CONFIG_STM32_SPI1
void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) 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 */ /* 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 #ifdef CONFIG_STM32_SPI3
void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) 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");
} }

View File

@ -301,11 +301,8 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler)
#ifdef CONFIG_USBDEV #ifdef CONFIG_USBDEV
void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
{ {
ullerr("resume: %d\n", resume); ullinfo("resume: %d\n", resume);
} }
#endif #endif
#endif /* CONFIG_STM32_OTGFS */ #endif /* CONFIG_STM32_OTGFS */

View File

@ -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 */ { CMD, 0x5c }, /* enter write display ram mode */
{ END, 0x00 } { 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); fb_ssd1783_send_cmdlist(prepare_disp_write_cmds);
} }

View File

@ -84,7 +84,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
user0 = getreg32(TIVA_FLASH_USERREG0); user0 = getreg32(TIVA_FLASH_USERREG0);
user1 = getreg32(TIVA_FLASH_USERREG1); 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); DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
/* Re-format that MAC address the way that the network expects to see it */ /* Re-format that MAC address the way that the network expects to see it */

View File

@ -59,28 +59,20 @@
* Pre-processor Definitions * 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 #ifdef CONFIG_DEBUG_SPI
# define ssierr llerr # define ssierr llerr
#else # define ssiwarn llwarn
# define ssierr(x...) # define ssiinfo llinfo
#endif
/* Dump GPIO registers */
#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
# define ssiinfo llerr
# define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m) # define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
#else #else
# define ssierr(x...)
# define ssiwarn(x...)
# define ssiinfo(x...) # define ssiinfo(x...)
# define ssi_dumpgpio(m) # define ssi_dumpgpio(m)
#endif #endif
/************************************************************************************
* Private Functions
************************************************************************************/
/************************************************************************************ /************************************************************************************
* Public 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) 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() Entry");
ssi_dumpgpio("tiva_ssiselect() Exit"); ssi_dumpgpio("tiva_ssiselect() Exit");
} }
uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) 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; return SPI_STATUS_PRESENT;
} }

View File

@ -412,7 +412,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage)
off_t offset; off_t offset;
#endif #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); 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 /* 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) 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); DEBUGASSERT(tcb->xcp.far >= PG_PAGED_VBASE && tcb->xcp.far < PG_PAGED_VEND);
#if defined(CONFIG_PAGING_BINPATH) #if defined(CONFIG_PAGING_BINPATH)

View File

@ -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) 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" #warning "Missing logic"
} }

View File

@ -412,7 +412,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage)
off_t offset; off_t offset;
#endif #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); 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 /* 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) 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); DEBUGASSERT(tcb->xcp.far >= PG_PAGED_VBASE && tcb->xcp.far < PG_PAGED_VEND);
#if defined(CONFIG_PAGING_BINPATH) #if defined(CONFIG_PAGING_BINPATH)

View File

@ -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) 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" #warning "Missing logic"
} }

View File

@ -83,7 +83,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
user0 = getreg32(TIVA_FLASH_USERREG0); user0 = getreg32(TIVA_FLASH_USERREG0);
user1 = getreg32(TIVA_FLASH_USERREG1); 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); DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
/* Re-format that MAC address the way that the network expects to see it */ /* Re-format that MAC address the way that the network expects to see it */

View File

@ -100,7 +100,7 @@ static uint8_t g_nest;
#ifdef CONFIG_ARCH_LEDS #ifdef CONFIG_ARCH_LEDS
void board_autoled_initialize(void) void board_autoled_initialize(void)
{ {
lederr("Initializing\n"); ledinfo("Initializing\n");
/* Configure Port E, Bit 1 as an output, initial value=OFF */ /* Configure Port E, Bit 1 as an output, initial value=OFF */

View File

@ -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) 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) if (devid == SPIDEV_MMCSD)
{ {
/* Assert the CS pin to the card */ /* 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) 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; return SPI_STATUS_PRESENT;
} }

View File

@ -84,7 +84,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
user0 = getreg32(TIVA_FLASH_USERREG0); user0 = getreg32(TIVA_FLASH_USERREG0);
user1 = getreg32(TIVA_FLASH_USERREG1); 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); DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
/* Re-format that MAC address the way that the network expects to see it */ /* Re-format that MAC address the way that the network expects to see it */

View File

@ -97,7 +97,7 @@ static uint8_t g_nest;
#ifdef CONFIG_ARCH_LEDS #ifdef CONFIG_ARCH_LEDS
void board_autoled_initialize(void) void board_autoled_initialize(void)
{ {
lederr("Initializing\n"); ledinfo("Initializing\n");
/* Configure Port D, Bit 0 as an output, initial value=OFF */ /* Configure Port D, Bit 0 as an output, initial value=OFF */

View File

@ -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) 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() Entry");
if (devid == SPIDEV_MMCSD) 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) 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; return SPI_STATUS_PRESENT;
} }
#endif #endif

View File

@ -188,7 +188,7 @@ void up_netinitialize(void)
spi = stm32_spibus_initialize(ENC28J60_SPI_PORTNO); spi = stm32_spibus_initialize(ENC28J60_SPI_PORTNO);
if (!spi) 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; return;
} }
@ -201,7 +201,7 @@ void up_netinitialize(void)
ret = enc_initialize(spi, &g_enclower.lower, ENC28J60_DEVNO); ret = enc_initialize(spi, &g_enclower.lower, ENC28J60_DEVNO);
if (ret < 0) 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); ENC28J60_SPI_PORTNO, ENC28J60_DEVNO, ret);
return; return;
} }

View File

@ -93,7 +93,7 @@ int stm32_sdinitialize(int minor)
sdio = sdio_initialize(STM32_MMCSDSLOTNO); sdio = sdio_initialize(STM32_MMCSDSLOTNO);
if (!sdio) 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; return -ENODEV;
} }
@ -104,7 +104,7 @@ int stm32_sdinitialize(int minor)
ret = mmcsd_slotinitialize(minor, sdio); ret = mmcsd_slotinitialize(minor, sdio);
if (ret != OK) 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); STM32_MMCSDSLOTNO, minor);
} }

View File

@ -149,7 +149,7 @@ void weak_function stm32_spidev_initialize(void)
#ifdef CONFIG_STM32_SPI1 #ifdef CONFIG_STM32_SPI1
void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) 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 0 /* Need to study this */
if (devid == SPIDEV_LCD) 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 #ifdef CONFIG_STM32_SPI2
void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) 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) if (devid == SPIDEV_AUDIO)
{ {

View File

@ -114,6 +114,5 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
{ {
ullerr("resume: %d\n", resume); ullinfo("resume: %d\n", resume);
} }

View File

@ -257,7 +257,7 @@ int adxl345_archinitialize(int minor)
FAR struct spi_dev_s *dev; FAR struct spi_dev_s *dev;
int ret; int ret;
snerr("minor %d\n", minor); sninfo("minor %d\n", minor);
DEBUGASSERT(minor == 0); DEBUGASSERT(minor == 0);
/* Check if we are already initialized */ /* Check if we are already initialized */
@ -275,7 +275,7 @@ int adxl345_archinitialize(int minor)
dev = kl_spibus_initialize(CONFIG_ADXL345_SPIDEV); dev = kl_spibus_initialize(CONFIG_ADXL345_SPIDEV);
if (!dev) 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; return -ENODEV;
} }
@ -285,7 +285,7 @@ int adxl345_archinitialize(int minor)
adxl345_instantiate(dev, (FAR struct adxl345_config_s *)&g_adxl345config); adxl345_instantiate(dev, (FAR struct adxl345_config_s *)&g_adxl345config);
if (!g_adxl345config.handle) if (!g_adxl345config.handle)
{ {
snerr("Failed to instantiate the ADXL345 driver\n"); snerr("ERROR: Failed to instantiate the ADXL345 driver\n");
return -ENODEV; return -ENODEV;
} }
@ -294,7 +294,7 @@ int adxl345_archinitialize(int minor)
ret = adxl345_register(g_adxl345config.handle, CONFIG_ADXL345_DEVMINOR); ret = adxl345_register(g_adxl345config.handle, CONFIG_ADXL345_DEVMINOR);
if (ret < 0) if (ret < 0)
{ {
snerr("Failed to register ADXL345 driver: %d\n", ret); snerr("ERROR: Failed to register ADXL345 driver: %d\n", ret);
return ret; return ret;
} }
} }

View File

@ -98,7 +98,7 @@ int board_pwm_setup(void)
pwm = kl_pwminitialize(0); pwm = kl_pwminitialize(0);
if (!pwm) 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; return -ENODEV;
} }
@ -107,7 +107,7 @@ int board_pwm_setup(void)
ret = pwm_register("/dev/pwm0", pwm); ret = pwm_register("/dev/pwm0", pwm);
if (ret < 0) if (ret < 0)
{ {
aerr("pwm_register failed: %d\n", ret); aerr("ERROR: pwm_register failed: %d\n", ret);
return ret; return ret;
} }

View File

@ -289,7 +289,7 @@ int wireless_archinitialize(size_t max_rx_size)
/* Init SPI bus */ /* Init SPI bus */
ierr("minor %d\n", minor); iinfo("minor %d\n", minor);
DEBUGASSERT(CONFIG_CC3000_DEVMINOR == 0); DEBUGASSERT(CONFIG_CC3000_DEVMINOR == 0);
#ifdef CONFIG_CC3000_PROBES #ifdef CONFIG_CC3000_PROBES
@ -304,7 +304,7 @@ int wireless_archinitialize(size_t max_rx_size)
spi = kl_spibus_initialize(CONFIG_CC3000_SPIDEV); spi = kl_spibus_initialize(CONFIG_CC3000_SPIDEV);
if (!spi) 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; 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); int ret = cc3000_register(spi, &g_cc3000_info.dev, CONFIG_CC3000_DEVMINOR);
if (ret < 0) 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; return -ENODEV;
} }

View File

@ -98,7 +98,7 @@ int board_pwm_setup(void)
pwm = kl_pwminitialize(0); pwm = kl_pwminitialize(0);
if (!pwm) 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; return -ENODEV;
} }
@ -107,7 +107,7 @@ int board_pwm_setup(void)
ret = pwm_register("/dev/pwm0", pwm); ret = pwm_register("/dev/pwm0", pwm);
if (ret < 0) if (ret < 0)
{ {
aerr("pwm_register failed: %d\n", ret); aerr("ERROR: pwm_register failed: %d\n", ret);
return ret; return ret;
} }

View File

@ -125,7 +125,7 @@ void stm32_spidev_initialize(void)
#ifdef CONFIG_STM32_SPI1 #ifdef CONFIG_STM32_SPI1
void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) 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) 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 #ifdef CONFIG_STM32_SPI2
void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) 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) 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 #ifdef CONFIG_STM32_SPI3
void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) 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) uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)

View File

@ -153,12 +153,12 @@ int board_tsc_setup(int minor)
{ {
FAR struct spi_dev_s *dev; FAR struct spi_dev_s *dev;
ierr("minor %d\n", minor); iinfo("minor %d\n", minor);
dev = stm32_spibus_initialize(1); dev = stm32_spibus_initialize(1);
if (!dev) if (!dev)
{ {
ierr("Failed to initialize SPI bus\n"); ierr("ERROR: Failed to initialize SPI bus\n");
return -ENODEV; return -ENODEV;
} }

View File

@ -73,7 +73,7 @@
void stm32_usbinitialize(void) void stm32_usbinitialize(void)
{ {
ullerr("called\n"); ullinfo("called\n");
/* USB Soft Connect Pullup */ /* USB Soft Connect Pullup */
stm32_configgpio(GPIO_USB_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) void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
{ {
ullerr("resume: %d\n", resume); ullinfo("resume: %d\n", resume);
} }

View File

@ -53,20 +53,14 @@
#ifdef CONFIG_DEBUG_LEDS #ifdef CONFIG_DEBUG_LEDS
# define lederr llerr # define lederr llerr
# define ledwarn llwarn
# define ledinfo llinfo # define ledinfo llinfo
#else #else
# define lederr(x...) # define lederr(x...)
# define ledwarn(x...)
# define ledinfo(x...) # define ledinfo(x...)
#endif #endif
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/

View File

@ -114,7 +114,7 @@ void weak_function kinetis_spidev_initialize(void)
#ifdef CONFIG_KINETIS_SPI1 #ifdef CONFIG_KINETIS_SPI1
void kinetis_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) 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" # 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 #ifdef CONFIG_KINETIS_SPI2
void kinetis_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) 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" # 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 #ifdef CONFIG_KINETIS_SPI3
void kinetis_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) 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" # warning "Missing logic"
} }

View File

@ -108,6 +108,6 @@ int kinetis_usbpullup(FAR struct usbdev_s *dev, bool enable)
void kinetis_usbsuspend(FAR struct usbdev_s *dev, bool resume) void kinetis_usbsuspend(FAR struct usbdev_s *dev, bool resume)
{ {
ullerr("resume: %d\n", resume); ullinfo("resume: %d\n", resume);
#warning "Missing logic" #warning "Missing logic"
} }

View File

@ -59,7 +59,7 @@
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ************************************************************************************/
/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ /* Enables debug output from this file */
#ifdef CONFIG_DEBUG_SPI #ifdef CONFIG_DEBUG_SPI
# define spierr llerr # define spierr llerr