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 08:45:54 -06:00
parent 56c5da3030
commit b9aadf7242
38 changed files with 141 additions and 198 deletions
+8 -17
View File
@@ -69,27 +69,18 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* The following enable debug output from this file (needs CONFIG_DEBUG_FEATURES too). /* The following enable debug output from this file */
*
* CONFIG_SSP_DEBUG - Define to enable basic SSP debug
* CONFIG_SSP_VERBOSE - Define to enable verbose SSP debug
*/
#ifdef CONFIG_SSP_DEBUG #ifdef CONFIG_DEBUG_SPI
# define ssperr llerr # define ssperr llerr
# ifdef CONFIG_SSP_VERBOSE # define sspwarn llwarn
# define spiinfo llerr # define sspinfo llinfo
#else #else
# define spiinfo(x...)
# endif
#else
# undef CONFIG_SSP_VERBOSE
# define ssperr(x...) # define ssperr(x...)
# define spiinfo(x...) # define sspwarn(x...)
# define sspinfo(x...)
#endif #endif
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
@@ -576,7 +567,7 @@ static void ssp_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
* and (3) there are more bytes to be sent. * and (3) there are more bytes to be sent.
*/ */
spiinfo("TX: rxpending: %d nwords: %d\n", rxpending, nwords); sspinfo("TX: rxpending: %d nwords: %d\n", rxpending, nwords);
while ((ssp_getreg(priv, LPC43_SSP_SR_OFFSET) & SSP_SR_TNF) && while ((ssp_getreg(priv, LPC43_SSP_SR_OFFSET) & SSP_SR_TNF) &&
(rxpending < LPC43_SSP_FIFOSZ) && nwords) (rxpending < LPC43_SSP_FIFOSZ) && nwords)
{ {
@@ -599,7 +590,7 @@ static void ssp_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
/* Now, read the RX data from the RX FIFO while the RX FIFO is not empty */ /* Now, read the RX data from the RX FIFO while the RX FIFO is not empty */
spiinfo("RX: rxpending: %d\n", rxpending); sspinfo("RX: rxpending: %d\n", rxpending);
while (ssp_getreg(priv, LPC43_SSP_SR_OFFSET) & SSP_SR_RNE) while (ssp_getreg(priv, LPC43_SSP_SR_OFFSET) & SSP_SR_RNE)
{ {
data = ssp_getreg(priv, LPC43_SSP_DR_OFFSET); data = ssp_getreg(priv, LPC43_SSP_DR_OFFSET);
+6 -12
View File
@@ -58,27 +58,21 @@
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ************************************************************************************/
/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ /* Enables debug output from this file */
#undef SSP_DEBUG /* Define to enable debug */ #ifdef CONFIG_DEBUG_SPI
#undef SSP_VERBOSE /* Define to enable verbose debug */
#ifdef SSP_DEBUG
# define ssperr llerr # define ssperr llerr
# ifdef SSP_VERBOSE # define sspwarn llwarn
# define sspinfo llerr # define sspinfo llinfo
#else #else
# define sspinfo(x...)
# endif
#else
# undef SSP_VERBOSE
# define ssperr(x...) # define ssperr(x...)
# define sspwarn(x...)
# define sspinfo(x...) # define sspinfo(x...)
#endif #endif
/* Dump GPIO registers */ /* Dump GPIO registers */
#ifdef SSP_VERBOSE #ifdef CONFIG_DEBUG_GPIO
# define ssp_dumpgpio(m) lpc11_dumpgpio(SDCCS_GPIO, m) # define ssp_dumpgpio(m) lpc11_dumpgpio(SDCCS_GPIO, m)
#else #else
# define ssp_dumpgpio(m) # define ssp_dumpgpio(m)
+6 -12
View File
@@ -58,27 +58,21 @@
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ************************************************************************************/
/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ /* Enables debug output from this file */
#undef SSP_DEBUG /* Define to enable debug */ #ifdef CONFIG_DEBUG_SPI
#undef SSP_VERBOSE /* Define to enable verbose debug */
#ifdef SSP_DEBUG
# define ssperr llerr # define ssperr llerr
# ifdef SSP_VERBOSE # define sspwarn llwarn
# define sspinfo llerr # define sspinfo llinfo
#else #else
# define sspinfo(x...)
# endif
#else
# undef SSP_VERBOSE
# define ssperr(x...) # define ssperr(x...)
# define sspwarn(x...)
# define sspinfo(x...) # define sspinfo(x...)
#endif #endif
/* Dump GPIO registers */ /* Dump GPIO registers */
#ifdef SSP_VERBOSE #ifdef CONFIG_DEBUG_GPIO
# define ssp_dumpgpio(m) lpc17_dumpgpio(SDCCS_GPIO, m) # define ssp_dumpgpio(m) lpc17_dumpgpio(SDCCS_GPIO, m)
#else #else
# define ssp_dumpgpio(m) # define ssp_dumpgpio(m)
+2 -2
View File
@@ -140,7 +140,7 @@ int stm32_sdio_initialize(void)
g_sdio_dev = sdio_initialize(SDIO_SLOTNO); g_sdio_dev = sdio_initialize(SDIO_SLOTNO);
if (!g_sdio_dev) 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; return -ENODEV;
} }
@@ -151,7 +151,7 @@ int stm32_sdio_initialize(void)
ret = mmcsd_slotinitialize(SDIO_MINOR, g_sdio_dev); ret = mmcsd_slotinitialize(SDIO_MINOR, g_sdio_dev);
if (ret != OK) 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; return ret;
} }
+6 -6
View File
@@ -227,7 +227,7 @@ void weak_function stm32_spidev_initialize(void)
#ifdef CONFIG_STM32F7_SPI1 #ifdef CONFIG_STM32F7_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");
stm32_gpiowrite(g_spigpio[i], !selected); stm32_gpiowrite(g_spigpio[i], !selected);
} }
@@ -240,7 +240,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
#ifdef CONFIG_STM32F7_SPI2 #ifdef CONFIG_STM32F7_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");
stm32_gpiowrite(g_spigpio[i], !selected); stm32_gpiowrite(g_spigpio[i], !selected);
} }
@@ -253,7 +253,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
#ifdef CONFIG_STM32F7_SPI3 #ifdef CONFIG_STM32F7_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");
stm32_gpiowrite(g_spigpio[i], !selected); stm32_gpiowrite(g_spigpio[i], !selected);
} }
@@ -270,7 +270,7 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
void stm32_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) 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");
stm32_gpiowrite(g_spigpio[i], !selected); stm32_gpiowrite(g_spigpio[i], !selected);
} }
@@ -287,7 +287,7 @@ uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
void stm32_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) 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");
stm32_gpiowrite(g_spigpio[i], !selected); stm32_gpiowrite(g_spigpio[i], !selected);
} }
@@ -303,7 +303,7 @@ uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
# endif # endif
void stm32_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) 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");
stm32_gpiowrite(g_spigpio[i], !selected); stm32_gpiowrite(g_spigpio[i], !selected);
} }
+1 -1
View File
@@ -231,7 +231,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;
} }
+2 -2
View File
@@ -112,7 +112,7 @@ int board_pwm_setup(void)
pwm = stm32_pwminitialize(NUCLEO_F303RE_PWMTIMER); pwm = stm32_pwminitialize(NUCLEO_F303RE_PWMTIMER);
if (pwm == NULL) if (pwm == NULL)
{ {
pwmerr("Failed to get the STM32 PWM lower half\n"); pwmerr("ERROR: Failed to get the STM32 PWM lower half\n");
return -ENODEV; return -ENODEV;
} }
@@ -121,7 +121,7 @@ int board_pwm_setup(void)
ret = pwm_register("/dev/pwm0", pwm); ret = pwm_register("/dev/pwm0", pwm);
if (ret < 0) if (ret < 0)
{ {
pwmerr("pwm_register failed: %d\n", ret); pwmerr("ERROR: pwm_register failed: %d\n", ret);
return ret; return ret;
} }
+3 -3
View File
@@ -122,7 +122,7 @@ void weak_function stm32_spidev_initialize(void)
void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
bool selected) 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_SSD1351) #if defined(CONFIG_LCD_SSD1351)
if (devid == SPIDEV_DISPLAY) if (devid == SPIDEV_DISPLAY)
@@ -142,7 +142,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
bool selected) 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)
@@ -155,7 +155,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
bool selected) 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)
+2 -2
View File
@@ -114,7 +114,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
spi = stm32_spibus_initialize(1); spi = stm32_spibus_initialize(1);
if (spi == NULL) if (spi == NULL)
{ {
lcderr("Failed to initialize SPI port 1\n"); lcderr("ERROR: Failed to initialize SPI port 1\n");
} }
else else
{ {
@@ -123,7 +123,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
dev = ssd1351_initialize(spi, devno); dev = ssd1351_initialize(spi, devno);
if (dev == NULL) 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 else
{ {
+1 -1
View File
@@ -146,7 +146,7 @@ int board_adc_initialize(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;
} }
#endif #endif
+7 -14
View File
@@ -61,20 +61,13 @@
/* Enables debug output from this file */ /* Enables debug output from this file */
#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_SPI
# undef CONFIG_DEBUG_INFO
#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
@@ -111,7 +104,7 @@ void weak_function stm32_spidev_initialize(void)
g_spi1 = stm32_spibus_initialize(1); g_spi1 = stm32_spibus_initialize(1);
if (!g_spi1) if (!g_spi1)
{ {
spierr("[boot] FAILED to initialize SPI port 1\n"); spierr("ERROR: FAILED to initialize SPI port 1\n");
} }
#ifdef CONFIG_WL_CC3000 #ifdef CONFIG_WL_CC3000
@@ -166,7 +159,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");
#ifdef CONFIG_WL_CC3000 #ifdef CONFIG_WL_CC3000
if (devid == SPIDEV_WIRELESS) if (devid == SPIDEV_WIRELESS)
@@ -192,7 +185,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");
#ifdef CONFIG_WL_CC3000 #ifdef CONFIG_WL_CC3000
if (devid == SPIDEV_WIRELESS) if (devid == SPIDEV_WIRELESS)
@@ -211,7 +204,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)
+3 -3
View File
@@ -280,7 +280,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
@@ -295,7 +295,7 @@ int wireless_archinitialize(size_t max_rx_size)
spi = stm32_spibus_initialize(CONFIG_CC3000_SPIDEV); spi = stm32_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;
} }
@@ -305,7 +305,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;
} }
+1 -1
View File
@@ -146,7 +146,7 @@ int board_adc_initialize(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;
} }
#endif #endif
+7 -14
View File
@@ -61,20 +61,13 @@
/* Enables debug output from this file */ /* Enables debug output from this file */
#ifndef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_SPI
# undef CONFIG_DEBUG_INFO
#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
@@ -111,7 +104,7 @@ void weak_function stm32_spiinitialize(void)
g_spi1 = up_spiinitialize(1); g_spi1 = up_spiinitialize(1);
if (!g_spi1) if (!g_spi1)
{ {
spierr("[boot] FAILED to initialize SPI port 1\n"); spierr("ERROR: FAILED to initialize SPI port 1\n");
} }
#ifdef CONFIG_WL_CC3000 #ifdef CONFIG_WL_CC3000
@@ -166,7 +159,7 @@ void weak_function stm32_spiinitialize(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");
#ifdef CONFIG_WL_CC3000 #ifdef CONFIG_WL_CC3000
if (devid == SPIDEV_WIRELESS) if (devid == SPIDEV_WIRELESS)
@@ -192,7 +185,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");
#ifdef CONFIG_WL_CC3000 #ifdef CONFIG_WL_CC3000
if (devid == SPIDEV_WIRELESS) if (devid == SPIDEV_WIRELESS)
@@ -211,7 +204,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)
+3 -3
View File
@@ -280,7 +280,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
@@ -295,7 +295,7 @@ int wireless_archinitialize(size_t max_rx_size)
spi = up_spiinitialize(CONFIG_CC3000_SPIDEV); spi = up_spiinitialize(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;
} }
@@ -305,7 +305,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;
} }
+1 -1
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"
} }
@@ -114,7 +114,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
@@ -140,7 +140,7 @@ int board_tsc_setup(int minor)
ret = usbhost_mouse_init(); ret = usbhost_mouse_init();
if (ret < 0) if (ret < 0)
{ {
ierr("Failed to register USB HID mouse device class\n"); ierr("ERROR: Failed to register USB HID mouse device class\n");
return -ENODEV; return -ENODEV;
} }
+2 -2
View File
@@ -214,7 +214,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
spi = lpc17_sspbus_initialize(0); spi = lpc17_sspbus_initialize(0);
if (!spi) if (!spi)
{ {
gllerr("Failed to initialize SSP port 0\n"); gllerr("ERROR: Failed to initialize SSP port 0\n");
} }
else else
{ {
@@ -223,7 +223,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
dev = nokia_lcdinitialize(spi, devno); dev = nokia_lcdinitialize(spi, devno);
if (!dev) if (!dev)
{ {
gllerr("Failed to bind SSP port 0 to LCD %d: %d\n", devno); gllerr("ERROR: Failed to bind SSP port 0 to LCD %d: %d\n", devno);
} }
else else
{ {
+11 -17
View File
@@ -74,28 +74,22 @@
#endif #endif
/* Debug ********************************************************************/ /* Debug ********************************************************************/
/* The following enable debug output from this file (needs CONFIG_DEBUG_FEATURES too).
*
* CONFIG_SSP_DEBUG - Define to enable basic SSP debug
* CONFIG_SSP_VERBOSE - Define to enable verbose SSP debug
*/
#ifdef CONFIG_SSP_DEBUG /* The following enable debug output from this file */
#ifdef CONFIG_DEBUG_SPI
# define ssperr llerr # define ssperr llerr
# ifdef CONFIG_SSP_VERBOSE # define sspwarn llwarn
# define sspinfo llerr # define sspinfo llinfo
#else #else
# define sspinfo(x...)
# endif
#else
# undef CONFIG_SSP_VERBOSE
# define ssperr(x...) # define ssperr(x...)
# define sspwarn(x...)
# define sspinfo(x...) # define sspinfo(x...)
#endif #endif
/* Dump GPIO registers */ /* Dump GPIO registers */
#ifdef CONFIG_SSP_VERBOSE #ifdef CONFIG_DEBUG_GPIO
# define ssp_dumpssp0gpio(m) lpc17_dumpgpio(LPC1766STK_LCD_CS, m) # define ssp_dumpssp0gpio(m) lpc17_dumpgpio(LPC1766STK_LCD_CS, m)
# define ssp_dumpssp1gpio(m) lpc17_dumpgpio(LPC1766STK_MMC_CS, m) # define ssp_dumpssp1gpio(m) lpc17_dumpgpio(LPC1766STK_MMC_CS, m)
#else #else
@@ -284,7 +278,7 @@ void weak_function lpc1766stk_sspdev_initialize(void)
#ifdef CONFIG_LPC17_SSP0 #ifdef CONFIG_LPC17_SSP0
void lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
{ {
ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
if (devid == SPIDEV_DISPLAY) if (devid == SPIDEV_DISPLAY)
{ {
/* Assert/de-assert the CS pin to the card */ /* Assert/de-assert the CS pin to the card */
@@ -297,7 +291,7 @@ void lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
ssperr("Returning nothing\n"); sspinfo("Returning nothing\n");
return 0; return 0;
} }
#endif #endif
@@ -305,7 +299,7 @@ uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
#ifdef CONFIG_LPC17_SSP1 #ifdef CONFIG_LPC17_SSP1
void lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
{ {
ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
if (devid == SPIDEV_MMCSD) if (devid == SPIDEV_MMCSD)
{ {
/* Assert/de-assert the CS pin to the card */ /* Assert/de-assert the CS pin to the card */
@@ -318,7 +312,7 @@ void lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
ssperr("Returning SPI_STATUS_PRESENT\n"); sspinfo("Returning SPI_STATUS_PRESENT\n");
return SPI_STATUS_PRESENT; return SPI_STATUS_PRESENT;
} }
#endif #endif
+1 -1
View File
@@ -168,7 +168,7 @@ int stm32_adc_initialize(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;
} }
+1 -1
View File
@@ -110,7 +110,7 @@ void stm32_usbinitialize(void)
#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
+1 -1
View File
@@ -168,7 +168,7 @@ int stm32_adc_initialize(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;
} }
+2 -2
View File
@@ -139,7 +139,7 @@ int stm32_sdio_initialize(void)
g_sdio_dev = sdio_initialize(SDIO_SLOTNO); g_sdio_dev = sdio_initialize(SDIO_SLOTNO);
if (!g_sdio_dev) 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; return -ENODEV;
} }
@@ -150,7 +150,7 @@ int stm32_sdio_initialize(void)
ret = mmcsd_slotinitialize(SDIO_MINOR, g_sdio_dev); ret = mmcsd_slotinitialize(SDIO_MINOR, g_sdio_dev);
if (ret != OK) 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; return ret;
} }
+1 -1
View File
@@ -307,7 +307,7 @@ 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
@@ -180,7 +180,7 @@ void up_netinitialize(void)
spi = stm32_spibus_initialize(ENCX24J600_SPI_PORTNO); spi = stm32_spibus_initialize(ENCX24J600_SPI_PORTNO);
if (!spi) if (!spi)
{ {
nllerr("Failed to initialize SPI port %d\n", ENCX24J600_SPI_PORTNO); nllerr("ERROR: Failed to initialize SPI port %d\n", ENCX24J600_SPI_PORTNO);
return; return;
} }
@@ -190,7 +190,7 @@ void up_netinitialize(void)
if (ret < 0) if (ret < 0)
{ {
nllerr("Failed to bind SPI port %d ENCX24J600 device %d: %d\n", nllerr("ERROR: Failed to bind SPI port %d ENCX24J600 device %d: %d\n",
ENCX24J600_SPI_PORTNO, ENCX24J600_DEVNO, ret); ENCX24J600_SPI_PORTNO, ENCX24J600_DEVNO, ret);
return; return;
} }
+1 -1
View File
@@ -126,7 +126,7 @@ void weak_function stm32_spidev_initialize(void)
#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");
if (devid == SPIDEV_ETHERNET) if (devid == SPIDEV_ETHERNET)
{ {
+1 -1
View File
@@ -160,7 +160,7 @@ int stm32_adc_initialize(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;
} }
+1 -1
View File
@@ -311,7 +311,7 @@ void stm32_usbhost_vbusdrive(int iface, bool enable)
#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
+3 -3
View File
@@ -216,7 +216,7 @@ void up_netinitialize(void)
spi = str71_spibus_initialize(ENC28J60_SPI_PORTNO); spi = str71_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;
} }
@@ -225,7 +225,7 @@ void up_netinitialize(void)
ret = str71x_xticonfig(ENC28J60_IRQ, false); ret = str71x_xticonfig(ENC28J60_IRQ, false);
if (ret < 0) if (ret < 0)
{ {
nllerr("Failed configure interrupt for IRQ %d: %d\n", ENC28J60_IRQ, ret); nllerr("ERROR: Failed configure interrupt for IRQ %d: %d\n", ENC28J60_IRQ, ret);
return; return;
} }
@@ -240,7 +240,7 @@ void up_netinitialize(void)
ret = enc_initialize(spi, &g_enclower, ENC28J60_DEVNO); ret = enc_initialize(spi, &g_enclower, 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;
} }
+3 -3
View File
@@ -125,7 +125,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 (devid == SPIDEV_USER) if (devid == SPIDEV_USER)
{ {
stm32_gpiowrite(USER_CSn, !selected); stm32_gpiowrite(USER_CSn, !selected);
@@ -141,7 +141,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 defined(CONFIG_MMCSD) #if defined(CONFIG_MMCSD)
if (devid == SPIDEV_MMCSD) if (devid == SPIDEV_MMCSD)
{ {
@@ -161,7 +161,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)
+2 -2
View File
@@ -90,7 +90,7 @@ void stm32_usb_set_pwr_callback(xcpt_t pwr_changed_handler)
void stm32_usbinitialize(void) void stm32_usbinitialize(void)
{ {
ullerr("called\n"); ullinfo("called\n");
/* USB Soft Connect Pullup */ /* USB Soft Connect Pullup */
@@ -129,5 +129,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);
} }
+9 -23
View File
@@ -65,13 +65,11 @@
#ifdef CONFIG_DEBUG_SPI #ifdef CONFIG_DEBUG_SPI
# define ssperr llerr # define ssperr llerr
# ifdef CONFIG_DEBUG_INFO # define sspwarn llwarn
# define sspinfo llerr # define sspinfo llinfo
# else
# define sspinfo(x...)
# endif
#else #else
# define ssperr(x...) # define ssperr(x...)
# define sspwarn(x...)
# define sspinfo(x...) # define sspinfo(x...)
#endif #endif
@@ -83,18 +81,6 @@
# define ssp_dumpgpio(p,m) # define ssp_dumpgpio(p,m)
#endif #endif
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
@@ -158,12 +144,12 @@ void weak_function open1788_sspdev_initialize(void)
#ifdef CONFIG_LPC17_SSP0 #ifdef CONFIG_LPC17_SSP0
void lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
{ {
ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
} }
uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
ssperr("Returning nothing\n"); sspinfo("Returning nothing\n");
return 0; return 0;
} }
#endif #endif
@@ -171,7 +157,7 @@ uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
#ifdef CONFIG_LPC17_SSP1 #ifdef CONFIG_LPC17_SSP1
void lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
{ {
ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
if (devid == SPIDEV_TOUCHSCREEN) if (devid == SPIDEV_TOUCHSCREEN)
{ {
/* Assert/de-assert the CS pin to the touchscreen */ /* Assert/de-assert the CS pin to the touchscreen */
@@ -184,7 +170,7 @@ void lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
ssperr("Returning nothing\n"); sspinfo("Returning nothing\n");
return 0; return 0;
} }
#endif #endif
@@ -192,12 +178,12 @@ uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
#ifdef CONFIG_LPC17_SSP2 #ifdef CONFIG_LPC17_SSP2
void lpc17_ssp2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void lpc17_ssp2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
{ {
ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
} }
uint8_t lpc17_ssp2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t lpc17_ssp2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
ssperr("Returning nothing\n"); sspinfo("Returning nothing\n");
return 0; return 0;
} }
#endif #endif
+3 -3
View File
@@ -277,7 +277,7 @@ int board_tsc_setup(int minor)
FAR struct spi_dev_s *dev; FAR struct spi_dev_s *dev;
int ret; int ret;
ierr("initialized:%d minor:%d\n", initialized, minor); iinfo("initialized:%d minor:%d\n", initialized, minor);
DEBUGASSERT(minor == 0); DEBUGASSERT(minor == 0);
/* Since there is no uninitialized logic, this initialization can be /* Since there is no uninitialized logic, this initialization can be
@@ -301,7 +301,7 @@ int board_tsc_setup(int minor)
dev = lpc17_sspbus_initialize(CONFIG_ADS7843E_SPIDEV); dev = lpc17_sspbus_initialize(CONFIG_ADS7843E_SPIDEV);
if (!dev) if (!dev)
{ {
ierr("Failed to initialize SPI bus %d\n", CONFIG_ADS7843E_SPIDEV); ierr("ERROR: Failed to initialize SPI bus %d\n", CONFIG_ADS7843E_SPIDEV);
return -ENODEV; return -ENODEV;
} }
@@ -310,7 +310,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 minor=%d\n", ierr("ERROR: Failed to register touchscreen device minor=%d\n",
CONFIG_ADS7843E_DEVMINOR); CONFIG_ADS7843E_DEVMINOR);
/* up_spiuninitialize(dev); */ /* up_spiuninitialize(dev); */
return -ENODEV; return -ENODEV;
+8 -8
View File
@@ -123,13 +123,13 @@ enum spi_dev_e;
#ifdef CONFIG_PIC32MX_SPI1 #ifdef CONFIG_PIC32MX_SPI1
void pic32mx_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void pic32mx_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"
} }
uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
spierr("Returning nothing\n"); spiinfo("Returning nothing\n");
#warning "Missing logic" #warning "Missing logic"
return 0; return 0;
} }
@@ -145,13 +145,13 @@ int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
#ifdef CONFIG_PIC32MX_SPI1 #ifdef CONFIG_PIC32MX_SPI1
void pic32mx_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void pic32mx_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"
} }
uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
spierr("Returning nothing\n"); spiinfo("Returning nothing\n");
#warning "Missing logic" #warning "Missing logic"
return 0; return 0;
} }
@@ -167,13 +167,13 @@ int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
#ifdef CONFIG_PIC32MX_SPI3 #ifdef CONFIG_PIC32MX_SPI3
void pic32mx_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void pic32mx_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"
} }
uint8_t pic32mx_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t pic32mx_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
spierr("Returning nothing\n"); spiinfo("Returning nothing\n");
#warning "Missing logic" #warning "Missing logic"
return 0; return 0;
} }
@@ -189,13 +189,13 @@ int pic32mx_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
#ifdef CONFIG_PIC32MX_SPI4 #ifdef CONFIG_PIC32MX_SPI4
void pic32mx_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void pic32mx_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");
#warning "Missing logic" #warning "Missing logic"
} }
uint8_t pic32mx_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t pic32mx_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
spierr("Returning nothing\n"); spiinfo("Returning nothing\n");
#warning "Missing logic" #warning "Missing logic"
return 0; return 0;
} }
+10 -12
View File
@@ -82,16 +82,14 @@
#ifdef CONFIG_DEBUG_SPI #ifdef CONFIG_DEBUG_SPI
# define spierr llerr # define spierr llerr
# define spiwarn llwarn
# define spiinfo llinfo # define spiinfo llinfo
#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
************************************************************************************/ ************************************************************************************/
@@ -150,7 +148,7 @@ enum spi_dev_e;
#ifdef CONFIG_PIC32MX_SPI1 #ifdef CONFIG_PIC32MX_SPI1
void pic32mx_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void pic32mx_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_MMCSD) if (devid == SPIDEV_MMCSD)
{ {
@@ -179,7 +177,7 @@ uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
} }
} }
spierr("Returning %02x\n", ret); spiinfo("Returning %02x\n", ret);
return ret; return ret;
} }
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
@@ -194,13 +192,13 @@ int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
#ifdef CONFIG_PIC32MX_SPI2 #ifdef CONFIG_PIC32MX_SPI2
void pic31mx_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void pic31mx_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"
} }
uint8_t pic31mx_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t pic31mx_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
spierr("Returning nothing\n"); spiinfo("Returning nothing\n");
#warning "Missing logic" #warning "Missing logic"
return 0; return 0;
} }
@@ -217,13 +215,13 @@ int pic31mx_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
#ifdef CONFIG_PIC32MX_SPI3 #ifdef CONFIG_PIC32MX_SPI3
void pic32mx_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void pic32mx_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"
} }
uint8_t pic32mx_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t pic32mx_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
spierr("Returning nothing\n"); spiinfo("Returning nothing\n");
#warning "Missing logic" #warning "Missing logic"
return 0; return 0;
} }
@@ -240,13 +238,13 @@ int pic32mx_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
#ifdef CONFIG_PIC32MX_SPI4 #ifdef CONFIG_PIC32MX_SPI4
void pic32mx_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void pic32mx_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");
#warning "Missing logic" #warning "Missing logic"
} }
uint8_t pic32mx_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t pic32mx_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
spierr("Returning nothing\n"); spiinfo("Returning nothing\n");
#warning "Missing logic" #warning "Missing logic"
return 0; return 0;
} }
+5 -5
View File
@@ -1282,7 +1282,7 @@ static int tc_poll(FAR struct file *filep, FAR struct pollfd *fds,
if ((fds->events & POLLIN) == 0) if ((fds->events & POLLIN) == 0)
{ {
ierr("Missing POLLIN: revents: %08x\n", fds->revents); ierr("ERROR: Missing POLLIN: revents: %08x\n", fds->revents);
ret = -EDEADLK; ret = -EDEADLK;
goto errout; goto errout;
} }
@@ -1307,7 +1307,7 @@ static int tc_poll(FAR struct file *filep, FAR struct pollfd *fds,
if (i >= CONFIG_TOUCHSCREEN_NPOLLWAITERS) if (i >= CONFIG_TOUCHSCREEN_NPOLLWAITERS)
{ {
ierr("No availabled slot found: %d\n", i); ierr("ERROR: No available slot found: %d\n", i);
fds->priv = NULL; fds->priv = NULL;
ret = -EBUSY; ret = -EBUSY;
goto errout; goto errout;
@@ -1389,7 +1389,7 @@ int board_tsc_setup(int minor)
priv = (FAR struct tc_dev_s *)kmm_malloc(sizeof(struct tc_dev_s)); priv = (FAR struct tc_dev_s *)kmm_malloc(sizeof(struct tc_dev_s));
if (!priv) if (!priv)
{ {
ierr("kmm_malloc(%d) failed\n", sizeof(struct tc_dev_s)); ierr("ERROR: kmm_malloc(%d) failed\n", sizeof(struct tc_dev_s));
return -ENOMEM; return -ENOMEM;
} }
#endif #endif
@@ -1408,7 +1408,7 @@ int board_tsc_setup(int minor)
ret = register_driver(devname, &tc_fops, 0666, priv); ret = register_driver(devname, &tc_fops, 0666, priv);
if (ret < 0) if (ret < 0)
{ {
ierr("register_driver() failed: %d\n", ret); ierr("ERROR: register_driver() failed: %d\n", ret);
goto errout_with_priv; goto errout_with_priv;
} }
@@ -1420,7 +1420,7 @@ int board_tsc_setup(int minor)
ret = work_queue(HPWORK, &priv->work, tc_worker, priv, 0); ret = work_queue(HPWORK, &priv->work, tc_worker, priv, 0);
if (ret != 0) if (ret != 0)
{ {
ierr("Failed to queue work: %d\n", ret); ierr("ERROR: Failed to queue work: %d\n", ret);
goto errout_with_priv; goto errout_with_priv;
} }
+12 -12
View File
@@ -121,13 +121,13 @@ enum spi_dev_e;
#ifdef CONFIG_PIC32MZ_SPI1 #ifdef CONFIG_PIC32MZ_SPI1
void pic32mz_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void pic32mz_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"
} }
uint8_t pic32mz_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t pic32mz_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
spierr("Returning nothing\n"); spiinfo("Returning nothing\n");
#warning "Missing logic" #warning "Missing logic"
return 0; return 0;
} }
@@ -143,13 +143,13 @@ int pic32mz_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
#ifdef CONFIG_PIC32MZ_SPI2 #ifdef CONFIG_PIC32MZ_SPI2
void pic32mz_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void pic32mz_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"
} }
uint8_t pic32mz_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t pic32mz_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
spierr("Returning nothing\n"); spiinfo("Returning nothing\n");
#warning "Missing logic" #warning "Missing logic"
return 0; return 0;
} }
@@ -165,13 +165,13 @@ int pic32mz_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
#ifdef CONFIG_PIC32MZ_SPI3 #ifdef CONFIG_PIC32MZ_SPI3
void pic32mz_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void pic32mz_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"
} }
uint8_t pic32mz_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t pic32mz_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
spierr("Returning nothing\n"); spiinfo("Returning nothing\n");
#warning "Missing logic" #warning "Missing logic"
return 0; return 0;
} }
@@ -187,13 +187,13 @@ int pic32mz_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
#ifdef CONFIG_PIC32MZ_SPI4 #ifdef CONFIG_PIC32MZ_SPI4
void pic32mz_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void pic32mz_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");
#warning "Missing logic" #warning "Missing logic"
} }
uint8_t pic32mz_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t pic32mz_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
spierr("Returning nothing\n"); spiinfo("Returning nothing\n");
#warning "Missing logic" #warning "Missing logic"
return 0; return 0;
} }
@@ -209,13 +209,13 @@ int pic32mz_spi4cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
#ifdef CONFIG_PIC32MZ_SPI5 #ifdef CONFIG_PIC32MZ_SPI5
void pic32mz_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void pic32mz_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");
#warning "Missing logic" #warning "Missing logic"
} }
uint8_t pic32mz_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t pic32mz_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
spierr("Returning nothing\n"); spiinfo("Returning nothing\n");
#warning "Missing logic" #warning "Missing logic"
return 0; return 0;
} }
@@ -231,13 +231,13 @@ int pic32mz_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
#ifdef CONFIG_PIC32MZ_SPI6 #ifdef CONFIG_PIC32MZ_SPI6
void pic32mz_spi6select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) void pic32mz_spi6select(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"
} }
uint8_t pic32mz_spi6status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t pic32mz_spi6status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
spierr("Returning nothing\n"); spiinfo("Returning nothing\n");
#warning "Missing logic" #warning "Missing logic"
return 0; return 0;
} }
+1 -1
View File
@@ -72,7 +72,7 @@
/* Dump GPIO registers */ /* Dump GPIO registers */
#ifdef SSP_VERBOSE #ifdef CONFIG_DEBUG_GPIO
# define ssp_dumpgpio(m) lpc17_dumpgpio(SDCCS_GPIO, m) # define ssp_dumpgpio(m) lpc17_dumpgpio(SDCCS_GPIO, m)
#else #else
# define ssp_dumpgpio(m) # define ssp_dumpgpio(m)