Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-22 22:20:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

drivers/: Change some nerr() ERRORS to ninfo() and nwarn() WARNINGS.

Browse Source
This commit is contained in:
Gregory Nutt
2016-06-12 09:26:00 -06:00
parent 61969a5f88
commit 0665c7e06c
34 changed files with 196 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/analog/ad5410.c
+1 -1
View File
@@ -256,7 +256,7 @@ static int dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg)
static int dac_ioctl(FAR struct dac_dev_s *dev, int cmd, unsigned long arg)
{
err("Fix me:Not Implemented\n");
err("ERROR: Fix me; Not Implemented\n");
return 0;
}
drivers/analog/ads1242.c
+4 -4
View File
@@ -403,15 +403,15 @@ static void ads1242_print_regs(FAR struct ads1242_dev_s *dev, char const *msg)
uint8_t mux_reg_value = 0;
uint8_t acr_reg_value = 0;
err("%s\n", msg);
info("%s\n", msg);
ads1242_read_reg(dev, ADS1242_REG_SETUP, &setup_reg_value);
ads1242_read_reg(dev, ADS1242_REG_MUX, &mux_reg_value);
ads1242_read_reg(dev, ADS1242_REG_ACR, &acr_reg_value);
err("SETUP %02X\n", setup_reg_value);
err("MUX %02X\n", mux_reg_value);
err("ACR %02X\n", acr_reg_value);
info("SETUP %02X\n", setup_reg_value);
info("MUX %02X\n", mux_reg_value);
info("ACR %02X\n", acr_reg_value);
}
#endif /* CONFIG_DEBUG_FEATURES && CONFIG_DEBUG_INFO */
drivers/analog/ads1255.c
+1 -1
View File
@@ -396,7 +396,7 @@ static void adc_rxint(FAR struct adc_dev_s *dev, bool enable)
static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg)
{
err("Fix me:Not Implemented\n");
err("ERROR: Fix me; Not Implemented\n");
return 0;
}
drivers/audio/audio_null.c
+1 -1
View File
@@ -375,7 +375,7 @@ static int null_configure(FAR struct audio_lowerhalf_s *dev,
#endif /* CONFIG_AUDIO_EXCLUDE_TONE */
default:
auderr(" Unrecognized feature unit\n");
auderr(" ERROR: Unrecognized feature unit\n");
break;
}
break;
drivers/audio/vs1053.c
+28 -25
View File
@@ -967,7 +967,7 @@ static void vs1053_feeddata(FAR struct vs1053_struct_s *dev)
/* Local stack copy of our active buffer */
apb = dev->apb;
//auderr("Entry apb=%p, Bytes left=%d\n", apb, apb->nbytes - apb->curbyte);
//audinfo("Entry apb=%p, Bytes left=%d\n", apb, apb->nbytes - apb->curbyte);
/* Setup pointer to the next sample in the buffer */
@@ -1039,12 +1039,16 @@ static void vs1053_feeddata(FAR struct vs1053_struct_s *dev)
{
(void)SPI_SETFREQUENCY(dev->spi, dev->spi_freq);
dev->hw_lower->disable(dev->hw_lower); /* Disable the DREQ interrupt */
auderr("HDAT1: 0x%0X HDAT0: 0x%0X\n",
vs1053_readreg(dev, VS1053_SCI_HDAT1),
vs1053_readreg(dev, VS1053_SCI_HDAT0));
audinfo("HDAT1: 0x%0X HDAT0: 0x%0X\n",
vs1053_readreg(dev, VS1053_SCI_HDAT1),
vs1053_readreg(dev, VS1053_SCI_HDAT0));
vs1053_writereg(dev, VS1053_SCI_WRAMADDR, VS1053_END_FILL_BYTE);
dev->endfillchar = vs1053_readreg(dev, VS1053_SCI_WRAM) >> 8;
auderr("EndFillChar: 0x%0X\n", dev->endfillchar);
audinfo("EndFillChar: 0x%0X\n", dev->endfillchar);
reg = vs1053_readreg(dev, VS1053_SCI_MODE);
vs1053_writereg(dev, VS1053_SCI_MODE, reg | VS1053_SM_RESET);
@@ -1171,7 +1175,7 @@ static void vs1053_feeddata(FAR struct vs1053_struct_s *dev)
dev->lower.upper(dev->lower.priv,
AUDIO_CALLBACK_IOERR, NULL, ret);
#endif
auderr("I/O error!\n");
auderr("ERROR: I/O error!\n");
goto err_out;
}
@@ -1181,7 +1185,7 @@ static void vs1053_feeddata(FAR struct vs1053_struct_s *dev)
apb = (struct ap_buffer_s *) dq_remfirst(&dev->apbq);
dev->apb = apb;
//auderr("Next Buffer = %p, bytes = %d\n", apb, apb ? apb->nbytes : 0);
//audinfo("Next Buffer = %p, bytes = %d\n", apb, apb ? apb->nbytes : 0);
if (apb == NULL)
{
sem_post(&dev->apbq_sem);
@@ -1274,7 +1278,7 @@ static void *vs1053_workerthread(pthread_addr_t pvarg)
#endif
uint8_t timeout;
auderr("Entry\n");
audinfo("Entry\n");
#ifndef CONFIG_AUDIO_EXCLUDE_STOP
dev->cancelmode = false;
@@ -1404,8 +1408,7 @@ static void *vs1053_workerthread(pthread_addr_t pvarg)
dev->lower.upper(dev->lower.priv, AUDIO_CALLBACK_COMPLETE, NULL, OK);
#endif
auderr("Exit\n");
audinfo("Exit\n");
return NULL;
}
@@ -1430,12 +1433,12 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower)
int ret;
void *value;
auderr("Entry\n");
audinfo("Entry\n");
vs1053_spi_lock(dev->spi, dev->spi_freq); /* Lock the device */
auderr("Entry HDAT1=0x%0X HDAT0=0x%0X\n",
vs1053_readreg(dev, VS1053_SCI_HDAT1),
vs1053_readreg(dev, VS1053_SCI_HDAT0));
audinfo("Entry HDAT1=0x%0X HDAT0=0x%0X\n",
vs1053_readreg(dev, VS1053_SCI_HDAT1),
vs1053_readreg(dev, VS1053_SCI_HDAT0));
vs1053_spi_unlock(dev->spi);
/* Do a soft reset, just in case */
@@ -1446,9 +1449,9 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower)
vs1053_spi_lock(dev->spi, dev->spi_freq); /* Lock the device */
vs1053_setfrequency(dev, CONFIG_VS1053_MP3_DECODE_FREQ);
auderr("Reset HDAT1=0x%0X HDAT0=0x%0X\n",
vs1053_readreg(dev, VS1053_SCI_HDAT1),
vs1053_readreg(dev, VS1053_SCI_HDAT0));
audinfo("Reset HDAT1=0x%0X HDAT0=0x%0X\n",
vs1053_readreg(dev, VS1053_SCI_HDAT1),
vs1053_readreg(dev, VS1053_SCI_HDAT0));
vs1053_spi_unlock(dev->spi);
/* Create a message queue for the worker thread */
@@ -1463,7 +1466,7 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower)
{
/* Error creating message queue! */
auderr("Couldn't allocate message queue\n");
auderr("ERROR: Couldn't allocate message queue\n");
return -ENOMEM;
}
@@ -1477,7 +1480,7 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower)
}
else
{
auderr("Error getting APB Queue sem\n");
auderr("ERROR: Error getting APB Queue sem\n");
return ret;
}
@@ -1485,7 +1488,7 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower)
if (dev->threadid != 0)
{
auderr("Joining old thread\n");
audinfo("Joining old thread\n");
pthread_join(dev->threadid, &value);
}
@@ -1496,17 +1499,17 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower)
(void)pthread_attr_setschedparam(&tattr, &sparam);
(void)pthread_attr_setstacksize(&tattr, CONFIG_VS1053_WORKER_STACKSIZE);
auderr("Starting workerthread\n");
audinfo("Starting workerthread\n");
ret = pthread_create(&dev->threadid, &tattr, vs1053_workerthread,
(pthread_addr_t) dev);
if (ret != OK)
{
auderr("Can't create worker thread, errno=%d\n", errno);
auderr("ERROR: Can't create worker thread, errno=%d\n", errno);
}
else
{
pthread_setname_np(dev->threadid, "vs1053");
auderr("Created worker thread\n");
audinfo("Created worker thread\n");
}
return ret;
@@ -1896,13 +1899,13 @@ struct audio_lowerhalf_s *vs1053_initialize(FAR struct spi_dev_s *spi,
id = (status & VS1053_SS_VER) >> VS1053_VER_SHIFT;
if (id != VS1053_VER_VS1053)
{
auderr("Unexpected VER bits: 0x%0X\n", id);
auderr("ERROR: Unexpected VER bits: 0x%0X\n", id);
kmm_free(dev);
return NULL;
}
else
{
auderr("VS1053 Detected!\n");
audinfo("VS1053 Detected!\n");
}
/* Attach our ISR to this device */
drivers/audio/wm8904.c
+3 -3
View File
@@ -283,7 +283,7 @@ uint16_t wm8904_readreg(FAR struct wm8904_dev_s *priv, uint8_t regaddr)
#ifdef CONFIG_I2C_RESET
/* Perhaps the I2C bus is locked up? Try to shake the bus free */
auderr("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
audwarn("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
ret = I2C_RESET(priv->i2c);
if (ret < 0)
@@ -359,7 +359,7 @@ static void wm8904_writereg(FAR struct wm8904_dev_s *priv, uint8_t regaddr,
#ifdef CONFIG_I2C_RESET
/* Perhaps the I2C bus is locked up? Try to shake the bus free */
auderr("WARNING: i2c_write failed: %d ... Resetting\n", ret);
audwarn("WARNING: i2c_write failed: %d ... Resetting\n", ret);
ret = I2C_RESET(priv->i2c);
if (ret < 0)
@@ -1207,7 +1207,7 @@ static int wm8904_configure(FAR struct audio_lowerhalf_s *dev,
#endif /* CONFIG_AUDIO_EXCLUDE_TONE */
default:
auderr(" Unrecognized feature unit\n");
auderr(" ERROR: Unrecognized feature unit\n");
ret = -ENOTTY;
break;
}
drivers/bch/bchdev_register.c
+2 -2
View File
@@ -86,7 +86,7 @@ int bchdev_register(FAR const char *blkdev, FAR const char *chardev,
ret = bchlib_setup(blkdev, readonly, &handle);
if (ret < 0)
{
ferr("bchlib_setup failed: %d\n", -ret);
ferr("ERROR: bchlib_setup failed: %d\n", -ret);
return ret;
}
@@ -95,7 +95,7 @@ int bchdev_register(FAR const char *blkdev, FAR const char *chardev,
ret = register_driver(chardev, &bch_fops, 0666, handle);
if (ret < 0)
{
ferr("register_driver failed: %d\n", -ret);
ferr("ERROR: register_driver failed: %d\n", -ret);
bchlib_teardown(handle);
handle = NULL;
}
drivers/bch/bchdev_unregister.c
+2 -2
View File
@@ -103,7 +103,7 @@ int bchdev_unregister(FAR const char *chardev)
fd = open(chardev, O_RDONLY);
if (fd < 0)
{
err("Failed to open %s: %d\n", chardev, errno);
err("ERROR: Failed to open %s: %d\n", chardev, errno);
return -errno;
}
@@ -116,7 +116,7 @@ int bchdev_unregister(FAR const char *chardev)
if (ret < 0)
{
err("ioctl failed: %d\n", errno);
err("ERROR: ioctl failed: %d\n", errno);
return -errno;
}
drivers/bch/bchlib_read.c
+1 -1
View File
@@ -160,7 +160,7 @@ ssize_t bchlib_read(FAR void *handle, FAR char *buffer, size_t offset, size_t le
sector, nsectors);
if (ret < 0)
{
ferr("Read failed: %d\n");
ferr("ERROR: Read failed: %d\n");
return ret;
}
drivers/bch/bchlib_setup.c
+6 -6
View File
@@ -96,7 +96,7 @@ int bchlib_setup(const char *blkdev, bool readonly, FAR void **handle)
bch = (FAR struct bchlib_s *)kmm_zalloc(sizeof(struct bchlib_s));
if (!bch)
{
ferr("Failed to allocate BCH structure\n");
ferr("ERROR: Failed to allocate BCH structure\n");
return -ENOMEM;
}
@@ -105,7 +105,7 @@ int bchlib_setup(const char *blkdev, bool readonly, FAR void **handle)
ret = open_blockdriver(blkdev, readonly ? MS_RDONLY : 0, &bch->inode);
if (ret < 0)
{
ferr("Failed to open driver %s: %d\n", blkdev, -ret);
ferr("ERROR: Failed to open driver %s: %d\n", blkdev, -ret);
goto errout_with_bch;
}
@@ -114,20 +114,20 @@ int bchlib_setup(const char *blkdev, bool readonly, FAR void **handle)
ret = bch->inode->u.i_bops->geometry(bch->inode, &geo);
if (ret < 0)
{
ferr("geometry failed: %d\n", -ret);
ferr("ERROR: geometry failed: %d\n", -ret);
goto errout_with_bch;
}
if (!geo.geo_available)
{
ferr("geometry failed: %d\n", -ret);
ferr("ERROR: geometry failed: %d\n", -ret);
ret = -ENODEV;
goto errout_with_bch;
}
if (!readonly && (!bch->inode->u.i_bops->write || !geo.geo_writeenabled))
{
ferr("write access not supported\n");
ferr("ERROR: write access not supported\n");
ret = -EACCES;
goto errout_with_bch;
}
@@ -145,7 +145,7 @@ int bchlib_setup(const char *blkdev, bool readonly, FAR void **handle)
bch->buffer = (FAR uint8_t *)kmm_malloc(bch->sectsize);
if (!bch->buffer)
{
ferr("Failed to allocate sector buffer\n");
ferr("ERROR: Failed to allocate sector buffer\n");
ret = -ENOMEM;
goto errout_with_bch;
}
drivers/bch/bchlib_write.c
+2 -2
View File
@@ -162,7 +162,7 @@ ssize_t bchlib_write(FAR void *handle, FAR const char *buffer, size_t offset, si
sector, nsectors);
if (ret < 0)
{
ferr("Write failed: %d\n", ret);
ferr("ERROR: Write failed: %d\n", ret);
return ret;
}
@@ -204,7 +204,7 @@ ssize_t bchlib_write(FAR void *handle, FAR const char *buffer, size_t offset, si
ret = bchlib_flushsector(bch);
if (ret < 0)
{
ferr("Flush failed: %d\n", ret);
ferr("ERROR: Flush failed: %d\n", ret);
return ret;
}
drivers/input/ads7843e.c
+11 -11
View File
@@ -427,7 +427,7 @@ static int ads7843e_waitsample(FAR struct ads7843e_dev_s *priv,
* the failure now.
*/
ierr("sem_wait: %d\n", errno);
ierr("ERROR: sem_wait: %d\n", errno);
DEBUGASSERT(errno == EINTR);
ret = -EINTR;
goto errout;
@@ -498,7 +498,7 @@ static int ads7843e_schedule(FAR struct ads7843e_dev_s *priv)
ret = work_queue(HPWORK, &priv->work, ads7843e_worker, priv, 0);
if (ret != 0)
{
illerr("Failed to queue work: %d\n", ret);
illerr("ERROR: Failed to queue work: %d\n", ret);
}
return OK;
@@ -870,7 +870,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le
* handle smaller reads... but why?
*/
ierr("Unsupported read size: %d\n", len);
ierr("ERROR: Unsupported read size: %d\n", len);
return -ENOSYS;
}
@@ -881,7 +881,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le
{
/* This should only happen if the wait was cancelled by an signal */
ierr("sem_wait: %d\n", errno);
ierr("ERROR: sem_wait: %d\n", errno);
DEBUGASSERT(errno == EINTR);
return -EINTR;
}
@@ -910,7 +910,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le
{
/* We might have been awakened by a signal */
ierr("ads7843e_waitsample: %d\n", ret);
ierr("ERROR: ads7843e_waitsample: %d\n", ret);
goto errout;
}
}
@@ -1170,7 +1170,7 @@ int ads7843e_register(FAR struct spi_dev_s *spi,
priv = (FAR struct ads7843e_dev_s *)kmm_malloc(sizeof(struct ads7843e_dev_s));
if (!priv)
{
ierr("kmm_malloc(%d) failed\n", sizeof(struct ads7843e_dev_s));
ierr("ERROR: kmm_malloc(%d) failed\n", sizeof(struct ads7843e_dev_s));
return -ENOMEM;
}
#endif
@@ -1197,12 +1197,12 @@ int ads7843e_register(FAR struct spi_dev_s *spi,
ret = config->attach(config, ads7843e_interrupt);
if (ret < 0)
{
ierr("Failed to attach interrupt\n");
ierr("ERROR: Failed to attach interrupt\n");
goto errout_with_priv;
}
ierr("Mode: %d Bits: 8 Frequency: %d\n",
CONFIG_ADS7843E_SPIMODE, CONFIG_ADS7843E_FREQUENCY);
iinfo("Mode: %d Bits: 8 Frequency: %d\n",
CONFIG_ADS7843E_SPIMODE, CONFIG_ADS7843E_FREQUENCY);
/* Lock the SPI bus so that we have exclusive access */
@@ -1224,7 +1224,7 @@ int ads7843e_register(FAR struct spi_dev_s *spi,
ret = register_driver(devname, &ads7843e_fops, 0666, priv);
if (ret < 0)
{
ierr("register_driver() failed: %d\n", ret);
ierr("ERROR: register_driver() failed: %d\n", ret);
goto errout_with_priv;
}
@@ -1246,7 +1246,7 @@ int ads7843e_register(FAR struct spi_dev_s *spi,
ret = work_queue(HPWORK, &priv->work, ads7843e_worker, priv, 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;
}
drivers/input/max11802.c
+12 -12
View File
@@ -392,7 +392,7 @@ static int max11802_waitsample(FAR struct max11802_dev_s *priv,
* the failure now.
*/
ierr("sem_wait: %d\n", errno);
ierr("ERROR: sem_wait: %d\n", errno);
DEBUGASSERT(errno == EINTR);
ret = -EINTR;
goto errout;
@@ -463,7 +463,7 @@ static int max11802_schedule(FAR struct max11802_dev_s *priv)
ret = work_queue(HPWORK, &priv->work, max11802_worker, priv, 0);
if (ret != 0)
{
illerr("Failed to queue work: %d\n", ret);
illerr("ERROR: Failed to queue work: %d\n", ret);
}
return OK;
@@ -877,7 +877,7 @@ static ssize_t max11802_read(FAR struct file *filep, FAR char *buffer,
* handle smaller reads... but why?
*/
ierr("Unsupported read size: %d\n", len);
ierr("ERROR: Unsupported read size: %d\n", len);
return -ENOSYS;
}
@@ -888,7 +888,7 @@ static ssize_t max11802_read(FAR struct file *filep, FAR char *buffer,
{
/* This should only happen if the wait was cancelled by an signal */
ierr("sem_wait: %d\n", errno);
ierr("ERROR: sem_wait: %d\n", errno);
DEBUGASSERT(errno == EINTR);
return -EINTR;
}
@@ -917,7 +917,7 @@ static ssize_t max11802_read(FAR struct file *filep, FAR char *buffer,
{
/* We might have been awakened by a signal */
ierr("max11802_waitsample: %d\n", ret);
ierr("ERROR: max11802_waitsample: %d\n", ret);
goto errout;
}
}
@@ -1173,7 +1173,7 @@ int max11802_register(FAR struct spi_dev_s *spi,
priv = (FAR struct max11802_dev_s *)kmm_malloc(sizeof(struct max11802_dev_s));
if (!priv)
{
ierr("kmm_malloc(%d) failed\n", sizeof(struct max11802_dev_s));
ierr("ERROR: kmm_malloc(%d) failed\n", sizeof(struct max11802_dev_s));
return -ENOMEM;
}
#endif
@@ -1200,12 +1200,12 @@ int max11802_register(FAR struct spi_dev_s *spi,
ret = config->attach(config, max11802_interrupt);
if (ret < 0)
{
ierr("Failed to attach interrupt\n");
ierr("ERROR: Failed to attach interrupt\n");
goto errout_with_priv;
}
ierr("Mode: %d Bits: 8 Frequency: %d\n",
CONFIG_MAX11802_SPIMODE, CONFIG_MAX11802_FREQUENCY);
iinfo("Mode: %d Bits: 8 Frequency: %d\n",
CONFIG_MAX11802_SPIMODE, CONFIG_MAX11802_FREQUENCY);
/* Lock the SPI bus so that we have exclusive access */
@@ -1246,7 +1246,7 @@ int max11802_register(FAR struct spi_dev_s *spi,
if (ret != MAX11802_MODE)
{
ierr("max11802 mode readback failed: %02x\n", ret);
ierr("ERROR: max11802 mode readback failed: %02x\n", ret);
goto errout_with_priv;
}
@@ -1258,7 +1258,7 @@ int max11802_register(FAR struct spi_dev_s *spi,
ret = register_driver(devname, &max11802_fops, 0666, priv);
if (ret < 0)
{
ierr("register_driver() failed: %d\n", ret);
ierr("ERROR: register_driver() failed: %d\n", ret);
goto errout_with_priv;
}
@@ -1281,7 +1281,7 @@ int max11802_register(FAR struct spi_dev_s *spi,
ret = work_queue(HPWORK, &priv->work, max11802_worker, priv, 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;
}
drivers/input/mxt.c
+7 -7
View File
@@ -343,7 +343,7 @@ static int mxt_getreg(FAR struct mxt_dev_s *priv, uint16_t regaddr,
#ifdef CONFIG_I2C_RESET
/* Perhaps the I2C bus is locked up? Try to shake the bus free */
ierr("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
iwarn("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
ret = I2C_RESET(priv->i2c);
if (ret < 0)
@@ -417,7 +417,7 @@ static int mxt_putreg(FAR struct mxt_dev_s *priv, uint16_t regaddr,
#ifdef CONFIG_I2C_RESET
/* Perhaps the I2C bus is locked up? Try to shake the bus free */
ierr("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
iwarn("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
ret = I2C_RESET(priv->i2c);
if (ret < 0)
@@ -1097,7 +1097,7 @@ static int mxt_interrupt(FAR const struct mxt_lower_s *lower, FAR void *arg)
ret = work_queue(HPWORK, &priv->work, mxt_worker, priv, 0);
if (ret != 0)
{
illerr("Failed to queue work: %d\n", ret);
illerr("ERROR: Failed to queue work: %d\n", ret);
}
/* Clear any pending interrupts and return success */
@@ -1575,7 +1575,7 @@ static int mxt_poll(FAR struct file *filep, FAR struct pollfd *fds,
if ((fds->events & POLLIN) == 0)
{
ierr("Missing POLLIN: revents: %08x\n", fds->revents);
ierr("ERROR: Missing POLLIN: revents: %08x\n", fds->revents);
ret = -EDEADLK;
goto errout;
}
@@ -1600,7 +1600,7 @@ static int mxt_poll(FAR struct file *filep, FAR struct pollfd *fds,
if (i >= CONFIG_MXT_NPOLLWAITERS)
{
ierr("No availabled slot found: %d\n", i);
ierr("ERROR: No availabled slot found: %d\n", i);
fds->priv = NULL;
ret = -EBUSY;
goto errout;
@@ -1897,7 +1897,7 @@ int mxt_register(FAR struct i2c_master_s *i2c,
ret = MXT_ATTACH(lower, mxt_interrupt, priv);
if (ret < 0)
{
ierr("Failed to attach interrupt\n");
ierr("ERROR: Failed to attach interrupt\n");
goto errout_with_priv;
}
@@ -1918,7 +1918,7 @@ int mxt_register(FAR struct i2c_master_s *i2c,
ret = register_driver(devname, &mxt_fops, 0666, priv);
if (ret < 0)
{
ierr("register_driver() failed: %d\n", ret);
ierr("ERROR: register_driver() failed: %d\n", ret);
goto errout_with_hwinit;
}
drivers/input/stmpe811_adc.c
+4 -4
View File
@@ -101,7 +101,7 @@ int stmpe811_adcinitialize(STMPE811_HANDLE handle)
if (ret < 0)
{
int errval = errno;
ierr("sem_wait failed: %d\n", errval);
ierr("ERROR: sem_wait failed: %d\n", errval);
return -errval;
}
@@ -161,7 +161,7 @@ int stmpe811_adcconfig(STMPE811_HANDLE handle, int pin)
if (ret < 0)
{
int errval = errno;
ierr("sem_wait failed: %d\n", errval);
ierr("ERROR: sem_wait failed: %d\n", errval);
return -errval;
}
@@ -169,7 +169,7 @@ int stmpe811_adcconfig(STMPE811_HANDLE handle, int pin)
if ((priv->inuse & pinmask) != 0)
{
ierr("PIN%d is already in-use\n", pin);
ierr("ERROR: PIN%d is already in-use\n", pin);
sem_post(&priv->exclsem);
return -EBUSY;
}
@@ -221,7 +221,7 @@ uint16_t stmpe811_adcread(STMPE811_HANDLE handle, int pin)
if (ret < 0)
{
int errval = errno;
ierr("sem_wait failed: %d\n", errval);
ierr("ERROR: sem_wait failed: %d\n", errval);
return -errval;
}
drivers/input/stmpe811_base.c
+4 -4
View File
@@ -199,7 +199,7 @@ static int stmpe811_interrupt(int irq, FAR void *context)
ret = work_queue(HPWORK, &priv->work, stmpe811_worker, priv, 0);
if (ret != 0)
{
illerr("Failed to queue work: %d\n", ret);
illerr("ERROR: Failed to queue work: %d\n", ret);
}
}
@@ -422,7 +422,7 @@ uint8_t stmpe811_getreg8(FAR struct stmpe811_dev_s *priv, uint8_t regaddr)
ret = I2C_TRANSFER(priv->i2c, msg, 2);
if (ret < 0)
{
ierr("I2C_TRANSFER failed: %d\n", ret);
ierr("ERROR: I2C_TRANSFER failed: %d\n", ret);
return 0;
}
@@ -479,7 +479,7 @@ void stmpe811_putreg8(FAR struct stmpe811_dev_s *priv,
ret = I2C_TRANSFER(priv->i2c, &msg, 1);
if (ret < 0)
{
ierr("I2C_TRANSFER failed: %d\n", ret);
ierr("ERROR: I2C_TRANSFER failed: %d\n", ret);
}
}
#endif
@@ -530,7 +530,7 @@ uint16_t stmpe811_getreg16(FAR struct stmpe811_dev_s *priv, uint8_t regaddr)
ret = I2C_TRANSFER(priv->i2c, msg, 2);
if (ret < 0)
{
ierr("I2C_TRANSFER failed: %d\n", ret);
ierr("ERROR: I2C_TRANSFER failed: %d\n", ret);
return 0;
}
drivers/input/stmpe811_gpio.c
+6 -6
View File
@@ -144,7 +144,7 @@ int stmpe811_gpioconfig(STMPE811_HANDLE handle, uint8_t pinconfig)
if (ret < 0)
{
int errval = errno;
ierr("sem_wait failed: %d\n", errval);
ierr("ERROR: sem_wait failed: %d\n", errval);
return -errval;
}
@@ -152,7 +152,7 @@ int stmpe811_gpioconfig(STMPE811_HANDLE handle, uint8_t pinconfig)
if ((priv->inuse & pinmask) != 0)
{
ierr("PIN%d is already in-use\n", pin);
ierr("ERROR: PIN%d is already in-use\n", pin);
sem_post(&priv->exclsem);
return -EBUSY;
}
@@ -259,7 +259,7 @@ void stmpe811_gpiowrite(STMPE811_HANDLE handle, uint8_t pinconfig, bool value)
ret = sem_wait(&priv->exclsem);
if (ret < 0)
{
ierr("sem_wait failed: %d\n", errno);
ierr("ERROR: sem_wait failed: %d\n", errno);
return;
}
@@ -313,7 +313,7 @@ int stmpe811_gpioread(STMPE811_HANDLE handle, uint8_t pinconfig, bool *value)
if (ret < 0)
{
int errval = errno;
ierr("sem_wait failed: %d\n", errval);
ierr("ERROR: sem_wait failed: %d\n", errval);
return -errval;
}
@@ -362,7 +362,7 @@ int stmpe811_gpioattach(STMPE811_HANDLE handle, uint8_t pinconfig,
if (ret < 0)
{
int errval = errno;
ierr("sem_wait failed: %d\n", errval);
ierr("ERROR: sem_wait failed: %d\n", errval);
return -errval;
}
@@ -438,7 +438,7 @@ void stmpe811_gpioworker(FAR struct stmpe811_dev_s *priv)
}
else
{
illerr("No handler for PIN%d, GPIO_INTSTA: %02x\n", pin, regval);
illerr("ERROR: No handler for PIN%d, GPIO_INTSTA: %02x\n", pin, regval);
}
/* Clear the pending GPIO interrupt by writing a '1' to the
drivers/input/stmpe811_tsc.c
+1 -1
View File
@@ -786,7 +786,7 @@ static void stmpe811_timeout(int argc, uint32_t arg1, ...)
ret = work_queue(HPWORK, &priv->timeout, stmpe811_timeoutworker, priv, 0);
if (ret != 0)
{
illerr("Failed to queue work: %d\n", ret);
illerr("ERROR: Failed to queue work: %d\n", ret);
}
}
}
drivers/input/tsc2007.c
+13 -13
View File
@@ -456,7 +456,7 @@ static int tsc2007_activate(FAR struct tsc2007_dev_s *priv, uint8_t cmd)
ret = I2C_TRANSFER(priv->i2c, &msg, 1);
if (ret < 0)
{
ierr("I2C_TRANSFER failed: %d\n", ret);
ierr("ERROR: I2C_TRANSFER failed: %d\n", ret);
}
return ret;
}
@@ -495,7 +495,7 @@ static int tsc2007_transfer(FAR struct tsc2007_dev_s *priv, uint8_t cmd)
ret = I2C_TRANSFER(priv->i2c, &msg, 1);
if (ret < 0)
{
ierr("I2C_TRANSFER failed: %d\n", ret);
ierr("ERROR: I2C_TRANSFER failed: %d\n", ret);
return ret;
}
@@ -540,7 +540,7 @@ static int tsc2007_transfer(FAR struct tsc2007_dev_s *priv, uint8_t cmd)
ret = I2C_TRANSFER(priv->i2c, &msg, 1);
if (ret < 0)
{
ierr("I2C_TRANSFER failed: %d\n", ret);
ierr("ERROR: I2C_TRANSFER failed: %d\n", ret);
return ret;
}
@@ -672,7 +672,7 @@ static void tsc2007_worker(FAR void *arg)
if (z1 == 0)
{
ierr("Z1 zero\n");
ierr("ERROR: Z1 zero\n");
pressure = 0;
}
else
@@ -687,7 +687,7 @@ static void tsc2007_worker(FAR void *arg)
if (pressure > 0x0fff)
{
ierr("Dropped out-of-range pressure: %d\n", pressure);
ierr("ERROR: Dropped out-of-range pressure: %d\n", pressure);
pressure = 0;
}
}
@@ -783,7 +783,7 @@ static int tsc2007_interrupt(int irq, FAR void *context)
ret = work_queue(HPWORK, &priv->work, tsc2007_worker, priv, 0);
if (ret != 0)
{
illerr("Failed to queue work: %d\n", ret);
illerr("ERROR: Failed to queue work: %d\n", ret);
}
/* Clear any pending interrupts and return success */
@@ -1131,7 +1131,7 @@ static int tsc2007_poll(FAR struct file *filep, FAR struct pollfd *fds,
if ((fds->events & POLLIN) == 0)
{
ierr("Missing POLLIN: revents: %08x\n", fds->revents);
ierr("ERROR: Missing POLLIN: revents: %08x\n", fds->revents);
ret = -EDEADLK;
goto errout;
}
@@ -1156,7 +1156,7 @@ static int tsc2007_poll(FAR struct file *filep, FAR struct pollfd *fds,
if (i >= CONFIG_TSC2007_NPOLLWAITERS)
{
ierr("No availabled slot found: %d\n", i);
ierr("ERROR: No available slot found: %d\n", i);
fds->priv = NULL;
ret = -EBUSY;
goto errout;
@@ -1242,7 +1242,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
priv = (FAR struct tsc2007_dev_s *)kmm_malloc(sizeof(struct tsc2007_dev_s));
if (!priv)
{
ierr("kmm_malloc(%d) failed\n", sizeof(struct tsc2007_dev_s));
ierr("ERROR: kmm_malloc(%d) failed\n", sizeof(struct tsc2007_dev_s));
return -ENOMEM;
}
#endif
@@ -1265,7 +1265,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
ret = config->attach(config, tsc2007_interrupt);
if (ret < 0)
{
ierr("Failed to attach interrupt\n");
ierr("ERROR: Failed to attach interrupt\n");
goto errout_with_priv;
}
@@ -1276,7 +1276,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
ret = tsc2007_transfer(priv, TSC2007_ENABLE_PENIRQ);
if (ret < 0)
{
ierr("tsc2007_transfer failed: %d\n", ret);
ierr("ERROR: tsc2007_transfer failed: %d\n", ret);
goto errout_with_priv;
}
@@ -1288,7 +1288,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
ret = register_driver(devname, &tsc2007_fops, 0666, priv);
if (ret < 0)
{
ierr("register_driver() failed: %d\n", ret);
ierr("ERROR: register_driver() failed: %d\n", ret);
goto errout_with_priv;
}
@@ -1311,7 +1311,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
ret = work_queue(HPWORK, &priv->work, tsc2007_worker, priv, 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;
}
drivers/lcd/ili9341.c
+8 -6
View File
@@ -371,9 +371,11 @@
#ifdef CONFIG_DEBUG_LCD
# define lcderr err
# define lcdinfo warn
# define lcdinfo info
#else
# define lcderr(x...)
# define lcdwarn(x...)
# define lcdinfo(x...)
#endif
@@ -772,7 +774,7 @@ static int ili9341_hwinitialize(FAR struct ili9341_dev_s *dev)
/* Select spi device */
lcderr("Initialize lcd driver\n");
lcdinfo("Initialize lcd driver\n");
lcd->select(lcd);
#ifdef CONFIG_DEBUG_LCD
@@ -780,13 +782,13 @@ static int ili9341_hwinitialize(FAR struct ili9341_dev_s *dev)
lcd->sendcmd(lcd, ILI9341_READ_ID1);
lcd->recvparam(lcd, &param);
lcderr("ili9341 LCD driver: LCD modules manufacturer ID: %d\n", param);
lcdinfo("ili9341 LCD driver: LCD modules manufacturer ID: %d\n", param);
lcd->sendcmd(lcd, ILI9341_READ_ID2);
lcd->recvparam(lcd, &param);
lcderr("ili9341 LCD driver: LCD modules driver version ID: %d\n", param);
lcdinfo("ili9341 LCD driver: LCD modules driver version ID: %d\n", param);
lcd->sendcmd(lcd, ILI9341_READ_ID3);
lcd->recvparam(lcd, &param);
lcderr("ili9341 LCD driver: LCD modules driver ID: %d\n", param);
lcdinfo("ili9341 LCD driver: LCD modules driver ID: %d\n", param);
#endif
/* Reset the lcd display to the default state */
@@ -1020,7 +1022,7 @@ static int ili9341_getpower(FAR struct lcd_dev_s *dev)
if (priv)
{
lcderr("%d\n", priv->power);
lcdinfo("%d\n", priv->power);
return priv->power;
}
@@ -1053,7 +1055,7 @@ static int ili9341_setpower(FAR struct lcd_dev_s *dev, int power)
if (dev)
{
lcderr("%d\n", power);
lcdinfo("%d\n", power);
lcd->select(lcd);
drivers/lcd/memlcd.c
+13 -6
View File
@@ -113,9 +113,11 @@
#ifdef CONFIG_DEBUG_LCD
# define lcderr(format, ...) err(format, ##__VA_ARGS__)
# define lcdwarn(format, ...) warn(format, ##__VA_ARGS__)
# define lcdinfo(format, ...) info(format, ##__VA_ARGS__)
#else
# define lcderr(x...)
# define lcdwarn(x...)
# define lcdinfo(x...)
#endif
@@ -339,7 +341,8 @@ static void memlcd_deselect(FAR struct spi_dev_s *spi)
static inline void memlcd_clear(FAR struct memlcd_dev_s *mlcd)
{
uint16_t cmd = MEMLCD_CMD_ALL_CLEAR;
lcderr("Clear display\n");
lcdinfo("Clear display\n");
memlcd_select(mlcd->spi);
/* XXX Ensure 2us here */
SPI_SNDBLOCK(mlcd->spi, &cmd, 2);
@@ -593,8 +596,9 @@ static int memlcd_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
static int memlcd_getpower(FAR struct lcd_dev_s *dev)
{
FAR struct memlcd_dev_s *mlcd = (FAR struct memlcd_dev_s *)dev;
DEBUGASSERT(mlcd);
lcderr("%d\n", mlcd->power);
lcdinfo("%d\n", mlcd->power);
return mlcd->power;
}
@@ -610,8 +614,9 @@ static int memlcd_getpower(FAR struct lcd_dev_s *dev)
static int memlcd_setpower(FAR struct lcd_dev_s *dev, int power)
{
struct memlcd_dev_s *mlcd = (struct memlcd_dev_s *)dev;
DEBUGASSERT(mlcd && (unsigned)power <= CONFIG_LCD_MAXPOWER && mlcd->spi);
lcderr("%d\n", power);
lcdinfo("%d\n", power);
mlcd->power = power;
if (power > 0)
@@ -638,8 +643,9 @@ static int memlcd_setpower(FAR struct lcd_dev_s *dev, int power)
static int memlcd_getcontrast(struct lcd_dev_s *dev)
{
struct memlcd_dev_s *mlcd = (struct memlcd_dev_s *)dev;
DEBUGASSERT(mlcd);
lcderr("contrast: %d\n", mlcd->contrast);
lcdinfo("contrast: %d\n", mlcd->contrast);
return mlcd->contrast;
}
@@ -654,8 +660,9 @@ static int memlcd_getcontrast(struct lcd_dev_s *dev)
static int memlcd_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
{
struct memlcd_dev_s *mlcd = (struct memlcd_dev_s *)dev;
DEBUGASSERT(mlcd);
lcderr("contrast: %d\n", contrast);
lcdinfo("contrast: %d\n", contrast);
if (contrast > MEMLCD_MAXCONTRAST)
{
contrast = MEMLCD_MAXCONTRAST;
@@ -710,6 +717,6 @@ FAR struct lcd_dev_s *memlcd_initialize(FAR struct spi_dev_s *spi,
mlcd->priv->attachirq(memlcd_extcominisr);
lcderr("done\n");
lcdinfo("done\n");
return &mlcd->dev;
}
drivers/lcd/mio283qt2.c
+4 -2
View File
@@ -241,9 +241,11 @@
#ifdef CONFIG_DEBUG_LCD
# define lcderr err
# define lcdwarn warn
# define lcdinfo info
#else
# define lcderr(x...)
# define lcdwarn(x...)
# define lcdinfo(x...)
#endif
@@ -820,7 +822,7 @@ static inline int mio283qt2_hwinitialize(FAR struct mio283qt2_dev_s *priv)
#ifndef CONFIG_LCD_NOGETRUN
id = mio283qt2_readreg(lcd, 0x00);
lcderr("LCD ID: %04x\n", id);
lcdinfo("LCD ID: %04x\n", id);
/* Check if the ID is for the MIO283QT2 */
@@ -926,7 +928,7 @@ static inline int mio283qt2_hwinitialize(FAR struct mio283qt2_dev_s *priv)
#ifndef CONFIG_LCD_NOGETRUN
else
{
lcderr("Unsupported LCD type\n");
lcderr("ERROR: Unsupported LCD type\n");
ret = -ENODEV;
}
#endif
drivers/lcd/mio283qt9a.c
+3 -1
View File
@@ -140,9 +140,11 @@
#ifdef CONFIG_DEBUG_LCD
# define lcderr err
# define lcdwarn warn
# define lcdinfo info
#else
# define lcderr(x...)
# define lcdwarn(x...)
# define lcdinfo(x...)
#endif
@@ -819,7 +821,7 @@ static inline int mio283qt9a_hwinitialize(FAR struct mio283qt9a_dev_s *priv)
#ifndef CONFIG_LCD_NOGETRUN
else
{
lcderr("Unsupported LCD type\n");
lcderr("ERROR: Unsupported LCD type\n");
ret = -ENODEV;
}
#endif
drivers/lcd/nokia6100.c
+13 -6
View File
@@ -308,9 +308,13 @@
/* Debug ******************************************************************************/
#ifdef CONFIG_LCD_REGDEBUG
# define lcderr(format, ...) llinfo(format, ##__VA_ARGS__)
# define lcderr(format, ...) llerr(format, ##__VA_ARGS__)
# define lcdwarn(format, ...) llwarn(format, ##__VA_ARGS__)
# define lcdinfo(format, ...) llinfo(format, ##__VA_ARGS__)
#else
# define lcderr(x...)
# define lcdwarn(x...)
# define lcdinfo(x...)
#endif
/**************************************************************************************
@@ -666,7 +670,8 @@ static void nokia_select(FAR struct spi_dev_s *spi)
* devices competing for the SPI bus
*/
lcderr("SELECTED\n");
lcdinfo("SELECTED\n");
SPI_LOCK(spi, true);
SPI_SELECT(spi, SPIDEV_DISPLAY, true);
@@ -700,7 +705,8 @@ static void nokia_deselect(FAR struct spi_dev_s *spi)
{
/* De-select Nokia 6100 chip and relinquish the SPI bus. */
lcderr("DE-SELECTED\n");
lcdinfo("DE-SELECTED\n");
SPI_SELECT(spi, SPIDEV_DISPLAY, false);
SPI_LOCK(spi, false);
}
@@ -717,7 +723,8 @@ static void nokia_sndcmd(FAR struct spi_dev_s *spi, const uint8_t cmd)
{
/* Select the LCD */
lcderr("cmd: %02x\n", cmd);
lcdinfo("cmd: %02x\n", cmd);
nokia_select(spi);
/* Send the command. Bit 8 == 0 denotes a command */
@@ -743,7 +750,7 @@ static void nokia_cmddata(FAR struct spi_dev_s *spi, uint8_t cmd, int datlen,
uint16_t *rowbuf = g_rowbuf;
int i;
lcderr("cmd: %02x datlen: %d\n", cmd, datlen);
lcdinfo("cmd: %02x datlen: %d\n", cmd, datlen);
DEBUGASSERT(datlen <= NOKIA_STRIDE);
/* Copy the command into the line buffer. Bit 8 == 0 denotes a command. */
@@ -800,7 +807,7 @@ static void nokia_cmdarray(FAR struct spi_dev_s *spi, int len, const uint8_t *cm
for (i = 0; i < len; i++)
{
lcderr("cmddata[%d]: %02x\n", i, cmddata[i]);
lcdinfo("cmddata[%d]: %02x\n", i, cmddata[i]);
}
#endif
nokia_cmddata(spi, cmddata[0], len-1, &cmddata[1]);
drivers/lcd/p14201.c
+16 -10
View File
@@ -180,9 +180,13 @@
/* Debug ******************************************************************************/
#ifdef CONFIG_LCD_RITDEBUG
# define riterr(format, ...) info(format, ##__VA_ARGS__)
# define riterr(format, ...) err(format, ##__VA_ARGS__)
# define ritwarn(format, ...) warn(format, ##__VA_ARGS__)
# define ritinfo(format, ...) info(format, ##__VA_ARGS__)
#else
# define riterr(x...)
# define ritwarn(x...)
# define ritinfo(x...)
#endif
/**************************************************************************************
@@ -508,8 +512,8 @@ static void rit_sndbytes(FAR struct rit_dev_s *priv, FAR const uint8_t *buffer,
FAR struct spi_dev_s *spi = priv->spi;
uint8_t tmp;
riterr("buflen: %d cmd: %s [%02x %02x %02x]\n",
buflen, cmd ? "YES" : "NO", buffer[0], buffer[1], buffer[2]);
ritinfo("buflen: %d cmd: %s [%02x %02x %02x]\n",
buflen, cmd ? "YES" : "NO", buffer[0], buffer[1], buffer[2]);
DEBUGASSERT(spi);
/* Clear/set the D/Cn bit to enable command or data mode */
@@ -552,7 +556,8 @@ static void rit_sndcmds(FAR struct rit_dev_s *priv, FAR const uint8_t *table)
while ((cmdlen = *table++) != 0)
{
riterr("command: %02x cmdlen: %d\n", *table, cmdlen);
ritinfo("command: %02x cmdlen: %d\n", *table, cmdlen);
rit_sndcmd(priv, table, cmdlen);
table += cmdlen;
}
@@ -578,7 +583,7 @@ static inline void rit_clear(FAR struct rit_dev_s *priv)
FAR uint8_t *ptr = g_framebuffer;
unsigned int row;
riterr("Clear display\n");
ritinfo("Clear display\n");
/* Initialize the framebuffer */
@@ -605,7 +610,7 @@ static inline void rit_clear(FAR struct rit_dev_s *priv)
{
unsigned int row;
riterr("Clear display\n");
ritinfo("Clear display\n");
/* Create a black row */
@@ -655,7 +660,7 @@ static int rit_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
int aend;
int i;
riterr("row: %d col: %d npixels: %d\n", row, col, npixels);
ritinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer);
/* Toss out the special case of the empty run now */
@@ -678,7 +683,8 @@ static int rit_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
start = col >> 1;
aend = (col + npixels) >> 1;
end = (col + npixels + 1) >> 1;
riterr("start: %d aend: %d end: %d\n", start, aend, end);
ritinfo("start: %d aend: %d end: %d\n", start, aend, end);
/* Copy the run into the framebuffer, handling nibble alignment.
*
@@ -814,7 +820,7 @@ static int rit_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
FAR struct rit_dev_s *priv = (FAR struct rit_dev_s *)&g_oleddev;
uint8_t cmd[3];
riterr("row: %d col: %d npixels: %d\n", row, col, npixels);
ritinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer);
if (npixels > 0)
@@ -885,7 +891,7 @@ static int rit_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
int aend;
int i;
riterr("row: %d col: %d npixels: %d\n", row, col, npixels);
ritinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer);
/* Can't read from OLED GDDRAM in SPI mode, but we can read from the framebuffer */
drivers/lcd/pcf8574_lcd_backpack.c
+2
View File
@@ -80,9 +80,11 @@
#ifdef CONFIG_DEBUG_LCD
# define lcderr err
# define lcdwarn warn
# define lcdinfo info
#else
# define lcderr(x...)
# define lcdwarn(x...)
# define lcdinfo(x...)
#endif
drivers/lcd/ra8875.c
+6 -6
View File
@@ -574,18 +574,18 @@ static void ra8875_showrun(FAR struct ra8875_dev_s *priv, fb_coord_t row,
if (priv->firstrow != priv->lastrow)
{
lcderr("...\n");
lcderr("%s row: %d col: %d npixels: %d\n",
priv->put ? "PUT" : "GET",
priv->lastrow, priv->col, priv->npixels);
lcdinfo("...\n");
lcdinfo("%s row: %d col: %d npixels: %d\n",
priv->put ? "PUT" : "GET",
priv->lastrow, priv->col, priv->npixels);
}
/* And we are starting a new sequence. Output the first run of the
* new sequence
*/
lcderr("%s row: %d col: %d npixels: %d\n",
put ? "PUT" : "GET", row, col, npixels);
lcdinfo("%s row: %d col: %d npixels: %d\n",
put ? "PUT" : "GET", row, col, npixels);
/* And save information about the run so that we can detect continuations
* of the sequence.
drivers/lcd/skeleton.c
+5 -1
View File
@@ -90,9 +90,13 @@
/* Debug ******************************************************************************/
#ifdef CONFIG_LCD_SKELDEBUG
# define skelerr(format, ...) info(format, ##__VA_ARGS__)
# define skelerr(format, ...) err(format, ##__VA_ARGS__)
# define skelwarn(format, ...) warn(format, ##__VA_ARGS__)
# define skelinfo(format, ...) info(format, ##__VA_ARGS__)
#else
# define skelerr(x...)
# define skelwarn(x...)
# define skelinfo(x...)
#endif
/**************************************************************************************
drivers/lcd/ssd1289.c
+11 -9
View File
@@ -230,9 +230,11 @@
#ifdef CONFIG_DEBUG_LCD
# define lcderr err
# define lcdwarn warn
# define lcdinfo info
#else
# define lcderr(x...)
# define lcdwarn(x...)
# define lcdinfo(x...)
#endif
@@ -543,18 +545,18 @@ static void ssd1289_showrun(FAR struct ssd1289_dev_s *priv, fb_coord_t row,
if (priv->firstrow != priv->lastrow)
{
lcderr("...\n");
lcderr("%s row: %d col: %d npixels: %d\n",
priv->put ? "PUT" : "GET",
priv->lastrow, priv->col, priv->npixels);
lcdinfo("...\n");
lcdinfo("%s row: %d col: %d npixels: %d\n",
priv->put ? "PUT" : "GET",
priv->lastrow, priv->col, priv->npixels);
}
/* And we are starting a new sequence. Output the first run of the
* new sequence
*/
lcderr("%s row: %d col: %d npixels: %d\n",
put ? "PUT" : "GET", row, col, npixels);
lcdinfo("%s row: %d col: %d npixels: %d\n",
put ? "PUT" : "GET", row, col, npixels);
/* And save information about the run so that we can detect continuations
* of the sequence.
@@ -1020,7 +1022,7 @@ static inline int ssd1289_hwinitialize(FAR struct ssd1289_dev_s *priv)
id = ssd1289_readreg(lcd, SSD1289_DEVCODE);
if (id != 0)
{
lcderr("LCD ID: %04x\n", id);
lcdinfo("LCD ID: %04x\n", id);
}
/* If we could not get the ID, then let's just assume that this is an SSD1289.
@@ -1030,7 +1032,7 @@ static inline int ssd1289_hwinitialize(FAR struct ssd1289_dev_s *priv)
else
{
lcderr("No LCD ID, assuming SSD1289\n");
lcdwarn("WARNING: No LCD ID, assuming SSD1289\n");
id = SSD1289_DEVCODE_VALUE;
}
@@ -1273,7 +1275,7 @@ static inline int ssd1289_hwinitialize(FAR struct ssd1289_dev_s *priv)
#ifndef CONFIG_LCD_NOGETRUN
else
{
lcderr("Unsupported LCD type\n");
lcderr("ERROR: Unsupported LCD type\n");
ret = -ENODEV;
}
#endif
drivers/lcd/ssd1306_i2c.c
+2 -2
View File
@@ -94,7 +94,7 @@ void ssd1306_sendbyte(FAR struct ssd1306_dev_s *priv, uint8_t regval)
ret = I2C_TRANSFER(priv->i2c, &msg, 1);
if (ret < 0)
{
snerr("I2C_TRANSFER failed: %d\n", ret);
snerr("ERROR: I2C_TRANSFER failed: %d\n", ret);
}
}
@@ -130,7 +130,7 @@ void ssd1306_sendblk(FAR struct ssd1306_dev_s *priv, uint8_t *data, uint8_t len)
ret = I2C_TRANSFER(priv->i2c, &msg, 1);
if (ret < 0)
{
snerr("I2C_TRANSFER failed: %d\n", ret);
snerr("ERROR: I2C_TRANSFER failed: %d\n", ret);
}
}
drivers/lcd/ssd1351.c
+4 -2
View File
@@ -499,7 +499,8 @@ static void ssd1351_select(FAR struct ssd1351_dev_s *priv)
* competing for the SPI bus
*/
gerr("SELECTED\n");
ginfo("SELECTED\n");
SPI_LOCK(spi, true);
SPI_SELECT(spi, SPIDEV_DISPLAY, true);
@@ -529,7 +530,8 @@ static void ssd1351_deselect(FAR struct ssd1351_dev_s *priv)
/* De-select the chip and relinquish the SPI bus */
gerr("DE-SELECTED\n");
ginfo("DE-SELECTED\n");
SPI_SELECT(spi, SPIDEV_DISPLAY, false);
SPI_LOCK(spi, false);
}
drivers/lcd/st7565.c
-8
View File
@@ -176,14 +176,6 @@
#define LS_BIT (1 << 0)
#define MS_BIT (1 << 7)
/* Debug ******************************************************************************/
#ifdef CONFIG_LCD_ST7565DEBUG
# define st7565err(format, ...) info(format, ##__VA_ARGS__)
#else
# define st7565err(x...)
#endif
/**************************************************************************************
* Private Type Definition
**************************************************************************************/
drivers/lcd/st7567.c
-8
View File
@@ -206,14 +206,6 @@
#define LS_BIT (1 << 0)
#define MS_BIT (1 << 7)
/* Debug ******************************************************************************/
#ifdef CONFIG_LCD_ST7567DEBUG
# define st7567err(format, ...) info(format, ##__VA_ARGS__)
#else
# define st7567err(x...)
#endif
/**************************************************************************************
* Private Type Definition
**************************************************************************************/
drivers/lcd/ug-9664hswag01.c
-8
View File
@@ -221,14 +221,6 @@
#define LS_BIT (1 << 0)
#define MS_BIT (1 << 7)
/* Debug ******************************************************************************/
#ifdef CONFIG_DEBUG_LCD
# define lcderr(format, ...) info(format, ##__VA_ARGS__)
#else
# define lcderr(x...)
#endif
/**************************************************************************************
* Private Type Definition
**************************************************************************************/