diff --git a/os/drivers/analog/adc.c b/os/drivers/analog/adc.c index 8524e9df68..a88a23a62e 100644 --- a/os/drivers/analog/adc.c +++ b/os/drivers/analog/adc.c @@ -77,6 +77,7 @@ #include #include #include +#include #include @@ -254,7 +255,7 @@ static ssize_t adc_read(FAR struct file *filep, FAR char *buffer, int ret = 0; int msglen; - avdbg("buflen: %d\n", (int)buflen); + avdbg("%s %d\n", clog_message_str[CMN_LOG_VALUE_OF], (int)buflen); if (buflen % 5 == 0) msglen = 5; @@ -357,7 +358,7 @@ static ssize_t adc_read(FAR struct file *filep, FAR char *buffer, leave_critical_section(flags); } - avdbg("Returning: %d\n", ret); + avdbg("%s %d\n", clog_message_str[CMN_LOG_VALUE_OF], ret); return ret; } @@ -544,7 +545,7 @@ int adc_register(FAR const char *path, FAR struct adc_dev_s *dev) DEBUGASSERT(dev->ad_ops != NULL && dev->ad_ops->ao_bind != NULL); ret = dev->ad_ops->ao_bind(dev, &g_adc_callback); if (ret < 0) { - avdbg("ERROR: Failed to bind callbacks: %d\n", ret); + avdbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); return ret; } diff --git a/os/drivers/audio/alc1019.c b/os/drivers/audio/alc1019.c index 234ad23af7..d148e30257 100644 --- a/os/drivers/audio/alc1019.c +++ b/os/drivers/audio/alc1019.c @@ -40,6 +40,7 @@ #include #include #include +#include #include "alc1019.h" #include "alc1019scripts.h" @@ -99,7 +100,7 @@ static int alc1019_writereg_3byte(FAR struct alc1019_dev_s *priv, uint8_t regadd ret = i2c_write(dev, alc1019_i2c_config, (uint8_t *)reg, 3); if (ret < 0) { - auddbg("Error, cannot write reg 0x%x/0x%x/0x%x\n", regaddr_h, regaddr_l, regval); + auddbg("%s, 0x%x/0x%x/0x%x\n", clog_message_str[CMN_LOG_FAILED_OP] ,regaddr_h, regaddr_l, regval); } return ret; } @@ -433,12 +434,12 @@ static int alc1019_configure(FAR struct audio_lowerhalf_s *dev, FAR const struct ret = -EDOM; if (caps->ac_channels != ALC1019_CHANNELS) { - auddbg("ERROR: Unsupported number of channels: %d\n", caps->ac_channels); + auddbg("%s#1 %d\n", clog_message_str[CMN_LOG_INVALID_VAL], caps->ac_channels); break; } if (caps->ac_controls.b[2] != ALC1019_BPSAMP) { - auddbg("ERROR: Unsupported bits per sample: %d\n", caps->ac_controls.b[2]); + auddbg("%s#2 %d\n",clog_message_str[CMN_LOG_INVALID_VAL], caps->ac_controls.b[2]); break; } diff --git a/os/drivers/audio/alc5658.c b/os/drivers/audio/alc5658.c index 7a3f702a34..9fee50af20 100644 --- a/os/drivers/audio/alc5658.c +++ b/os/drivers/audio/alc5658.c @@ -79,6 +79,7 @@ #include #include #include +#include #include "alc5658.h" #include "alc5658scripts.h" diff --git a/os/drivers/audio/audio_null.c b/os/drivers/audio/audio_null.c index 4efc33572b..b4b263d0d3 100644 --- a/os/drivers/audio/audio_null.c +++ b/os/drivers/audio/audio_null.c @@ -75,6 +75,7 @@ #include #include #include +#include /**************************************************************************** * Pre-processor Definitions @@ -702,10 +703,10 @@ static int null_registerprocess(FAR struct audio_lowerhalf_s *dev, mqd_t mq) priv->process_terminate = false; ret = pthread_create(&priv->process_threadid, &tattr, null_processthread, (pthread_addr_t) priv); if (ret != OK) { - auddbg("ERROR: pthread_create failed: %d\n", ret); + auddbg("%s %d\n",clog_message_str[CMN_LOG_FAILED_OP], ret); } else { pthread_setname_np(priv->process_threadid, "null audio process"); - auddbg("Created worker thread\n"); + auddbg("%s \n", clog_message_str[CMN_LOG_PERFORMING_OP]); } audvdbg("Return %d\n", ret); @@ -766,7 +767,7 @@ static int null_start(FAR struct audio_lowerhalf_s *dev) audvdbg("Starting worker thread\n"); ret = pthread_create(&priv->worker_threadid, &tattr, null_workerthread, (pthread_addr_t) priv); if (ret != OK) { - auddbg("ERROR: pthread_create failed: %d\n", ret); + auddbg("%s %d\n",clog_message_str[CMN_LOG_FAILED_OP], ret); } else { pthread_setname_np(priv->worker_threadid, "null audio"); auddbg("Created worker thread\n"); @@ -961,12 +962,12 @@ static int null_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd, unsigned long #endif ret = null_registerprocess(dev, (mqd_t) arg); if (ret != OK) { - auddbg("Process Start Failed ret : %d\n", ret); + auddbg("%s#1 %d \n", clog_message_str[CMN_LOG_FAILED_OP], ret); return ret; } ret = OK; #else - auddbg("Register Process Failed - Device Doesn't support\n"); + auddbg("%s#2 \n", clog_message_str[CMN_LOG_FAILED_OP]); ret = -EINVAL; #endif } @@ -975,13 +976,13 @@ static int null_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd, unsigned long #ifdef CONFIG_AUDIO_PROCESSING_FEATURES ret = null_unregisterprocess(dev); if (ret != OK) { - auddbg("Process Start Failed ret : %d\n", ret); + auddbg("%s#3 %d \n", clog_message_str[CMN_LOG_FAILED_OP], ret); return ret; } ret = OK; #else - auddbg("UnRegister Process Failed - Device Doesn't support\n"); + auddbg("%s#4 \n", clog_message_str[CMN_LOG_FAILED_OP]); ret = -EINVAL; #endif } @@ -995,7 +996,7 @@ static int null_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd, unsigned long sem_post(&priv->processing_sem); ret = OK; #else - auddbg("start Process Failed - Device Doesn't support\n"); + auddbg("%s #5\n", clog_message_str[CMN_LOG_FAILED_OP]); ret = -EINVAL; #endif } @@ -1008,7 +1009,7 @@ static int null_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd, unsigned long priv->process_terminate = true; ret = OK; #else - auddbg("start Process Failed - Device Doesn't support\n"); + auddbg("%s #6\n:", clog_message_str[CMN_LOG_FAILED_OP]); ret = -EINVAL; #endif } @@ -1112,6 +1113,6 @@ FAR struct audio_lowerhalf_s *audio_null_initialize(void) return &priv->dev; } - auddbg("ERROR: Failed to allocate null audio device\n"); + auddbg("%s \n", clog_message_str[CMN_LOG_FAILED_OP]); return NULL; } diff --git a/os/drivers/audio/cx20921.c b/os/drivers/audio/cx20921.c index 2f07b0fd61..84aee9a5b0 100644 --- a/os/drivers/audio/cx20921.c +++ b/os/drivers/audio/cx20921.c @@ -74,6 +74,7 @@ #include #include #include +#include #include "cx20921.h" diff --git a/os/drivers/audio/i2schar.c b/os/drivers/audio/i2schar.c index 611ad662dc..a5539b949f 100644 --- a/os/drivers/audio/i2schar.c +++ b/os/drivers/audio/i2schar.c @@ -74,6 +74,7 @@ #include #include #include +#include /**************************************************************************** * Pre-processor Definitions @@ -311,7 +312,7 @@ static ssize_t i2schar_write(FAR struct file *filep, FAR const char *buffer, siz ret = I2S_SEND(priv->i2s, apb, i2schar_txcallback, priv, CONFIG_AUDIO_I2SCHAR_TXTIMEOUT); if (ret < 0) { - lldbg("ERROR: I2S_SEND returned: %d\n", ret); + lldbg("%s %d \n", clog_message_str[CMN_LOG_INVALID_VAL], ret); goto errout_with_reference; } diff --git a/os/drivers/audio/tas5749.c b/os/drivers/audio/tas5749.c index 436a003b48..7a7b5009c8 100644 --- a/os/drivers/audio/tas5749.c +++ b/os/drivers/audio/tas5749.c @@ -76,6 +76,7 @@ #include #include #include +#include #include "tas5749.h" #include "tas5749scripts.h" @@ -158,7 +159,7 @@ uint8_t tas5749_readreg_1byte(FAR struct tas5749_dev_s *priv, uint8_t regaddr) uint8_t reg_w[4]; reg_w[0] = regaddr; if (i2c_writeread(dev, tas5749_i2c_config, reg_w, 1, reg, 1) < 0) { - auddbg("Error, cannot read reg %x\n", regaddr); + auddbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP],regaddr); return FAIL_8; } return reg[0]; @@ -183,12 +184,12 @@ uint32_t tas5749_readreg_4byte(FAR struct tas5749_dev_s *priv, uint8_t regaddr) ret = i2c_write(dev, tas5749_i2c_config, reg, 1); if (ret < 0) { - auddbg("Error, cannot read reg %x\n", regaddr); + auddbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP],regaddr); return FAIL_32; } ret = i2c_read(dev, tas5749_i2c_config, reg, 4); if (ret < 0) { - auddbg("Error, cannot read reg %x\n", regaddr); + auddbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP],regaddr); return FAIL_32; } regval = ((reg[0] << 24) | (reg[1] << 16) | (reg[2] << 8) | (reg[3] << 24)); @@ -225,7 +226,7 @@ static int tas5749_writereg_1byte(FAR struct tas5749_dev_s *priv, uint8_t regadd ret = i2c_write(dev, tas5749_i2c_config, (uint8_t *)reg, 2); if (ret < 0) { - auddbg("Error, cannot write reg %x\n", regaddr); + auddbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP],regaddr); } return ret; } @@ -252,7 +253,7 @@ static int tas5749_writereg_4byte(FAR struct tas5749_dev_s *priv, uint8_t regadd ret = i2c_write(dev, tas5749_i2c_config, (uint8_t *)reg, 5); if (ret < 0) { - auddbg("Error, cannot write reg %x\n", regaddr); + auddbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP],regaddr); } return ret; } @@ -991,7 +992,7 @@ static int tas5749_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd, unsigned lo tas5749_writereg_1byte(priv, (uint8_t)0x01, 0x00); regval = tas5749_readreg_1byte(priv, 0x01); if (regval != 0x00) { - auddbg("ERROR: Amp has some error! 0x%02x \n", regval); + auddbg("%s 0x%02x \n", clog_message_str[CMN_LOG_INVALID_VAL],regval); } /* Resume I2S */ @@ -1237,7 +1238,7 @@ FAR struct audio_lowerhalf_s *tas5749_initialize(FAR struct i2c_dev_s *i2c, FAR /* Verify that TAS5749 is present and available on this I2C */ regval = tas5749_readreg_1byte(priv, TAS5749_TI_DEVICE_ID); if (regval != TAS5749_TI_DEVICE_ID_VAL) { - auddbg("ERROR: TAS5749 not found: ID=%04x\n", regval); + auddbg("%s %04xn", clog_message_str[CMN_LOG_INVALID_VAL],regval); goto errout_with_dev; } diff --git a/os/drivers/bch/bchdev_register.c b/os/drivers/bch/bchdev_register.c index f235b596a1..55b3a7855b 100644 --- a/os/drivers/bch/bchdev_register.c +++ b/os/drivers/bch/bchdev_register.c @@ -61,6 +61,7 @@ #include #include +#include #include "bch.h" @@ -83,14 +84,14 @@ int bchdev_register(FAR const char *blkdev, FAR const char *chardev, bool readon /* Setup the BCH lib functions */ ret = bchlib_setup(blkdev, readonly, &handle); if (ret < 0) { - fdbg("ERROR: bchlib_setup failed: %d\n", -ret); + fdbg("%s #1 %d\n", clog_message_str[CMN_LOG_FAILED_OP],-ret); return ret; } /* Then setup the character device */ ret = register_driver(chardev, &bch_fops, 0666, handle); if (ret < 0) { - fdbg("ERROR: register_driver failed: %d\n", -ret); + fdbg("%s #2 %d\n", clog_message_str[CMN_LOG_FAILED_OP],-ret); bchlib_teardown(handle); handle = NULL; } diff --git a/os/drivers/bch/bchdev_unregister.c b/os/drivers/bch/bchdev_unregister.c index 5ce0478dc4..988defe983 100644 --- a/os/drivers/bch/bchdev_unregister.c +++ b/os/drivers/bch/bchdev_unregister.c @@ -67,6 +67,7 @@ #include #include +#include #include "bch.h" @@ -97,7 +98,7 @@ int bchdev_unregister(FAR const char *chardev) /* Open the character driver associated with chardev */ fd = open(chardev, O_RDONLY); if (fd < 0) { - fdbg("ERROR: Failed to open %s: %d\n", chardev, errno); + fdbg("%s %s %d\n", clog_message_str[CMN_LOG_FAILED_OP],chardev,errno); return -errno; } diff --git a/os/drivers/bch/bchlib_cache.c b/os/drivers/bch/bchlib_cache.c index f1baddaa15..d112248d22 100644 --- a/os/drivers/bch/bchlib_cache.c +++ b/os/drivers/bch/bchlib_cache.c @@ -62,6 +62,7 @@ #include #include "bch.h" +#include #if defined(CONFIG_BCH_ENCRYPTION) # include @@ -147,7 +148,7 @@ int bchlib_flushsector(FAR struct bchlib_s *bch) /* Write the sector to the media */ ret = inode->u.i_bops->write(inode, bch->buffer, bch->sector, 1); if (ret < 0) { - fdbg("Write failed: %d\n"); + fdbg("%s\n", clog_message_str[CMN_LOG_FILE_WRITE_ERROR]); } #if defined(CONFIG_BCH_ENCRYPTION) @@ -188,7 +189,7 @@ int bchlib_readsector(FAR struct bchlib_s *bch, size_t sector) ret = inode->u.i_bops->read(inode, bch->buffer, sector, 1); if (ret < 0) { - fdbg("Read failed: %d\n"); + fdbg("%s\n", clog_message_str[CMN_LOG_FILE_READ_ERROR]); } bch->sector = sector; #if defined(CONFIG_BCH_ENCRYPTION) diff --git a/os/drivers/bch/bchlib_read.c b/os/drivers/bch/bchlib_read.c index 9ebc7f854f..3e29482591 100644 --- a/os/drivers/bch/bchlib_read.c +++ b/os/drivers/bch/bchlib_read.c @@ -61,6 +61,7 @@ #include #include #include +#include #include "bch.h" @@ -108,7 +109,7 @@ ssize_t bchlib_read(FAR void *handle, FAR char *buffer, size_t offset, size_t le } if (bch->sectsize <= 0) { - fdbg("ERROR: Invalid sector size bch->sectsize = %d\n", bch->sectsize); + fdbg("%s bch->sectsize : %d\n", clog_message_str[CMN_LOG_VALUE_OF],bch->sectsize); return -1; } @@ -162,7 +163,7 @@ ssize_t bchlib_read(FAR void *handle, FAR char *buffer, size_t offset, size_t le ret = bch->inode->u.i_bops->read(bch->inode, (FAR uint8_t *)buffer, sector, nsectors); if (ret < 0) { - fdbg("ERROR: Read failed: %d\n"); + fdbg("%s\n", clog_message_str[CMN_LOG_FILE_READ_ERROR]); return ret; } diff --git a/os/drivers/bch/bchlib_setup.c b/os/drivers/bch/bchlib_setup.c index fb5a62c00d..fbd4422a2f 100644 --- a/os/drivers/bch/bchlib_setup.c +++ b/os/drivers/bch/bchlib_setup.c @@ -67,6 +67,7 @@ #include #include +#include #include "bch.h" @@ -93,14 +94,14 @@ int bchlib_setup(const char *blkdev, bool readonly, FAR void **handle) /* Allocate the BCH state structure */ bch = (FAR struct bchlib_s *)kmm_zalloc(sizeof(struct bchlib_s)); if (!bch) { - fdbg("ERROR: Failed to allocate BCH structure\n"); + fdbg("%s#1\n", clog_message_str[CMN_LOG_FAILED_OP]); return -ENOMEM; } /* Open the block driver */ ret = open_blockdriver(blkdev, readonly ? MS_RDONLY : 0, &bch->inode); if (ret < 0) { - fdbg("ERROR: Failed to open driver %s: %d\n", blkdev, -ret); + fdbg("%s#2 %s: %d\n", clog_message_str[CMN_LOG_FAILED_OP],blkdev,-ret); goto errout_with_bch; } @@ -108,18 +109,18 @@ int bchlib_setup(const char *blkdev, bool readonly, FAR void **handle) ret = bch->inode->u.i_bops->geometry(bch->inode, &geo); if (ret < 0) { - fdbg("ERROR: geometry failed: %d\n", -ret); + fdbg("%s#3 %d\n", clog_message_str[CMN_LOG_FAILED_OP],-ret); goto errout_with_bch; } if (!geo.geo_available) { - fdbg("ERROR: geometry failed: %d\n", -ret); + fdbg("%s#4 %d\n", clog_message_str[CMN_LOG_FAILED_OP],-ret); ret = -ENODEV; goto errout_with_bch; } if (!readonly && (!bch->inode->u.i_bops->write || !geo.geo_writeenabled)) { - fdbg("ERROR: write access not supported\n"); + fdbg("%s#5 \n", clog_message_str[CMN_LOG_FAILED_OP]); ret = -EACCES; goto errout_with_bch; } @@ -134,7 +135,7 @@ int bchlib_setup(const char *blkdev, bool readonly, FAR void **handle) /* Allocate the sector I/O buffer */ bch->buffer = (FAR uint8_t *)kmm_malloc(bch->sectsize); if (!bch->buffer) { - fdbg("ERROR: Failed to allocate sector buffer\n"); + fdbg("%s#6 \n", clog_message_str[CMN_LOG_FAILED_OP]); ret = -ENOMEM; goto errout_with_bch; } diff --git a/os/drivers/bch/bchlib_write.c b/os/drivers/bch/bchlib_write.c index d6bb04e2f1..fe3bafb5af 100644 --- a/os/drivers/bch/bchlib_write.c +++ b/os/drivers/bch/bchlib_write.c @@ -64,6 +64,7 @@ #include #include +#include #include "bch.h" @@ -95,7 +96,7 @@ ssize_t bchlib_write(FAR void *handle, FAR const char *buffer, size_t offset, si } if (bch->sectsize <= 0) { - fdbg("ERROR: Invalid sector size bch->sectsize = %d\n", bch->sectsize); + fdbg("%s %d\n", clog_message_str[CMN_LOG_INVALID_VAL],bch->sectsize); return -1; } @@ -150,7 +151,7 @@ ssize_t bchlib_write(FAR void *handle, FAR const char *buffer, size_t offset, si ret = bch->inode->u.i_bops->write(bch->inode, (FAR uint8_t *)buffer, sector, nsectors); if (ret < 0) { - fdbg("ERROR: Write failed: %d\n", ret); + fdbg("%s %d\n", clog_message_str[CMN_LOG_FILE_WRITE_ERROR],ret); return ret; } @@ -183,7 +184,7 @@ ssize_t bchlib_write(FAR void *handle, FAR const char *buffer, size_t offset, si /* Finally, flush any cached writes to the device as well */ ret = bchlib_flushsector(bch); if (ret < 0) { - fdbg("ERROR: Flush failed: %d\n", ret); + fdbg("%s %d\n", clog_message_str[CMN_LOG_INVALID_VAL],ret); return ret; } diff --git a/os/drivers/bluetooth/bt_null/bt_null.c b/os/drivers/bluetooth/bt_null/bt_null.c index eb116d9248..3ad8005066 100644 --- a/os/drivers/bluetooth/bt_null/bt_null.c +++ b/os/drivers/bluetooth/bt_null/bt_null.c @@ -70,6 +70,7 @@ #include #include #include +#include /**************************************************************************** * Private Function Prototypes @@ -334,7 +335,7 @@ static int btnull_adv_report(void *arg) outbuf = bt_buf_alloc(BT_EVT, NULL, 0); if (outbuf == NULL) { - ndbg("ERROR: Failed to allocate buffer\n"); + ndbg("%s \n", clog_message_str[CMN_LOG_ALLOC_FAIL]); return -ENOMEM; } @@ -360,7 +361,7 @@ static int btnull_send(FAR const struct bt_driver_s *dev, FAR struct bt_buf_s *b outbuf = bt_buf_alloc(BT_EVT, NULL, 0); if (outbuf == NULL) { - ndbg("ERROR: Failed to allocate buffer\n"); + ndbg("%d#1 \n", clog_message_str[CMN_LOG_ALLOC_FAIL]); return -ENOMEM; } @@ -397,11 +398,11 @@ static int btnull_send(FAR const struct bt_driver_s *dev, FAR struct bt_buf_s *b status = pthread_attr_init(&attr); if (status != 0) { - ndbg("pthread_attr_init() failed.\n\n"); + ndbg("%s #2 :\n", clog_message_str[CMN_LOG_FAILED_OP]); } status = pthread_create(&tid, &attr, (pthread_startroutine_t)btnull_adv_report, NULL); if (status < 0) { - ndbg("pthread_create() failed.\n\n"); + ndbg("%s #3 :\n", clog_message_str[CMN_LOG_FAILED_OP]); } } break; diff --git a/os/drivers/fota/fota_driver.c b/os/drivers/fota/fota_driver.c index 341318cd52..32cbacc82e 100644 --- a/os/drivers/fota/fota_driver.c +++ b/os/drivers/fota/fota_driver.c @@ -36,6 +36,7 @@ #include #include #include +#include /************************************************************************************ * Definitions @@ -85,7 +86,8 @@ static ssize_t fota_write(FAR struct file *filep, FAR const char *buffer, size_t int ret = ERROR; if (!g_fota_dev_opened) { - dbg(" device is not opened, ret = %d\n", ret); + //dbg(" device is not opened, ret = %d\n", ret); + dbg("%s %d \n", clog_message_str[CMN_LOG_VALUE_OF],ret); set_errno(EBADF); return ret; } @@ -108,7 +110,8 @@ static ssize_t fota_read(FAR struct file *filep, FAR char *buffer, size_t buflen int ret = ERROR; if (!g_fota_dev_opened) { - dbg(" device is not opened, ret = %d\n", ret); + //dbg(" device is not opened, ret = %d\n", ret); + dbg("%s %d \n", clog_message_str[CMN_LOG_VALUE_OF],ret); set_errno(EBADF); return ret; } @@ -127,7 +130,8 @@ static int fota_ioctl(FAR struct file *filep, int cmd, unsigned long arg) int ret = ERROR; if (!g_fota_dev_opened) { - dbg(" device is not opened, ret = %d\n", ret); + //dbg(" device is not opened, ret = %d\n", ret); + dbg("%s %d \n", clog_message_str[CMN_LOG_VALUE_OF],ret); set_errno(EBADF); return ret; } @@ -174,7 +178,8 @@ static int fota_close(FAR struct file *filep) FAR fota_dev_t *dev = inode->i_private; if (!g_fota_dev_opened) { - dbg(" device is not opened, ret = %d\n", ERROR); + //dbg(" device is not opened, ret = %d\n", ERROR); + dbg("%s %d \n", clog_message_str[CMN_LOG_VALUE_OF],ERROR); set_errno(EBADF); return ERROR; } @@ -226,7 +231,7 @@ int fota_register(FAR fota_dev_t *dev) sem_init(&g_fota_open_sem, 0, 1); - dbg("Registering %s\n", path); + dbg("%s %s\n", clog_message_str[CMN_LOG_VALUE_OF],path); if (!dev) { return ERROR; diff --git a/os/drivers/gpio/gpio.c b/os/drivers/gpio/gpio.c index b6596db0a6..4655ff6706 100644 --- a/os/drivers/gpio/gpio.c +++ b/os/drivers/gpio/gpio.c @@ -30,6 +30,7 @@ #include #include +#include /**************************************************************************** * Pre-processor Definitions @@ -499,7 +500,7 @@ static int gpio_poll(FAR struct file *filep, FAR struct pollfd *fds, /* Get exclusive access to the driver structure */ ret = gpio_takesem(&priv->gu_exclsem); if (ret < 0) { - lldbg("ERROR: gpio_takesem failed: %d\n", ret); + lldbg("%s#1 %d \n", clog_message_str[CMN_LOG_INVALID_VAL],ret); return ret; } @@ -521,7 +522,7 @@ static int gpio_poll(FAR struct file *filep, FAR struct pollfd *fds, } if (i >= CONFIG_GPIO_NPOLLWAITERS) { - lldbg("ERROR: Too many poll waiters\n"); + lldbg("%s#2 \n", clog_message_str[CMN_LOG_INVALID_VAL]); fds->priv = NULL; ret = -EBUSY; goto errout_with_dusem; @@ -583,7 +584,7 @@ static int gpio_close(FAR struct file *filep) /* Get exclusive access to the driver structure */ ret = gpio_takesem(&priv->gu_exclsem); if (ret < 0) { - lldbg("ERROR: gpio_takesem failed: %d\n", ret); + lldbg("%s %d \n", clog_message_str[CMN_LOG_INVALID_VAL],ret); return ret; } @@ -607,7 +608,7 @@ static int gpio_close(FAR struct file *filep) DEBUGASSERT(curr); if (!curr) { - lldbg("ERROR: Failed to find open entry\n"); + lldbg("%s \n", clog_message_str[CMN_LOG_FAILED_OP]); ret = -ENOENT; goto errout_with_exclsem; } @@ -662,7 +663,7 @@ static int gpio_open(FAR struct file *filep) /* Allocate a new open structure */ opriv = (FAR struct gpio_open_s *)kmm_zalloc(sizeof(struct gpio_open_s)); if (!opriv) { - lldbg("ERROR: Failed to allocate open structure\n"); + lldbg("%s \n", clog_message_str[CMN_LOG_FAILED_OP]); ret = -ENOMEM; goto errout_with_sem; } @@ -709,7 +710,7 @@ int gpio_register(unsigned int minor, FAR struct gpio_lowerhalf_s *lower) priv = (FAR struct gpio_upperhalf_s *) kmm_zalloc(sizeof(struct gpio_upperhalf_s)); if (!priv) { - lldbg("ERROR: Failed to allocate device structure\n"); + lldbg("%s \n", clog_message_str[CMN_LOG_FAILED_OP]); return -ENOMEM; } @@ -730,7 +731,7 @@ int gpio_register(unsigned int minor, FAR struct gpio_lowerhalf_s *lower) /* And register the GPIO driver */ ret = register_driver(devpath, &g_gpioops, 0666, priv); if (ret < 0) { - lldbg("ERROR: register driver failed: %d\n", ret); + lldbg("%s \n", clog_message_str[CMN_LOG_FAILED_OP]); goto errout_with_priv; } diff --git a/os/drivers/i2c/i2c_uio.c b/os/drivers/i2c/i2c_uio.c index ae17cb82f1..0c13501ca6 100644 --- a/os/drivers/i2c/i2c_uio.c +++ b/os/drivers/i2c/i2c_uio.c @@ -63,6 +63,7 @@ #include #include +#include /****************************************************************************** * Private Variables @@ -257,7 +258,7 @@ static int i2c_uioctrl(FAR struct file *filep, int cmd, unsigned long arg) break; default: - dbg("Unknown cmd(%x)\n", cmd); + dbg("%s Unknown cmd(%x)\n", clog_message_str[CMN_LOG_VALUE_OF],cmd); ret = -EINVAL; break; } @@ -274,6 +275,6 @@ static int i2c_uioctrl(FAR struct file *filep, int cmd, unsigned long arg) ****************************************************************************/ int i2c_uioregister(FAR const char *path, FAR struct i2c_dev_s *dev) { - dbg("Registering %s\n", path); + dbg("%s Registering : %s \n", clog_message_str[CMN_LOG_VALUE_OF],path); return register_driver(path, &g_i2cops, 0666, dev); } diff --git a/os/drivers/iotdev/iotbus_sig.c b/os/drivers/iotdev/iotbus_sig.c index 4a07fca9f7..edbb8dd4f5 100644 --- a/os/drivers/iotdev/iotbus_sig.c +++ b/os/drivers/iotdev/iotbus_sig.c @@ -28,6 +28,7 @@ #include #include #include +#include static int iotbus_sig_open(FAR struct file *filep); static int iotbus_sig_close(FAR struct file *filep); @@ -90,7 +91,7 @@ static int iotbus_sig_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case IOTBUS_INTR_REGISTER: { ret = sem_wait(&upper->exclsem[info->int_type]); if (ret < 0) { - ibdbg("Fail to register interrupt callback\n"); + ibdbg("%s#1 \n", clog_message_str[CMN_LOG_FAILED_OP]); return ret; } struct int_node_s *itr = upper->table[info->int_type]; @@ -134,7 +135,7 @@ static int iotbus_sig_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case IOTBUS_INTR_UNREGISTER: { ret = sem_wait(&upper->exclsem[info->int_type]); if (ret < 0) { - ibdbg("Fail to unregister interrupt callback\n"); + ibdbg("%s#2 \n", clog_message_str[CMN_LOG_FAILED_OP]); return ret; } @@ -240,7 +241,7 @@ void iotbus_interrupt_trigger(iotbus_int_type_e int_type) ret = sigqueue(pid, signal, (void *)itr->data->handle); #endif if (ret < 0) { - ibdbg("Trigger Error!\n"); + ibdbg("%s \n", clog_message_str[CMN_LOG_FAILED_OP]); } } leave_critical_section(flags); diff --git a/os/drivers/lcd/ili9341.c b/os/drivers/lcd/ili9341.c index d0fb0692da..867308a987 100644 --- a/os/drivers/lcd/ili9341.c +++ b/os/drivers/lcd/ili9341.c @@ -72,6 +72,9 @@ #include #include #include +#include + + #include diff --git a/os/drivers/lcd/lcd_dev.c b/os/drivers/lcd/lcd_dev.c index 41d1e4ec6b..72c6f04974 100644 --- a/os/drivers/lcd/lcd_dev.c +++ b/os/drivers/lcd/lcd_dev.c @@ -67,6 +67,7 @@ #include #include #include +#include #define MAX_NO_PLANES 3 /**************************************************************************** @@ -310,7 +311,7 @@ static int lcddev_ioctl(FAR struct file *filep, int cmd, unsigned long arg) } break; default: { - lcddbg("ERROR: Unsupported IOCTL command: %d\n", cmd); + lcddbg("%s %d \n", clog_message_str[CMN_LOG_INVALID_VAL],cmd); ret = -ENOSYS; } break; diff --git a/os/drivers/lcd/lcd_framebuffer.c b/os/drivers/lcd/lcd_framebuffer.c index 8952aab8fe..064f21e184 100644 --- a/os/drivers/lcd/lcd_framebuffer.c +++ b/os/drivers/lcd/lcd_framebuffer.c @@ -66,6 +66,7 @@ #include #include #include +#include #ifdef CONFIG_LCD_FRAMEBUFFER @@ -254,7 +255,7 @@ static int lcdfb_update(FAR struct lcdfb_dev_s *priv, dmabuff = (uint8_t *)kmm_malloc(height * bytespl); if (dmabuff == NULL) { - gdbg("ERROR: out of memory \n"); + gdbg("%s \n", clog_message_str[CMN_LOG_OUT_OF_MEMORY]); return -ENOMEM; } @@ -284,7 +285,7 @@ static int lcdfb_update(FAR struct lcdfb_dev_s *priv, } if (ret < 0) { - gdbg("ERROR: LCD putdma failed: %d \n", ret); + gdbg("%s %d \n", clog_message_str[CMN_LOG_FAILED_OP],ret); } return ret; @@ -335,7 +336,7 @@ static int lcdfb_getvideoinfo(FAR struct fb_vtable_s *vtable, DEBUGASSERT(lcd->getvideoinfo != NULL); ret = lcd->getvideoinfo(lcd, vinfo); if (ret < 0) { - gdbg("ERROR: LCD getvideoinfo() failed: %d\n", ret); + gdbg("%s getvideoinfo :%d \n", clog_message_str[CMN_LOG_FAILED_OP],ret); } } @@ -396,7 +397,7 @@ static int lcdfb_getcmap(FAR struct fb_vtable_s *vtable, DEBUGASSERT(lcd->getcmap != NULL); ret = lcd->getcmap(lcd, cmap); if (ret < 0) { - gdbg("ERROR: LCD getcmap() failed: %d\n", ret); + gdbg("%s getcmap : %d\n", clog_message_str[CMN_LOG_FAILED_OP],ret); } } @@ -428,7 +429,7 @@ static int lcdfb_putcmap(FAR struct fb_vtable_s *vtable, DEBUGASSERT(lcd->putcmap != NULL); ret = lcd->putcmap(lcd, cmap); if (ret < 0) { - gdbg("ERROR: LCD putcmap() failed: %d\n", ret); + gdbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP],ret); } } @@ -461,7 +462,7 @@ static int lcdfb_getcursor(FAR struct fb_vtable_s *vtable, DEBUGASSERT(lcd->getcursor != NULL); ret = lcd->getcursor(lcd, attrib); if (ret < 0) { - gdbg("ERROR: LCD getcursor() failed: %d\n", ret); + gdbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP],ret); } } @@ -493,7 +494,7 @@ static int lcdfb_setcursor(FAR struct fb_vtable_s *vtable, DEBUGASSERT(lcd->setcursor != NULL); ret = lcd->setcursor(lcd, settings); if (ret < 0) { - gdbg("ERROR: LCD setcursor() failed: %d\n", ret); + gdbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP],ret); } } @@ -529,14 +530,14 @@ int up_fbinitialize(int display) struct nxgl_rect_s rect; int ret; - gvdbg("display=%d\n", display); + gvdbg("%s %d\n", clog_message_str[CMN_LOG_VALUE_OF],display); DEBUGASSERT((unsigned)display < UINT8_MAX); /* Allocate the framebuffer state structure */ priv = (FAR struct lcdfb_dev_s *)kmm_zalloc(sizeof(struct lcdfb_dev_s)); if (priv == NULL) { - gdbg("ERROR: Failed to allocate state structure\n"); + gdbg("%s #1\n", clog_message_str[CMN_LOG_FAILED_OP]); return -ENOMEM; } @@ -560,7 +561,7 @@ int up_fbinitialize(int display) lcd = board_graphics_setup(display); if (lcd == NULL) { - gdbg("ERROR: board_graphics_setup failed, devno=%d\n", display); + gdbg("%s #2%d\n", clog_message_str[CMN_LOG_FAILED_OP],display); return EXIT_FAILURE; } #else @@ -568,7 +569,7 @@ int up_fbinitialize(int display) ret = board_lcd_initialize(); if (ret < 0) { - gdbg("ERROR: board_lcd_initialize() failed: %d\n", ret); + gdbg("%s #3 :%d\n", clog_message_str[CMN_LOG_FAILED_OP],ret); goto errout_with_state; } @@ -576,7 +577,7 @@ int up_fbinitialize(int display) lcd = board_lcd_getdev(display); if (lcd == NULL) { - gdbg("ERROR: board_lcd_getdev failed, devno=%d\n", display); + gdbg("%s #4 :%d\n", clog_message_str[CMN_LOG_FAILED_OP],display); ret = -ENODEV; goto errout_with_lcd; } @@ -589,7 +590,7 @@ int up_fbinitialize(int display) DEBUGASSERT(lcd->getvideoinfo != NULL); ret = lcd->getvideoinfo(lcd, &vinfo); if (ret < 0) { - gdbg("ERROR: LCD getvideoinfo() failed: %d\n", ret); + gdbg("%s #5 :%d\n", clog_message_str[CMN_LOG_FAILED_OP],ret); goto errout_with_lcd; } @@ -599,7 +600,7 @@ int up_fbinitialize(int display) DEBUGASSERT(lcd->getplaneinfo != NULL); ret = lcd->getplaneinfo(lcd, VIDEO_PLANE, &priv->pinfo); if (ret < 0) { - gdbg("ERROR: LCD getplaneinfo() failed: %d\n", ret); + gdbg("%s #6 :%d\n", clog_message_str[CMN_LOG_FAILED_OP],ret); goto errout_with_lcd; } @@ -610,7 +611,7 @@ int up_fbinitialize(int display) priv->fbmem = (FAR uint8_t *)kmm_zalloc(priv->fblen); if (priv->fbmem == NULL) { - gdbg("ERROR: Failed to allocate frame buffer memory\n"); + gdbg("%s #7 \n", clog_message_str[CMN_LOG_FAILED_OP]); ret = -ENOMEM; goto errout_with_lcd; } @@ -629,7 +630,7 @@ int up_fbinitialize(int display) ret = lcdfb_update(priv, &rect); if (ret < 0) { - gdbg("FB update failed: %d\n", ret); + gdbg("%s #8%d\n", clog_message_str[CMN_LOG_FAILED_OP],ret); } /* Turn the LCD on at 75% power */ @@ -676,7 +677,7 @@ FAR struct fb_vtable_s *up_fbgetvplane(int display, int vplane) priv = lcdfb_find(display); if (priv == NULL) { - gdbg("ERROR: lcd_find(%d) failed\n", display); + gdbg("%s %d \n", clog_message_str[CMN_LOG_FAILED_OP],display); return NULL; } @@ -782,7 +783,7 @@ void nx_notify_rectangle(FAR struct fb_planeinfo_s *pinfo, if (priv != NULL) { ret = lcdfb_update(priv, rect); if (ret < 0) { - gdbg("FB update failed: %d\n", ret); + gdbg("%s %d \n", clog_message_str[CMN_LOG_FAILED_OP],ret); } } } diff --git a/os/drivers/lcd/mipi_lcd.c b/os/drivers/lcd/mipi_lcd.c index 6273a016cc..a3db86f8e5 100644 --- a/os/drivers/lcd/mipi_lcd.c +++ b/os/drivers/lcd/mipi_lcd.c @@ -30,6 +30,7 @@ #include #include #include +#include #define REGFLAG_DELAY 0xFC #define REGFLAG_END_OF_TABLE 0xFD // END OF REGISTERS MARKER @@ -77,6 +78,7 @@ static int send_cmd(struct mipi_lcd_dev_s *priv, lcm_setting_table_t command) priv->config->lcd_mode_switch(true); if (transfer_status != OK) { lcddbg("Command %x not sent \n", cmd); + lcddbg("%s %x\n", clog_); } return transfer_status; } @@ -282,9 +284,9 @@ static int lcd_init(FAR struct lcd_dev_s *dev) FAR struct mipi_lcd_dev_s *priv = (FAR struct mipi_lcd_dev_s *)dev; priv->config->reset(); if (send_init_cmd(priv, lcd_init_cmd_g) == OK) { - lcdvdbg("LCD Init sequence completed\n"); + lcdvdg("%s \n", clog_message_str[CMN_LOG_INIT_DONE]); } else { - lcddbg("ERROR: LCD Init sequence failed\n"); + lcddbg("%s \n", clog_message_str[CMN_LOG_FAILED_OP]); } priv->config->init(); priv->config->lcd_enable(); diff --git a/os/drivers/mipidsi/mipi_dsi_device.c b/os/drivers/mipidsi/mipi_dsi_device.c index 3d9b1ec118..7d45360689 100644 --- a/os/drivers/mipidsi/mipi_dsi_device.c +++ b/os/drivers/mipidsi/mipi_dsi_device.c @@ -51,6 +51,7 @@ #include #include +#include #include "mipi_dsi.h" @@ -927,7 +928,7 @@ FAR struct mipi_dsi_device *mipi_dsi_device_register(FAR struct mipi_dsi_host *h DEBUGASSERT(host != NULL && name != NULL); if (channel > 3) { - mipidbg("invalid virtual channel: %u\n", channel); + mipidbg("%s %u\n", clog_message_str[CMN_LOG_INVALID_VAL],channel); return NULL; } diff --git a/os/drivers/mipidsi/mipi_dsi_packet.c b/os/drivers/mipidsi/mipi_dsi_packet.c index ff27669db5..d1441f4068 100644 --- a/os/drivers/mipidsi/mipi_dsi_packet.c +++ b/os/drivers/mipidsi/mipi_dsi_packet.c @@ -48,6 +48,7 @@ #include #include +#include /**************************************************************************** * Public Functions @@ -186,11 +187,11 @@ bool mipi_dsi_packet_format_is_long(uint8_t type) int mipi_dsi_create_packet(FAR struct mipi_dsi_packet *packet, FAR const struct mipi_dsi_msg *msg) { if (packet == NULL) { - mipidbg("packet is NULL \n"); + mipidbg("%s#1 \n", clog_message_str[CMN_LOG_INVALID_VAL]); return -EINVAL; } if (msg == NULL) { - mipidbg("msg is NULL \n"); + mipidbg("%s#2 \n", clog_message_str[CMN_LOG_INVALID_VAL]); return -EINVAL; } diff --git a/os/drivers/net/enc28j60.c b/os/drivers/net/enc28j60.c index 94ca7e6b4c..ad0dfb4592 100644 --- a/os/drivers/net/enc28j60.c +++ b/os/drivers/net/enc28j60.c @@ -95,6 +95,7 @@ #endif #include "enc28j60.h" +#include /**************************************************************************** * Definitions @@ -1041,7 +1042,7 @@ static int enc_transmit(FAR struct enc_driver_s *priv) { /* Drop Packet if dev->d_len == 0 */ if (0 == priv->dev.d_len) { - nlldbg(" \n Enc28j60.c enc_transmit Dropping packet, pktlen: %d \n", priv->dev.d_len); + nlldbg("%s \n %d \n", clog_message_str[CMN_LOG_FAILED_OP],priv->dev.d_len); return 1; } uint16_t txend; @@ -1445,7 +1446,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv) /* Check if the packet was received OK */ if ((rxstat & RXSTAT_OK) == 0) { - nlldbg("ERROR: RXSTAT: %04x\n", rxstat); + nlldbg("%s %04x\n", clog_message_str[CMN_LOG_INVALID_VAL],rxstat); #ifdef CONFIG_ENC28J60_STATS priv->stats.rxnotok++; #endif @@ -2358,7 +2359,7 @@ static int enc_reset(FAR struct enc_driver_s *priv) regval = enc_rdbreg(priv, ENC_EREVID); if (regval == 0x00 || regval == 0xff) { - nlldbg("Bad Rev ID: %02x\n", regval); + nlldbg("%s %02x\n", clog_message_str[CMN_LOG_INVALID_VAL],regval); return -ENODEV; } @@ -2417,7 +2418,7 @@ static int enc_reset(FAR struct enc_driver_s *priv) enc_wrphy(priv, ENC_PHCON1, PHCON1_PDPXMD); enc_wrphy(priv, ENC_PHCON2, 0x00); #endif - nllvdbg("ENC_RESET SUCCESS\n"); + nllvdbg("%s\n", clog_message_str[CMN_LOG_PERFORMING_OP]); return OK; } diff --git a/os/drivers/net/phy_notify.c b/os/drivers/net/phy_notify.c index 5a09c811c6..adc6cf38dd 100644 --- a/os/drivers/net/phy_notify.c +++ b/os/drivers/net/phy_notify.c @@ -76,6 +76,7 @@ #include #include #include +#include #ifdef CONFIG_ARCH_PHY_INTERRUPT @@ -294,7 +295,7 @@ static int phy_handler(FAR struct phy_notify_s *client) int errcode = errno; DEBUGASSERT(errcode > 0); - nlldbg("ERROR: sigqueue failed: %d\n", errcode); + nlldbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP],errcode); UNUSED(errcode); } @@ -387,7 +388,7 @@ int phy_notify_subscribe(FAR const char *intf, pid_t pid, int signo, FAR void *a client = phy_find_unassigned(); if (!client) { - ndbg("ERROR: Failed to allocate a client entry\n"); + ndbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); return -ENOMEM; } diff --git a/os/drivers/net/telnet.c b/os/drivers/net/telnet.c index a50c0ff4fd..fc416bf0a0 100644 --- a/os/drivers/net/telnet.c +++ b/os/drivers/net/telnet.c @@ -81,6 +81,7 @@ #include #include #include +#include #ifdef CONFIG_NETDEV_TELNET @@ -521,7 +522,7 @@ static int telnet_close(FAR struct file *filep) sched_lock(); ret = asprintf(&devpath, TELNETD_DEVFMT, priv->td_minor); if (ret < 0) { - nlldbg("ERROR: Failed to allocate the driver path\n"); + nlldbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); } else { /* Un-register the character driver */ @@ -535,7 +536,7 @@ static int telnet_close(FAR struct file *filep) */ if (ret != -EBUSY) { - nlldbg("Failed to unregister the driver %s: %d\n", devpath, ret); + nlldbg("%s %s: %d\n", clog_message_str[CMN_LOG_FAILED_OP],devpath, ret); } } @@ -664,7 +665,7 @@ static ssize_t telnet_write(FAR struct file *filep, FAR const char *buffer, size ret = send(priv->td_psock, priv->td_txbuffer, ncopied, 0); if (ret < 0) { - nlldbg("psock_send failed '%s': %d\n", priv->td_txbuffer, ret); + nlldbg("%s #1 '%s': %d\n", clog_message_str[CMN_LOG_FAILED_OP],priv->td_txbuffer, ret); return ret; } @@ -679,7 +680,7 @@ static ssize_t telnet_write(FAR struct file *filep, FAR const char *buffer, size if (ncopied > 0) { ret = send(priv->td_psock, priv->td_txbuffer, ncopied, 0); if (ret < 0) { - nlldbg("psock_send failed '%s': %d\n", priv->td_txbuffer, ret); + nlldbg("%s #2 '%s': %d\n", clog_message_str[CMN_LOG_FAILED_OP],priv->td_txbuffer, ret); return ret; } } @@ -722,7 +723,7 @@ static int telnet_session(FAR struct telnet_session_s *session) priv = (FAR struct telnet_dev_s *)kmm_malloc(sizeof(struct telnet_dev_s)); if (!priv) { - nlldbg("Failed to allocate the driver data structure\n"); + nlldbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); return -ENOMEM; } diff --git a/os/drivers/os_api_test/kernel/test_clock.c b/os/drivers/os_api_test/kernel/test_clock.c index beb3ab10ba..4b918df918 100644 --- a/os/drivers/os_api_test/kernel/test_clock.c +++ b/os/drivers/os_api_test/kernel/test_clock.c @@ -29,6 +29,7 @@ #include #include "clock/clock.h" +#include /**************************************************************************** * Private Function @@ -46,7 +47,7 @@ static int test_clock_abstime2ticks(unsigned long arg) ret_chk = clock_gettime(CLOCK_REALTIME, &cur_time); if (ret_chk != OK) { - dbg("clock_gettime failed. errno : %d\n", get_errno()); + dbg("%s#1 %d\n", clog_message_str[CMN_LOG_FAILED_OP],get_errno()); return ERROR; } @@ -57,13 +58,13 @@ static int test_clock_abstime2ticks(unsigned long arg) comparison_time.tv_nsec = cur_time.tv_nsec; ret_chk = clock_abstime2ticks(CLOCK_REALTIME, &base_time, &base_tick); if (ret_chk == ERROR) { - dbg("clock_abstime2ticks failed. ret : %d\n", ret_chk); + dbg("%s#2 %d\n", clog_message_str[CMN_LOG_FAILED_OP],ret_chk); return ERROR; } ret_chk = clock_abstime2ticks(CLOCK_REALTIME, &comparison_time, &comparison_tick); if (ret_chk != OK) { - dbg("clock_abstime2ticks failed. ret : %d\n", ret_chk); + dbg("%s#3 %d\n", clog_message_str[CMN_LOG_FAILED_OP],ret_chk); return ERROR; } diff --git a/os/drivers/os_api_test/kernel/test_compress_decompress.c b/os/drivers/os_api_test/kernel/test_compress_decompress.c index 4f071925d9..ca04b0befa 100644 --- a/os/drivers/os_api_test/kernel/test_compress_decompress.c +++ b/os/drivers/os_api_test/kernel/test_compress_decompress.c @@ -31,6 +31,7 @@ #include #include #include +#include #define READSIZE 2048 @@ -59,14 +60,14 @@ static int test_compress_decompress_function(unsigned long arg) if (filefd < 0) { int errval = get_errno(); - berr("Failed to open file ERROR = %d\n", errval); + berr("%s %d\n", clog_message_str[CMN_LOG_FILE_OPEN_ERROR],errval); return -errval; } ret = compress_init(filefd, 0, &filelen); if (ret != OK) { - berr("Failed to read header for compressed binary : %d\n", ret); + berr("%s %d\n", clog_message_str[CMN_LOG_FILE_READ_ERROR],ret); return ret; } @@ -74,7 +75,7 @@ static int test_compress_decompress_function(unsigned long arg) dst_buffer = (uint8_t *)kmm_malloc(READSIZE * sizeof(uint8_t)); if (dst_buffer == NULL) { - berr("Allocation of memory failed\n"); + berr("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); compress_uninit(); return ERROR; } diff --git a/os/drivers/os_api_test/kernel/test_group.c b/os/drivers/os_api_test/kernel/test_group.c index a9de365776..7e90db26aa 100644 --- a/os/drivers/os_api_test/kernel/test_group.c +++ b/os/drivers/os_api_test/kernel/test_group.c @@ -29,6 +29,7 @@ #include #include +#include #ifdef CONFIG_SCHED_HAVE_PARENT #include "group/group.h" #ifdef CONFIG_SCHED_CHILD_STATUS @@ -83,13 +84,13 @@ static int test_group_exit_child(unsigned long arg) child_pid = kernel_thread("group", SCHED_PRIORITY_DEFAULT, TASK_STACKSIZE, group_exitchild_func, (char *const *)NULL); if (child_pid < 0) { - dbg("kernel_thread failed."); + dbg("%s#1\n",clog_message_str[CMN_LOG_FAILED_OP]); return ERROR; } child = group_findchild(group, child_pid); if (child == NULL) { - dbg("child is null."); + dbg("%s#2\n",clog_message_str[CMN_LOG_FAILED_OP]); return ERROR; } @@ -97,13 +98,13 @@ static int test_group_exit_child(unsigned long arg) child_returned = group_exitchild(group); if (child != child_returned) { - dbg("group_exitchild failed."); + dbg("%s#3\n",clog_message_str[CMN_LOG_FAILED_OP]); return ERROR; } child_returned = group_removechild(group, child_pid); if (child != child_returned) { - dbg("group_removechild failed."); + dbg("%s#4\n",clog_message_str[CMN_LOG_FAILED_OP]); return ERROR; } @@ -124,7 +125,7 @@ static int test_group_add_fined_remove(unsigned long arg) child = group_allocchild(); if (child == NULL) { - dbg("group_allocchild failed."); + dbg("%s#5\n",clog_message_str[CMN_LOG_FAILED_OP]); return ERROR; } @@ -138,19 +139,19 @@ static int test_group_add_fined_remove(unsigned long arg) /* cross check starts */ child_returned = group_findchild(group, child_pid); if (child != child_returned) { - dbg("group_findchild failed."); + dbg("%s#6\n",clog_message_str[CMN_LOG_FAILED_OP]); goto errout_with_addchild; } child_returned = group_removechild(group, child_pid); if (child != child_returned) { - dbg("group_removechild failed."); + dbg("%s#7\n",clog_message_str[CMN_LOG_FAILED_OP]); goto errout_with_addchild; } child_returned = group_findchild(group, child_pid); if (child_returned != NULL) { - dbg("group_removechild failed."); + dbg("%s#8\n",clog_message_str[CMN_LOG_FAILED_OP]); goto errout_with_addchild; } group_freechild(child); @@ -174,18 +175,18 @@ static int test_group_alloc_free(unsigned long arg) child = group_allocchild(); if (child == NULL) { - dbg("group_allocchild failed."); + dbg("%s#1\n",clog_message_str[CMN_LOG_FAILED_OP]); return ERROR; } if (child->flink != NULL) { - dbg("group_allocchild failed."); + dbg("%s#2\n",clog_message_str[CMN_LOG_FAILED_OP]); return ERROR; } child->flink = &child_dummy; group_freechild(child); if (child->flink == &child_dummy) { - dbg("group_freechild failed."); + dbg("%s#3\n",clog_message_str[CMN_LOG_FAILED_OP]); group_freechild(child); return ERROR; } @@ -205,7 +206,7 @@ static int test_group_removechildren(unsigned long arg) child = group_allocchild(); if (child == NULL) { - dbg("group_allocchild failed."); + dbg("%s#1\n",clog_message_str[CMN_LOG_FAILED_OP]); return ERROR; } @@ -219,13 +220,13 @@ static int test_group_removechildren(unsigned long arg) /* cross check starts */ child_returned = group_findchild(group, child_pid); if (child != child_returned) { - dbg("group_findchild failed."); + dbg("%s#2\n",clog_message_str[CMN_LOG_FAILED_OP]); goto errout_with_addchild; } group_removechildren(group); if (group->tg_children != NULL) { - dbg("group_removechildren failed."); + dbg("%s#3\n",clog_message_str[CMN_LOG_FAILED_OP]); goto errout_with_addchild; } group_freechild(child); diff --git a/os/drivers/os_api_test/kernel/test_kthread_stack_protection.c b/os/drivers/os_api_test/kernel/test_kthread_stack_protection.c index ee443c69e0..635380c2c2 100644 --- a/os/drivers/os_api_test/kernel/test_kthread_stack_protection.c +++ b/os/drivers/os_api_test/kernel/test_kthread_stack_protection.c @@ -30,6 +30,7 @@ #include #include #include +#include /**************************************************************************** * Pre-processor Definitions @@ -106,7 +107,7 @@ static int kernel_thread_stack_protection_test(int argc, FAR char *argv[]) *ptr = 'b'; ptr = ptr - 1; } - dbg(" Test stack access in overflow - Failed !!\n"); + dbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); } #elif defined(CONFIG_REG_STACK_OVERFLOW_PROTECTION) diff --git a/os/drivers/os_api_test/kernel/test_sched.c b/os/drivers/os_api_test/kernel/test_sched.c index 8b2e99713c..4692e57dc7 100644 --- a/os/drivers/os_api_test/kernel/test_sched.c +++ b/os/drivers/os_api_test/kernel/test_sched.c @@ -26,6 +26,7 @@ #include #include +#include /**************************************************************************** * Private Data @@ -50,7 +51,7 @@ static int test_is_alive_thread(unsigned long arg) { tcb = sched_gettcb((pid_t)arg); if (tcb == NULL) { - dbg("sched_gettcb failed. errno : %d\n", get_errno()); + dbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP],get_errno()); return ERROR; } return OK; @@ -60,7 +61,7 @@ static int test_get_tcb_adj_stack_size(unsigned long arg) { tcb = sched_gettcb((pid_t)arg); if (tcb == NULL) { - dbg("sched_gettcb failed. errno : %d\n", get_errno()); + dbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP],get_errno()); return ERROR; } return tcb->adj_stack_size; diff --git a/os/drivers/os_api_test/kernel/test_sem.c b/os/drivers/os_api_test/kernel/test_sem.c index a8746df0f1..40341586eb 100644 --- a/os/drivers/os_api_test/kernel/test_sem.c +++ b/os/drivers/os_api_test/kernel/test_sem.c @@ -28,6 +28,7 @@ #include #include +#include #include "clock/clock.h" @@ -46,7 +47,7 @@ static int test_sem_tick_wait(unsigned long arg) ret_chk = sem_init(&sem, 0, 1); if (ret_chk != OK) { - dbg("sem_init failed."); + dbg("%s#1 \n", clog_message_str[CMN_LOG_FAILED_OP]); return ERROR; } @@ -54,35 +55,35 @@ static int test_sem_tick_wait(unsigned long arg) ret_chk = clock_gettime(CLOCK_REALTIME, &base_time); if (ret_chk != OK) { - dbg("clock_gettime failed."); + dbg("%s#2 \n", clog_message_str[CMN_LOG_FAILED_OP]); goto errout_with_sem_init; } ret_chk = sem_tickwait(&sem, clock(), 2); if (ret_chk != OK) { - dbg("sem_tickwait failed."); + dbg("%s#3 \n", clog_message_str[CMN_LOG_FAILED_OP]); goto errout_with_sem_init; } ret_chk = clock_gettime(CLOCK_REALTIME, &cur_time); if (ret_chk != OK) { - dbg("clock_gettime failed."); + dbg("%s#4 \n", clog_message_str[CMN_LOG_FAILED_OP]); goto errout_with_sem_init; } if (base_time.tv_sec + 2 == cur_time.tv_sec) { - dbg("clock_gettime failed."); + dbg("%s#5 \n", clog_message_str[CMN_LOG_FAILED_OP]); goto errout_with_sem_init; } ret_chk = sem_post(&sem); if (ret_chk != OK) { - dbg("sem_post failed."); + dbg("%s#6 \n", clog_message_str[CMN_LOG_FAILED_OP]); goto errout_with_sem_init; } ret_chk = sem_destroy(&sem); if (ret_chk != OK) { - dbg("sem_destroy failed."); + dbg("%s#7 \n", clog_message_str[CMN_LOG_FAILED_OP]); goto errout_with_sem_init; } @@ -90,7 +91,7 @@ static int test_sem_tick_wait(unsigned long arg) ret_chk = sem_init(&sem, 0, 0); if (ret_chk != OK) { - dbg("sem_init failed."); + dbg("%s#8 \n", clog_message_str[CMN_LOG_FAILED_OP]); return ERROR; } @@ -98,25 +99,25 @@ static int test_sem_tick_wait(unsigned long arg) ret_chk = sem_tickwait(&sem, clock() - 2, 0); if (ret_chk != ERROR) { - dbg("sem_tickwait failed."); + dbg("%s#9 \n", clog_message_str[CMN_LOG_FAILED_OP]); goto errout_with_sem_init; } ret_chk = sem_tickwait(&sem, clock() - 2, 1); if (ret_chk != ERROR) { - dbg("sem_tickwait failed."); + dbg("%s#10 \n", clog_message_str[CMN_LOG_FAILED_OP]); goto errout_with_sem_init; } ret_chk = sem_tickwait(&sem, clock() - 2, 3); if (ret_chk != ERROR) { - dbg("sem_tickwait failed."); + dbg("%s#11 \n", clog_message_str[CMN_LOG_FAILED_OP]); goto errout_with_sem_init; } ret_chk = sem_destroy(&sem); if (ret_chk != OK) { - dbg("sem_destroy failed."); + dbg("%s#12 \n", clog_message_str[CMN_LOG_FAILED_OP]); goto errout_with_sem_init; } diff --git a/os/drivers/os_api_test/kernel/test_signal.c b/os/drivers/os_api_test/kernel/test_signal.c index b6de1e1f33..571fbcf6b8 100644 --- a/os/drivers/os_api_test/kernel/test_signal.c +++ b/os/drivers/os_api_test/kernel/test_signal.c @@ -29,6 +29,7 @@ #include #include "signal/signal.h" +#include /**************************************************************************** * Private Functions @@ -56,7 +57,7 @@ static int test_get_tcb_sigprocmask(unsigned long arg) struct tcb_s *tcb; tcb = sched_gettcb((pid_t)arg); if (tcb == NULL) { - dbg("sched_gettcb failed. errno : %d\n", get_errno()); + dbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP],get_errno()); return ERROR; } return tcb->sigprocmask; diff --git a/os/drivers/os_api_test/kernel/test_task.c b/os/drivers/os_api_test/kernel/test_task.c index 438b7fc229..6ddd8d92f3 100644 --- a/os/drivers/os_api_test/kernel/test_task.c +++ b/os/drivers/os_api_test/kernel/test_task.c @@ -31,6 +31,7 @@ #include #include +#include #include "sched/sched.h" #ifdef CONFIG_SCHED_HAVE_PARENT @@ -109,7 +110,7 @@ static int test_task_init(main_t entry) ret = task_init((struct tcb_s *)tcb, (const char *)TEST_TASK_NAME, (int)TEST_PRIORITY, stack, TEST_STACK_SIZE, entry, NULL); if (ret < 0) { - berr("Failed: task_init %d\n", ret); + berr("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP],ret); ret = -get_errno(); goto errout_with_stack; } diff --git a/os/drivers/os_api_test/kernel/test_timer.c b/os/drivers/os_api_test/kernel/test_timer.c index cbbf097a66..164c33c165 100644 --- a/os/drivers/os_api_test/kernel/test_timer.c +++ b/os/drivers/os_api_test/kernel/test_timer.c @@ -27,6 +27,7 @@ #include #include +#include #include "signal/signal.h" #include "timer/timer.h" @@ -71,12 +72,12 @@ static int test_timer_initialize(unsigned long arg) /* check the count for g_alloctimers and g_freetimers after create now they change */ ret_chk = timer_create(CLOCK_REALTIME, &st_sigevent, &timer_id); if (ret_chk == ERROR) { - dbg("timer_create failed."); + dbg("%s#1 \n", clog_message_str[CMN_LOG_FAILED_OP]); return ERROR; } if (timer_id == NULL) { - dbg("timer_create failed."); + dbg("%s#2 \n", clog_message_str[CMN_LOG_FAILED_OP]); return ERROR; } diff --git a/os/drivers/os_api_test/kernel/test_tz.c b/os/drivers/os_api_test/kernel/test_tz.c index 3aa4d65f49..2b95fdc3c9 100644 --- a/os/drivers/os_api_test/kernel/test_tz.c +++ b/os/drivers/os_api_test/kernel/test_tz.c @@ -22,6 +22,7 @@ #include #include +#include #include #ifdef CONFIG_AMEBAD_TRUSTZONE @@ -73,7 +74,7 @@ int test_tz(void) no_rdp_result = rdp_no_protection_call(no_protection_func, i); if (rdp_result != no_rdp_result) { - dbg("rdp call fail!\n"); + dbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); dbg("rdp_result = 0x%x, no_rdp_result=0x%x\n", rdp_result, no_rdp_result); break; } @@ -81,11 +82,11 @@ int test_tz(void) up_free_secure_context(); if (i == 32) { - dbg("rdp demo call succeed!\n"); + dbg("%s\n", clog_message_str[CMN_LOG_PERFORMING_OP]); return OK; } - dbg("rdp demo call FAILED\n"); + dbg("%s\n",clog_message_str[CMN_LOG_FAILED_OP]); return -EINTR; #else return -EPERM; diff --git a/os/drivers/otp/otp.c b/os/drivers/otp/otp.c index 4d6534792e..1c10f34ed0 100644 --- a/os/drivers/otp/otp.c +++ b/os/drivers/otp/otp.c @@ -20,6 +20,7 @@ * Included Files ****************************************************************************/ #include +#include #include #include @@ -38,7 +39,7 @@ do { \ int oulock_ret = sem_wait(&priv->ou_exclsem); \ if (oulock_ret < 0) { \ - lldbg("ERROR: ou_lock failed: %d\n", oulock_ret); \ + lldbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], oulock_ret); \ return oulock_ret; \ } \ } while (0) @@ -47,7 +48,7 @@ do { \ int oulock_ret = sem_post(&priv->ou_exclsem); \ if (oulock_ret < 0) { \ - lldbg("ERROR: ou unlock failed: %d\n", oulock_ret); \ + lldbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], oulock_ret); \ return oulock_ret; \ } \ } while (0) @@ -160,7 +161,7 @@ static ssize_t otp_read(struct file *filep, char *buffer, FAR struct otp_upperhalf_s *priv = inode->i_private; int res = OTP_READ(priv, 0, (uint8_t *)buffer, &buflen); if (res < 0) { - lldbg("Fail to read\n"); + lldbg("%s\n", clog_message_str[CMN_LOG_FILE_READ_ERROR]); return ENOTTY; } return buflen; @@ -229,7 +230,7 @@ int otp_register(struct otp_lowerhalf_s *lower) priv = (FAR struct otp_upperhalf_s *) kmm_zalloc(sizeof(struct otp_upperhalf_s)); if (!priv) { - lldbg("ERROR: Failed to allocate device structure\n"); + lldbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); return -ENOMEM; } @@ -242,7 +243,7 @@ int otp_register(struct otp_lowerhalf_s *lower) /* And register the GPIO driver */ ret = register_driver(OTP_DEV_PATH, &g_otp_ops, 0444, priv); if (ret < 0) { - lldbg("ERROR: register driver failed: %d\n", ret); + lldbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); goto errout_with_priv; } g_otp_dev = priv; @@ -265,7 +266,7 @@ int otp_register(struct otp_lowerhalf_s *lower) int otp_unregister(void) { if (!g_otp_dev) { - lldbg("ERROR: no registered device\n"); + lldbg("%s\n", clog_message_str[CMN_LOG_NULL_CHECK_FAIL]); return -1; } @@ -289,7 +290,7 @@ int otp_unregister(void) struct otp_upperhalf_s *get_otp_dev(void) { if (!g_otp_dev) { - lldbg("ERROR: no registered device\n"); + lldbg("%s\n", clog_message_str[CMN_LOG_NULL_CHECK_FAIL]); return NULL; } return g_otp_dev; diff --git a/os/drivers/otp/otpnull.c b/os/drivers/otp/otpnull.c index 3a83bd4108..2b89242c89 100644 --- a/os/drivers/otp/otpnull.c +++ b/os/drivers/otp/otpnull.c @@ -1,4 +1,5 @@ #include +#include #include #include #include diff --git a/os/drivers/pipes/fifo.c b/os/drivers/pipes/fifo.c index 39c2ad7275..ac122fbebb 100644 --- a/os/drivers/pipes/fifo.c +++ b/os/drivers/pipes/fifo.c @@ -55,6 +55,7 @@ ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/pipes/pipe.c b/os/drivers/pipes/pipe.c index fdb7b0bd1e..5086b82803 100644 --- a/os/drivers/pipes/pipe.c +++ b/os/drivers/pipes/pipe.c @@ -59,6 +59,7 @@ ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/pipes/pipe_common.c b/os/drivers/pipes/pipe_common.c index 020051c1b0..8877abc7a5 100644 --- a/os/drivers/pipes/pipe_common.c +++ b/os/drivers/pipes/pipe_common.c @@ -55,6 +55,7 @@ ****************************************************************************/ #include +#include #include #include @@ -218,7 +219,7 @@ int pipecommon_open(FAR struct file *filep) ret = sem_wait(&dev->d_bfsem); if (ret != OK) { - fdbg("sem_wait failed: %d\n", get_errno()); + fdbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], get_errno()); DEBUGASSERT(get_errno() > 0); return -get_errno(); } @@ -282,7 +283,7 @@ int pipecommon_open(FAR struct file *filep) * a signal. */ - fdbg("sem_wait failed: %d\n", get_errno()); + fdbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], get_errno()); DEBUGASSERT(get_errno() > 0); ret = -get_errno(); diff --git a/os/drivers/pm/pm.c b/os/drivers/pm/pm.c index 9c55c9d0d3..4e76fd1553 100644 --- a/os/drivers/pm/pm.c +++ b/os/drivers/pm/pm.c @@ -19,6 +19,7 @@ * Included Files ****************************************************************************/ #include +#include #include #include @@ -140,7 +141,7 @@ static int pm_ioctl(FAR struct file *filep, int cmd, unsigned long arg) break; #endif default: - pmvdbg("Invalid command passed!\n"); + pmvdbg("%s command\n", clog_message_str[CMN_LOG_INVALID_VAL]); break; } if (ret == ERROR) { diff --git a/os/drivers/power/battery_charger.c b/os/drivers/power/battery_charger.c index 32cabf66c8..c4e5a800ed 100644 --- a/os/drivers/power/battery_charger.c +++ b/os/drivers/power/battery_charger.c @@ -56,6 +56,7 @@ ****************************************************************************/ #include +#include #include #include @@ -226,7 +227,7 @@ static int bat_charger_ioctl(FAR struct file *filep, int cmd, unsigned long arg) break; default: - pmdbg("ERROR: Unrecognized cmd: %d\n", cmd); + pmdbg("%s cmd: %d\n", clog_message_str[CMN_LOG_INVALID_VAL], cmd); ret = -ENOTTY; break; } @@ -264,7 +265,7 @@ int battery_charger_register(FAR const char *devpath, FAR struct battery_charger ret = register_driver(devpath, &g_batteryops, 0555, dev); if (ret < 0) { - pmdbg("ERROR: Failed to register driver: %d\n", ret); + pmdbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); } return ret; diff --git a/os/drivers/power/battery_gauge.c b/os/drivers/power/battery_gauge.c index 1300dd3b0f..149f3d9ead 100644 --- a/os/drivers/power/battery_gauge.c +++ b/os/drivers/power/battery_gauge.c @@ -56,6 +56,7 @@ ****************************************************************************/ #include +#include #include #include @@ -214,7 +215,7 @@ static int bat_gauge_ioctl(FAR struct file *filep, int cmd, unsigned long arg) break; default: - pmdbg("ERROR: Unrecognized cmd: %d\n", cmd); + pmdbg("%s cmd: %d\n", clog_message_str[CMN_LOG_INVALID_VAL], cmd); ret = -ENOTTY; break; } @@ -252,7 +253,7 @@ int battery_gauge_register(FAR const char *devpath, FAR struct battery_gauge_dev ret = register_driver(devpath, &g_batteryops, 0555, dev); if (ret < 0) { - pmdbg("ERROR: Failed to register driver: %d\n", ret); + pmdbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); } return ret; diff --git a/os/drivers/prodconfig/prodconfig.c b/os/drivers/prodconfig/prodconfig.c index d377d01800..1e192305bc 100644 --- a/os/drivers/prodconfig/prodconfig.c +++ b/os/drivers/prodconfig/prodconfig.c @@ -19,6 +19,7 @@ * Included Files ****************************************************************************/ #include +#include #include #include #include diff --git a/os/drivers/seclink/seclink_drv.c b/os/drivers/seclink/seclink_drv.c index 664540078e..d6e7ba5cb6 100644 --- a/os/drivers/seclink/seclink_drv.c +++ b/os/drivers/seclink/seclink_drv.c @@ -20,6 +20,7 @@ * Included Files ****************************************************************************/ #include +#include #include #include @@ -45,7 +46,7 @@ do { \ int sl_res = sem_wait(lock); \ if (sl_res < 0) { \ - SLDRV_LOG(SLDRV_TAG" lock fail(%d)\n", errno); \ + SLDRV_LOG(SLDRV_TAG" %s lock(%d)\n", clog_message_str[CMN_LOG_FAILED_OP], errno); \ } \ } while (0) @@ -53,7 +54,7 @@ do { \ int sl_res = sem_post(lock); \ if (sl_res < 0) { \ - SLDRV_LOG(SLDRV_TAG" unlock fail(%d)\n", errno); \ + SLDRV_LOG(SLDRV_TAG" %s unlock(%d)\n", clog_message_str[CMN_LOG_FAILED_OP], errno); \ } \ } while (0) @@ -191,7 +192,7 @@ int se_register(const char *path, struct sec_lowerhalf_s *lower) hal_init_param hp = {0, 0}; int res = lower->ops->init(&hp); if (res < 0) { - dbg("Register SE fail(%d)\n", res); + dbg("%s Register SE(%d)\n", clog_message_str[CMN_LOG_FAILED_OP], res); kmm_free(upper); return -1; } @@ -215,24 +216,24 @@ int se_unregister(FAR struct sec_lowerhalf_s *lower) // de-initialize upper struct sec_upperhalf_s *upper = lower->parent; if (!upper) { - dbg("upper is null\n"); + dbg("%s\n", clog_message_str[CMN_LOG_NULL_CHECK_FAIL]); assert(0); } if (!upper->path) { - dbg("upper path is null\n"); + dbg("%s\n"), clog_message_str[CMN_LOG_NULL_CHECK_FAIL]; assert(0); } vdbg("unregister driver(%s)\n", upper->path); int res = unregister_driver(upper->path); if (res != 0) { - dbg("unregister driver path fail\n"); + dbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); } res = lower->ops->deinit(); if (res < 0) { - dbg("Unregister SE fail(%d)\n", res); + dbg("%s Unregister SE(%d)\n", clog_message_str[CMN_LOG_FAILED_OP], res); } kmm_free(upper->path); diff --git a/os/drivers/seclink/seclink_drv_auth.c b/os/drivers/seclink/seclink_drv_auth.c index 2bfbb6e0e2..3d64704f98 100644 --- a/os/drivers/seclink/seclink_drv_auth.c +++ b/os/drivers/seclink/seclink_drv_auth.c @@ -17,6 +17,7 @@ ****************************************************************************/ #include +#include #include #include @@ -91,7 +92,7 @@ int hd_handle_auth_request(int cmd, unsigned long arg, void *lower) SLDRV_CALL(res, req->res, remove_certificate, (info->key_idx)); break; default: - SLDRV_LOG("Invalid command error\n"); + SLDRV_LOG("%s command\n", clog_message_str[CMN_LOG_INVALID_VAL]); res = -ENOSYS; } return res; diff --git a/os/drivers/seclink/seclink_drv_common.c b/os/drivers/seclink/seclink_drv_common.c index 0914810587..ed9e66130f 100644 --- a/os/drivers/seclink/seclink_drv_common.c +++ b/os/drivers/seclink/seclink_drv_common.c @@ -16,6 +16,7 @@ * ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/seclink/seclink_drv_crypto.c b/os/drivers/seclink/seclink_drv_crypto.c index ee0ddc793f..2f6eae8235 100644 --- a/os/drivers/seclink/seclink_drv_crypto.c +++ b/os/drivers/seclink/seclink_drv_crypto.c @@ -16,6 +16,7 @@ * ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/seclink/seclink_drv_key.c b/os/drivers/seclink/seclink_drv_key.c index 2411587ca0..1ea24cc908 100644 --- a/os/drivers/seclink/seclink_drv_key.c +++ b/os/drivers/seclink/seclink_drv_key.c @@ -16,6 +16,7 @@ * ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/seclink/seclink_drv_ss.c b/os/drivers/seclink/seclink_drv_ss.c index 7ae4ad0711..78e8ebabee 100644 --- a/os/drivers/seclink/seclink_drv_ss.c +++ b/os/drivers/seclink/seclink_drv_ss.c @@ -16,6 +16,7 @@ * ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/seclink/seclink_drv_utils.c b/os/drivers/seclink/seclink_drv_utils.c index 66f568e224..9fbddf035c 100644 --- a/os/drivers/seclink/seclink_drv_utils.c +++ b/os/drivers/seclink/seclink_drv_utils.c @@ -16,6 +16,7 @@ * ****************************************************************************/ #include +#include #include #include #include "seclink_drv_utils.h" diff --git a/os/drivers/sensors/ppd42ns.c b/os/drivers/sensors/ppd42ns.c index 88634d3a1e..6a3f4aef87 100644 --- a/os/drivers/sensors/ppd42ns.c +++ b/os/drivers/sensors/ppd42ns.c @@ -20,6 +20,7 @@ * Included Files ****************************************************************************/ #include +#include #include #include #include @@ -173,7 +174,7 @@ static int ppd42ns_open(FAR struct file *filep) * A signal received while waiting for the last close * operation. */ - lldbg("ERROR: ppd42ns_takesem() failed: %d\n", ret); + lldbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); return ret; } @@ -189,7 +190,7 @@ static int ppd42ns_open(FAR struct file *filep) /* enable the gpio pin interrupt */ ret = priv->config->enable(priv->config, 1); if (ret < 0) { - lldbg("ERROR: failed to enable the interrupt handler. (ret=%d)\n", ret); + lldbg("%s (ret=%d)\n", clog_message_str[CMN_LOG_FAILED_OP], ret); goto errout_with_sem; } @@ -226,7 +227,7 @@ static int ppd42ns_close(FAR struct file *filep) /* Get exclusive access to the driver structure */ ret = ppd42ns_takesem(&priv->exclsem); if (ret < 0) { - lldbg("ERROR: ppd42ns_takesem() failed: %d\n", ret); + lldbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); return ret; } @@ -240,7 +241,7 @@ static int ppd42ns_close(FAR struct file *filep) /* disable the gpio pin interrupt */ ret = priv->config->enable(priv->config, 0); if (ret < 0) { - lldbg("ERROR: failed to disable the interrupt handler. (ret=%d)\n", ret); + lldbg("%s (ret=%d)\n", clog_message_str[CMN_LOG_FAILED_OP], ret); goto errout_with_sem; } @@ -270,7 +271,7 @@ static ssize_t ppd42ns_read(FAR struct file *filep, FAR char *buffer, size_t len ret = ppd42ns_takesem(&priv->datasem); if (ret < 0) { - lldbg("ERROR: ppd42ns_takesem() failed: %d\n", ret); + lldbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); return ret; } @@ -339,7 +340,7 @@ int ppd42ns_register(FAR const char *devname, FAR struct ppd42ns_config_s *confi /* validate ppd42ns config */ if (config == NULL || config->read_gpio == NULL || config->attach == NULL || config->enable == NULL) { ret = EINVAL; - lldbg("ERROR: invalid ppd42ns config\n"); + lldbg("%s\n", clog_message_str[CMN_LOG_INVALID_VAL]); return ret; } @@ -356,7 +357,7 @@ int ppd42ns_register(FAR const char *devname, FAR struct ppd42ns_config_s *confi /* attach the interrupt handler */ ret = priv->config->attach(priv->config, ppd42ns_interrupt_handler, (FAR void *)priv); if (ret < 0) { - lldbg("ERROR: failed to attach the interrupt handler. (ret=%d)\n", ret); + lldbg("%s (ret=%d)\n", clog_message_str[CMN_LOG_FAILED_OP], ret); sem_destroy(&priv->exclsem); sem_destroy(&priv->datasem); return ret; @@ -365,7 +366,7 @@ int ppd42ns_register(FAR const char *devname, FAR struct ppd42ns_config_s *confi /* register the character device driver */ ret = register_driver(devname, &g_ppd42ns_fops, 0666, priv); if (ret < 0) { - lldbg("ERROR: failed to register driver %s. (ret=%d)\n", devname, ret); + lldbg("%s %s. (ret=%d)\n", clog_message_str[CMN_LOG_FAILED_OP], devname, ret); sem_destroy(&priv->exclsem); sem_destroy(&priv->datasem); return ret; diff --git a/os/drivers/serial/lowconsole.c b/os/drivers/serial/lowconsole.c index 99b7a272ad..13db75fe21 100644 --- a/os/drivers/serial/lowconsole.c +++ b/os/drivers/serial/lowconsole.c @@ -55,6 +55,7 @@ ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/serial/serial.c b/os/drivers/serial/serial.c index a03d47dddb..f16ff9479b 100644 --- a/os/drivers/serial/serial.c +++ b/os/drivers/serial/serial.c @@ -55,6 +55,7 @@ ************************************************************************************/ #include +#include #include #include diff --git a/os/drivers/serial/serialirq.c b/os/drivers/serial/serialirq.c index 7189728d5e..47c7c65d03 100644 --- a/os/drivers/serial/serialirq.c +++ b/os/drivers/serial/serialirq.c @@ -55,6 +55,7 @@ ************************************************************************************/ #include +#include #include #include diff --git a/os/drivers/serial/uart_16550.c b/os/drivers/serial/uart_16550.c index ed177fc622..677027eea2 100644 --- a/os/drivers/serial/uart_16550.c +++ b/os/drivers/serial/uart_16550.c @@ -56,6 +56,7 @@ ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/spi/spi_bitbang.c b/os/drivers/spi/spi_bitbang.c index 3a45ae4a22..e204677083 100644 --- a/os/drivers/spi/spi_bitbang.c +++ b/os/drivers/spi/spi_bitbang.c @@ -54,6 +54,7 @@ ****************************************************************************/ #include +#include #include #include @@ -537,7 +538,7 @@ FAR struct spi_dev_s *spi_create_bitbang(FAR const struct spi_bitbang_ops_s *low priv = (FAR struct spi_bitbang_s *)kmm_zalloc(sizeof(struct spi_bitbang_s)); if (!priv) { - spidbg("Failed to allocate the device structure\n"); + spidbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); return NULL; } diff --git a/os/drivers/spi/spi_uio.c b/os/drivers/spi/spi_uio.c index 0ed8e4b05b..db937a7d83 100644 --- a/os/drivers/spi/spi_uio.c +++ b/os/drivers/spi/spi_uio.c @@ -22,6 +22,7 @@ ****************************************************************************/ #include +#include #include #include #include diff --git a/os/drivers/syslog/ramlog.c b/os/drivers/syslog/ramlog.c index 943e9ab58b..10aed871a7 100644 --- a/os/drivers/syslog/ramlog.c +++ b/os/drivers/syslog/ramlog.c @@ -55,6 +55,7 @@ ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/syslog/syslog_console.c b/os/drivers/syslog/syslog_console.c index d400c76178..df4c97d0fb 100644 --- a/os/drivers/syslog/syslog_console.c +++ b/os/drivers/syslog/syslog_console.c @@ -55,6 +55,7 @@ ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/task_manager/task_manager_drv.c b/os/drivers/task_manager/task_manager_drv.c index 49613b0077..9a2afe2e18 100644 --- a/os/drivers/task_manager/task_manager_drv.c +++ b/os/drivers/task_manager/task_manager_drv.c @@ -19,6 +19,7 @@ * Included Files ****************************************************************************/ #include +#include #include #include #include @@ -77,7 +78,7 @@ static int taskmgr_task_init(pid_t pid, void *usr_pause_handler) tcb = sched_gettcb(pid); if (!tcb) { - tmdbg("[TM] tcb is invalid. pid = %d.\n", pid); + tmdbg("%s [TM] tcb. pid = %d.\n", clog_message_str[CMN_LOG_INVALID_VAL], pid); return ERROR; } @@ -104,7 +105,7 @@ static struct task_group_s *taskmgr_get_group_struct(pid_t pid) tcb = sched_gettcb(pid); if (!tcb) { - tmdbg("[TM] tcb is invalid. pid = %d.\n", pid); + tmdbg("%s [TM] tcb. pid = %d.\n", clog_message_str[CMN_LOG_INVALID_VAL], pid); return NULL; } @@ -114,7 +115,7 @@ static struct task_group_s *taskmgr_get_group_struct(pid_t pid) static int taskmgr_group_bind(struct task_group_s *parent_group, struct pthread_tcb_s *child_tcb) { if (parent_group == NULL || child_tcb == NULL) { - tmdbg("[TM] Invalid parameter! Group bind is failed.\n"); + tmdbg("%s [TM] parameter! %s Group bind\n", clog_message_str[CMN_LOG_INVALID_VAL], clog_message_str[CMN_LOG_FAILED_OP]); return ERROR; } @@ -131,18 +132,18 @@ static int taskmgr_pthread_group_join(pid_t parent_pid, pid_t child_pid) parent_group = taskmgr_get_group_struct(parent_pid); child_tcb = (struct pthread_tcb_s *)sched_gettcb(child_pid); if (child_tcb == NULL) { - tmdbg("[TM] Cannot find Child TCB.\n"); + tmdbg("%s\n", clog_message_str[CMN_LOG_NULL_CHECK_FAIL]); return ERROR; } ret = taskmgr_group_bind(parent_group, child_tcb); if (ret != OK) { - tmdbg("[TM] Group bind is failed.\n"); + tmdbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); return ERROR; } ret = group_join(child_tcb); if (ret != OK) { - tmdbg("[TM] Group join is failed.\n"); + tmdbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); return ERROR; } @@ -156,7 +157,7 @@ static int taskmgr_pthread_ppid_change(pid_t parent_pid, pid_t child_pid) ptcb = (struct pthread_tcb_s *)sched_gettcb(child_pid); if (ptcb == NULL) { - tmdbg("[TM] Invalid pthread tcb. Pthread ppid change failed.\n"); + tmdbg("%s [TM] pthread tcb. %s Pthread ppid change\n", clog_message_str[CMN_LOG_INVALID_VAL], clog_message_str[CMN_LOG_FAILED_OP]); return ERROR; } @@ -193,7 +194,7 @@ static int taskmgr_ioctl(FAR struct file *filep, int cmd, unsigned long arg) data = (tm_drv_data_t *)arg; if (data == NULL) { - tmdbg("Invalid Argument.\n"); + tmdbg("%s Argument.\n", clog_message_str[CMN_LOG_INVALID_VAL]); return ERROR; } @@ -203,13 +204,13 @@ static int taskmgr_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case TMIOC_START: ret = taskmgr_task_init(data->pid, data->addr); if (ret != OK) { - tmdbg("Fail to init new task\n"); + tmdbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); } break; case TMIOC_PAUSE: tcb = sched_gettcb(data->pid); if (tcb == NULL) { - tmdbg("Invalid pid\n"); + tmdbg("%s pid\n", clog_message_str[CMN_LOG_INVALID_VAL]); return ERROR; } if (tcb->task_state == TSTATE_WAIT_SIG && tcb->waitdog != NULL) { @@ -225,7 +226,7 @@ static int taskmgr_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case TMIOC_UNICAST: tcb = sched_gettcb(data->pid); if (tcb == NULL) { - tmdbg("Invalid pid\n"); + tmdbg("%s pid\n", clog_message_str[CMN_LOG_INVALID_VAL]); return ERROR; } ret = (int)sig_is_handler_registered(tcb, SIGTM_UNICAST); @@ -239,7 +240,7 @@ static int taskmgr_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case TMIOC_BROADCAST: tcb = sched_gettcb(data->pid); if (tcb == NULL) { - tmdbg("Invalid pid\n"); + tmdbg("%s pid\n", clog_message_str[CMN_LOG_INVALID_VAL]); return ERROR; } ret = (int)sig_is_handler_registered(tcb, SIGTM_BROADCAST); @@ -253,7 +254,7 @@ static int taskmgr_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case TMIOC_CHECK_ALIVE: tcb = sched_gettcb(data->pid); if (tcb == NULL) { - tmdbg("Invalid pid\n"); + tmdbg("%s pid\n", clog_message_str[CMN_LOG_INVALID_VAL]); return ERROR; } ret = OK; @@ -261,7 +262,7 @@ static int taskmgr_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case TMIOC_TERMINATE: tcb = sched_gettcb(data->pid); if (tcb == NULL) { - tmdbg("Invalid pid\n"); + tmdbg("%s pid\n", clog_message_str[CMN_LOG_INVALID_VAL]); return ERROR; } if ((tcb->flags & TCB_FLAG_TTYPE_MASK) >> TCB_FLAG_TTYPE_SHIFT == TCB_FLAG_TTYPE_TASK) { @@ -310,7 +311,7 @@ static int taskmgr_ioctl(FAR struct file *filep, int cmd, unsigned long arg) ret = OK; break; default: - tmdbg("Unrecognized cmd: %d arg: %ld\n", cmd, arg); + tmdbg("%s cmd: %d arg: %ld\n", clog_message_str[CMN_LOG_INVALID_VAL], cmd, arg); break; } return ret; diff --git a/os/drivers/ttrace/ttrace.c b/os/drivers/ttrace/ttrace.c index 453c82622b..2bd4958992 100644 --- a/os/drivers/ttrace/ttrace.c +++ b/os/drivers/ttrace/ttrace.c @@ -21,6 +21,7 @@ ****************************************************************************/ #include +#include #include #include @@ -232,7 +233,7 @@ static int ttrace_ioctl(FAR struct file *filep, int cmd, unsigned long arg) ttdbg("Trace buffer size should be defined by menuconfig.\r\n"); break; default: - ttdbg("Invalid commands, cmd: %c, arg: %d\r\n", cmd, arg); + ttdbg("%s commands, cmd: %c, arg: %d\r\n", clog_message_str[CMN_LOG_INVALID_VAL], cmd, arg); break; } diff --git a/os/drivers/usbdev/cdcacm.c b/os/drivers/usbdev/cdcacm.c index 9041fc063a..ac11cf757b 100644 --- a/os/drivers/usbdev/cdcacm.c +++ b/os/drivers/usbdev/cdcacm.c @@ -55,6 +55,7 @@ ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/usbdev/cdcacm_desc.c b/os/drivers/usbdev/cdcacm_desc.c index ce054b28d8..498a863344 100644 --- a/os/drivers/usbdev/cdcacm_desc.c +++ b/os/drivers/usbdev/cdcacm_desc.c @@ -55,6 +55,7 @@ ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/usbdev/composite.c b/os/drivers/usbdev/composite.c index c15af90537..c014798240 100644 --- a/os/drivers/usbdev/composite.c +++ b/os/drivers/usbdev/composite.c @@ -55,6 +55,7 @@ ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/usbdev/composite_desc.c b/os/drivers/usbdev/composite_desc.c index a68d023cbd..7eb50dd80b 100644 --- a/os/drivers/usbdev/composite_desc.c +++ b/os/drivers/usbdev/composite_desc.c @@ -55,6 +55,7 @@ ****************************************************************************/ #include +#include #include diff --git a/os/drivers/usbdev/pl2303.c b/os/drivers/usbdev/pl2303.c index 6bbe9c6625..963179f9cd 100644 --- a/os/drivers/usbdev/pl2303.c +++ b/os/drivers/usbdev/pl2303.c @@ -57,6 +57,7 @@ ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/usbdev/usbdev_strings.c b/os/drivers/usbdev/usbdev_strings.c index 7fe8a3337c..a61ed450f6 100644 --- a/os/drivers/usbdev/usbdev_strings.c +++ b/os/drivers/usbdev/usbdev_strings.c @@ -55,6 +55,7 @@ ****************************************************************************/ #include +#include #include diff --git a/os/drivers/usbdev/usbdev_trace.c b/os/drivers/usbdev/usbdev_trace.c index 3b9942ebf4..be9a8afb9d 100644 --- a/os/drivers/usbdev/usbdev_trace.c +++ b/os/drivers/usbdev/usbdev_trace.c @@ -55,6 +55,7 @@ ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/usbdev/usbdev_trprintf.c b/os/drivers/usbdev/usbdev_trprintf.c index fda53274ae..f0332fa4fd 100644 --- a/os/drivers/usbdev/usbdev_trprintf.c +++ b/os/drivers/usbdev/usbdev_trprintf.c @@ -55,6 +55,7 @@ ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/usbdev/usbmsc.c b/os/drivers/usbdev/usbmsc.c index c9290f749a..679d9d8726 100644 --- a/os/drivers/usbdev/usbmsc.c +++ b/os/drivers/usbdev/usbmsc.c @@ -76,6 +76,7 @@ ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/usbdev/usbmsc_desc.c b/os/drivers/usbdev/usbmsc_desc.c index 68d17d9936..a60ae5d6cc 100644 --- a/os/drivers/usbdev/usbmsc_desc.c +++ b/os/drivers/usbdev/usbmsc_desc.c @@ -55,6 +55,7 @@ ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/usbdev/usbmsc_scsi.c b/os/drivers/usbdev/usbmsc_scsi.c index ad356cf089..92f9e8b916 100644 --- a/os/drivers/usbdev/usbmsc_scsi.c +++ b/os/drivers/usbdev/usbmsc_scsi.c @@ -73,6 +73,7 @@ ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/usbhost/rtl8723d.c b/os/drivers/usbhost/rtl8723d.c index 908d0b0f2d..d6f8432122 100644 --- a/os/drivers/usbhost/rtl8723d.c +++ b/os/drivers/usbhost/rtl8723d.c @@ -56,6 +56,7 @@ ****************************************************************************/ #include +#include #include #include @@ -288,7 +289,7 @@ static int usbhost_cfgdesc(FAR struct usbhost_rtk_wifi_s *priv, FAR const uint8_ for (i = 0; i < outdesc_index; i++) { ret = DRVR_EPALLOC(hport->drvr, &boutdesc[i], &priv->bulkout[i]); if (ret < 0) { - udbg("ERROR: Failed to allocate Bulk OUT endpoint\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); for (i = 0; i < outdesc_index; i++) { (void)DRVR_EPFREE(hport->drvr, priv->bulkout[i]); } @@ -300,7 +301,7 @@ static int usbhost_cfgdesc(FAR struct usbhost_rtk_wifi_s *priv, FAR const uint8_ for (i = 0; i < indesc_index; i++) { ret = DRVR_EPALLOC(hport->drvr, &bindesc[i], &priv->bulkin[i]); if (ret < 0) { - udbg("ERROR: Failed to allocate Bulk IN endpoint\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); for (i = 0; i < indesc_index; i++) { (void)DRVR_EPFREE(hport->drvr, priv->bulkin[i]); } @@ -355,7 +356,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass, FAR const uint8 /* Parse the configuration descriptor to get the endpoints */ ret = usbhost_cfgdesc(priv, configdesc, desclen); if (ret < 0) { - udbg("usbhost_cfgdesc() failed: %d\n", ret); + udbg("%s usbhost_cfgdesc(): %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); } g_rtk_wifi_connect = 1; @@ -460,13 +461,13 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass) for (i = 0; i < priv->nr_inep; i++) { ret = DRVR_CANCEL(priv->usbclass.hport->drvr, priv->bulkin[i]); if (ret < 0) - udbg("usbhost_disconnect: cancel bulk in fail \n"); + udbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); } for (i = 0; i < priv->nr_outep; i++) { ret = DRVR_CANCEL(priv->usbclass.hport->drvr, priv->bulkout[i]); if (ret < 0) - udbg("usbhost_disconnect: cancel bulk out fail \n"); + udbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); } /* call usbhost_destroy to free resource */ @@ -528,7 +529,7 @@ int usbhost_ctrl_req(void *priv, unsigned char bdir_in, unsigned int wvalue, uns /* alloc crtl req*/ ret = DRVR_ALLOC(hport->drvr, (FAR uint8_t **)&ctrlreq, &maxlen); if (ret < 0) { - udbg("DRVR_ALLOC failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_ALLOC_FAIL], ret); return ret; } @@ -559,7 +560,7 @@ int usbhost_ctrl_req(void *priv, unsigned char bdir_in, unsigned int wvalue, uns /*submit ctrl request: imxrt_ctrlin()*/ ret = DRVR_CTRLIN(hport->drvr, hport->ep0, ctrlreq, buf); if (ret < 0) { - udbg("ERROR: Failed to get device descriptor, %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); return ret; } @@ -690,7 +691,7 @@ int usbhost_cancel_bulk_in(void *priv) for (i = 0; i < p_rtk_wifi_usb->nr_inep; i++) { ret = DRVR_CANCEL(hport->drvr, p_rtk_wifi_usb->bulkin[i]); if (ret < 0) - udbg("ERROR: Failed to cancel bulk in, %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_INVALID_VAL], ret); } exit: @@ -717,7 +718,7 @@ int usbhost_cancel_bulk_out(void *priv) for (i = 0; i < p_rtk_wifi_usb->nr_outep; i++) { ret = DRVR_CANCEL(hport->drvr, p_rtk_wifi_usb->bulkout[i]); if (ret < 0) - udbg("ERROR: Failed to cancel bulk out, %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); } exit: diff --git a/os/drivers/usbhost/usbhost_cdcacm.c b/os/drivers/usbhost/usbhost_cdcacm.c index 0157527a60..70469a6e60 100644 --- a/os/drivers/usbhost/usbhost_cdcacm.c +++ b/os/drivers/usbhost/usbhost_cdcacm.c @@ -56,6 +56,7 @@ ****************************************************************************/ #include +#include #include #include @@ -685,7 +686,7 @@ static int usbhost_linecoding_send(FAR struct usbhost_cdcacm_s *priv) ret = DRVR_CTRLOUT(hport->drvr, hport->ep0, ctrlreq, priv->linecode); if (ret < 0) { - udbg("ERROR: DRVR_CTRLOUT failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); } return ret; @@ -761,7 +762,7 @@ static void usbhost_notification_work(FAR void *arg) ret = DRVR_ASYNCH(hport->drvr, priv->intin, (FAR uint8_t *)priv->notification, MAX_NOTIFICATION, usbhost_notification_callback, priv); if (ret < 0) { - udbg("ERROR: DRVR_ASYNCH failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); } } } @@ -819,7 +820,7 @@ static void usbhost_notification_callback(FAR void *arg, ssize_t nbytes) if (nbytes != -EAGAIN) #endif { - udbg("ERROR: Transfer failed: %d\n", nbytes); + udbg("%s Transfer: %d\n", clog_message_str[CMN_LOG_FAILED_OP], nbytes); } /* We don't know the nature of the failure, but we need to do all @@ -934,7 +935,7 @@ static void usbhost_txdata_work(FAR void *arg) * the device is disconnected). */ - udbg("ERROR: DRVR_TRANSFER for packet failed: %d\n", (int)nwritten); + udbg("%s DRVR_TRANSFER for packet: %d\n", clog_message_str[CMN_LOG_FAILED_OP], (int)nwritten); break; } } @@ -956,7 +957,7 @@ static void usbhost_txdata_work(FAR void *arg) * NAK'ed our packet. */ - udbg("ERROR: DRVR_TRANSFER for ZLP failed: %d\n", (int)nwritten); + udbg("%s DRVR_TRANSFER for ZLP: %d\n", clog_message_str[CMN_LOG_FAILED_OP], (int)nwritten); } } @@ -1062,7 +1063,7 @@ static void usbhost_rxdata_work(FAR void *arg) * device was not disconnected. */ - udbg("ERROR: DRVR_TRANSFER for packet failed: %d\n", (int)nread); + udbg("%s DRVR_TRANSFER for packet: %d\n", clog_message_str[CMN_LOG_FAILED_OP], (int)nread); break; } @@ -1490,13 +1491,13 @@ static int usbhost_cfgdesc(FAR struct usbhost_cdcacm_s *priv, FAR const uint8_t ret = DRVR_EPALLOC(hport->drvr, &boutdesc, &priv->bulkout); if (ret < 0) { - udbg("ERROR: Failed to allocate Bulk OUT endpoint\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); return ret; } ret = DRVR_EPALLOC(hport->drvr, &bindesc, &priv->bulkin); if (ret < 0) { - udbg("ERROR: Failed to allocate Bulk IN endpoint\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); (void)DRVR_EPFREE(hport->drvr, priv->bulkout); return ret; } @@ -1506,7 +1507,7 @@ static int usbhost_cfgdesc(FAR struct usbhost_cdcacm_s *priv, FAR const uint8_t if ((found & USBHOST_HAVE_CTRLIF) == USBHOST_HAVE_CTRLIF) { ret = DRVR_EPALLOC(hport->drvr, &iindesc, &priv->intin); if (ret < 0) { - udbg("ERROR: Failed to allocate Interrupt IN endpoint\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); priv->intin = NULL; } } @@ -1628,7 +1629,7 @@ static int usbhost_alloc_buffers(FAR struct usbhost_cdcacm_s *priv) ret = DRVR_ALLOC(hport->drvr, (FAR uint8_t **)&priv->ctrlreq, &maxlen); if (ret < 0) { - udbg("ERROR: DRVR_ALLOC of ctrlreq failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_ALLOC_FAIL], ret); goto errout; } @@ -1638,7 +1639,7 @@ static int usbhost_alloc_buffers(FAR struct usbhost_cdcacm_s *priv) ret = DRVR_IOALLOC(hport->drvr, &priv->linecode, sizeof(struct cdc_linecoding_s)); if (ret < 0) { - udbg("ERROR: DRVR_IOALLOC of line coding failed: %d (%d bytes)\n", ret, sizeof(struct cdc_linecoding_s)); + udbg("%s %d (%d bytes)\n", clog_message_str[CMN_LOG_ALLOC_FAIL], ret, sizeof(struct cdc_linecoding_s)); goto errout; } #ifdef HAVE_INTIN_ENDPOINT @@ -1647,7 +1648,7 @@ static int usbhost_alloc_buffers(FAR struct usbhost_cdcacm_s *priv) if (priv->intin) { ret = DRVR_IOALLOC(hport->drvr, &priv->notification, MAX_NOTIFICATION); if (ret < 0) { - udbg("ERROR: DRVR_IOALLOC of line status failed: %d (%d bytes)\n", ret, MAX_NOTIFICATION); + udbg("%s %d (%d bytes)\n", clog_message_str[CMN_LOG_ALLOC_FAIL], ret, MAX_NOTIFICATION); goto errout; } } @@ -1661,7 +1662,7 @@ static int usbhost_alloc_buffers(FAR struct usbhost_cdcacm_s *priv) ret = DRVR_IOALLOC(hport->drvr, &priv->inbuf, priv->pktsize); if (ret < 0) { - udbg("ERROR: DRVR_IOALLOC of Bulk IN buffer failed: %d (%d bytes)\n", ret, priv->pktsize); + udbg("%s %d (%d bytes)\n", clog_message_str[CMN_LOG_ALLOC_FAIL], ret, priv->pktsize); goto errout; } @@ -1669,7 +1670,7 @@ static int usbhost_alloc_buffers(FAR struct usbhost_cdcacm_s *priv) ret = DRVR_IOALLOC(hport->drvr, &priv->outbuf, priv->pktsize); if (ret < 0) { - udbg("ERROR: DRVR_IOALLOC of Bulk OUT buffer failed: %d (%d bytes)\n", ret, priv->pktsize); + udbg("%s %d (%d bytes)\n", clog_message_str[CMN_LOG_ALLOC_FAIL], ret, priv->pktsize); goto errout; } @@ -1889,7 +1890,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass, FAR const uint8 ret = usbhost_cfgdesc(priv, configdesc, desclen); if (ret < 0) { - udbg("usbhost_cfgdesc() failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); goto errout; } @@ -1897,7 +1898,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass, FAR const uint8 ret = usbhost_alloc_buffers(priv); if (ret < 0) { - udbg("ERROR: Failed to allocate transfer buffer\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); goto errout; } #ifdef HAVE_CTRL_INTERFACE @@ -1905,7 +1906,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass, FAR const uint8 ret = usbhost_linecoding_send(priv); if (ret < 0) { - udbg("usbhost_linecoding_send() failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); } #endif @@ -1917,7 +1918,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass, FAR const uint8 ret = uart_register(devname, &priv->uartdev); if (ret < 0) { - udbg("uart_register() failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); goto errout; } #ifdef HAVE_INTIN_ENDPOINT @@ -1929,7 +1930,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass, FAR const uint8 uvdbg("Start notification monitoring\n"); ret = DRVR_ASYNCH(hport->drvr, priv->intin, (FAR uint8_t *)priv->notification, MAX_NOTIFICATION, usbhost_notification_callback, priv); if (ret < 0) { - udbg("ERROR: DRVR_ASYNCH failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); } } #endif @@ -2004,12 +2005,12 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass) ret = DRVR_CANCEL(hport->drvr, priv->bulkin); if (ret < 0) { - udbg("ERROR: Bulk IN DRVR_CANCEL failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); } ret = DRVR_CANCEL(hport->drvr, priv->bulkout); if (ret < 0) { - udbg("ERROR: Bulk OUT DRVR_CANCEL failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); } #ifdef HAVE_INTIN_ENDPOINT /* Cancel any pending asynchronous I/O */ @@ -2017,7 +2018,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass) if (priv->intin) { int ret = DRVR_CANCEL(hport->drvr, priv->intin); if (ret < 0) { - udbg("ERROR: Interrupt IN DRVR_CANCEL failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); } } #endif diff --git a/os/drivers/usbhost/usbhost_devaddr.c b/os/drivers/usbhost/usbhost_devaddr.c index 9061a3e1f8..617ea9e427 100644 --- a/os/drivers/usbhost/usbhost_devaddr.c +++ b/os/drivers/usbhost/usbhost_devaddr.c @@ -56,6 +56,7 @@ ****************************************************************************/ #include +#include #include #include @@ -299,7 +300,7 @@ int usbhost_devaddr_create(FAR struct usbhost_hubport_s *hport) usbhost_givesem(devgen); if (devaddr < 0) { - udbg("ERROR: Failed to allocate a device address\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); } return devaddr; diff --git a/os/drivers/usbhost/usbhost_enumerate.c b/os/drivers/usbhost/usbhost_enumerate.c index e4c4610b1b..a3cc722b05 100644 --- a/os/drivers/usbhost/usbhost_enumerate.c +++ b/os/drivers/usbhost/usbhost_enumerate.c @@ -55,6 +55,7 @@ ****************************************************************************/ #include +#include #include #include @@ -258,7 +259,7 @@ static inline int usbhost_classbind(FAR struct usbhost_hubport_s *hport, const u * should then free the allocated devclass instance. */ - udbg("CLASS_CONNECT failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); CLASS_DISCONNECTED(devclass); } else { *usbclass = devclass; @@ -325,13 +326,13 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport, FAR struct usbhost_cl ret = DRVR_ALLOC(hport->drvr, (FAR uint8_t **)&ctrlreq, &maxlen); if (ret < 0) { - udbg("DRVR_ALLOC failed: %d\n", ret); + udbg("%s DRVR_ALLOC: %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); return ret; } ret = DRVR_ALLOC(hport->drvr, &buffer, &maxlen); if (ret < 0) { - udbg("DRVR_ALLOC failed: %d\n", ret); + udbg("%s DRVR_ALLOC: %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); goto errout; } @@ -374,7 +375,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport, FAR struct usbhost_cl ret = DRVR_CTRLIN(hport->drvr, hport->ep0, ctrlreq, buffer); if (ret < 0) { - udbg("ERROR: Failed to get device descriptor, length=%d: %d\n", descsize, ret); + udbg("%s length=%d: %d\n", clog_message_str[CMN_LOG_FAILED_OP], descsize, ret); goto errout; } @@ -398,7 +399,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport, FAR struct usbhost_cl ret = DRVR_CTRLIN(hport->drvr, hport->ep0, ctrlreq, buffer); if (ret < 0) { - udbg("ERROR: Failed to get device descriptor, length=%d: %d\n", USB_SIZEOF_DEVDESC, ret); + udbg("%s length=%d: %d\n", clog_message_str[CMN_LOG_FAILED_OP], USB_SIZEOF_DEVDESC, ret); goto errout; } } @@ -415,7 +416,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport, FAR struct usbhost_cl funcaddr = usbhost_devaddr_create(hport); if (funcaddr < 0) { - udbg("ERROR: usbhost_devaddr_create failed: %d\n", ret); + udbg("%s usbhost_devaddr_create: %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); goto errout; } @@ -429,7 +430,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport, FAR struct usbhost_cl ret = DRVR_CTRLOUT(hport->drvr, hport->ep0, ctrlreq, NULL); if (ret < 0) { - udbg("ERROR: Failed to set address: %d\n"); + udbg("%s set address: %d\n", clog_message_str[CMN_LOG_FAILED_OP]); goto errout; } @@ -457,7 +458,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport, FAR struct usbhost_cl ret = DRVR_CTRLIN(hport->drvr, hport->ep0, ctrlreq, buffer); if (ret < 0) { - udbg("ERROR: Failed to get configuration descriptor, length=%d: %d\n", USB_SIZEOF_CFGDESC, ret); + udbg("%s length=%d: %d\n", clog_message_str[CMN_LOG_FAILED_OP], USB_SIZEOF_CFGDESC, ret); goto errout; } @@ -477,7 +478,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport, FAR struct usbhost_cl buffer = NULL; ret = DRVR_IOALLOC(hport->drvr, &buffer, cfglen); if (ret < 0) { - udbg("DRVR_IOALLOC failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); goto errout; } isiobuff = true; @@ -495,7 +496,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport, FAR struct usbhost_cl ret = DRVR_CTRLIN(hport->drvr, hport->ep0, ctrlreq, buffer); if (ret < 0) { - udbg("ERROR: Failed to get configuration descriptor, length=%d: %d\n", cfglen, ret); + udbg("%s length=%d: %d\n", clog_message_str[CMN_LOG_FAILED_OP], cfglen, ret); goto errout; } @@ -509,7 +510,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport, FAR struct usbhost_cl ret = DRVR_CTRLOUT(hport->drvr, hport->ep0, ctrlreq, NULL); if (ret < 0) { - udbg("ERROR: Failed to set configuration: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); goto errout; } @@ -525,7 +526,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport, FAR struct usbhost_cl ret = usbhost_configdesc(buffer, cfglen, &id); if (ret < 0) { - udbg("ERROR: usbhost_configdesc failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); goto errout; } } @@ -562,7 +563,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport, FAR struct usbhost_cl ret = usbhost_classbind(hport, buffer, cfglen, &id, devclass); if (ret < 0) { - udbg("ERROR: usbhost_classbind failed %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); } } diff --git a/os/drivers/usbhost/usbhost_findclass.c b/os/drivers/usbhost/usbhost_findclass.c index c3cdd3245f..acfe35e519 100644 --- a/os/drivers/usbhost/usbhost_findclass.c +++ b/os/drivers/usbhost/usbhost_findclass.c @@ -55,6 +55,7 @@ ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/usbhost/usbhost_hub.c b/os/drivers/usbhost/usbhost_hub.c index 9e96cad56e..3eeb538b36 100644 --- a/os/drivers/usbhost/usbhost_hub.c +++ b/os/drivers/usbhost/usbhost_hub.c @@ -56,6 +56,7 @@ ****************************************************************************/ #include +#include #include #include @@ -289,7 +290,7 @@ static int usbhost_hport_activate(FAR struct usbhost_hubport_s *hport) ret = DRVR_EPALLOC(hport->drvr, &epdesc, &hport->ep0); if (ret < 0) { - udbg("ERROR: Failed to allocate ep0: %d\n", ret); + udbg("%s ep0: %d\n", clog_message_str[CMN_LOG_ALLOC_FAIL], ret); } return ret; @@ -456,7 +457,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_class_s *hubclass, FAR cons ret = DRVR_EPALLOC(hport->drvr, &intindesc, &priv->intin); if (ret < 0) { - udbg("ERROR: Failed to allocate Interrupt IN endpoint: %d\n", ret); + udbg("%s Interrupt IN endpoint: %d\n", clog_message_str[CMN_LOG_ALLOC_FAIL], ret); (void)DRVR_EPFREE(hport->drvr, priv->intin); return ret; } @@ -516,7 +517,7 @@ static inline int usbhost_hubdesc(FAR struct usbhost_class_s *hubclass) ret = DRVR_CTRLIN(hport->drvr, hport->ep0, ctrlreq, (FAR uint8_t *)&hubdesc); if (ret < 0) { - udbg("ERROR: Failed to read hub descriptor: %d\n", ret); + udbg("%s read hub descriptor: %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); return ret; } @@ -616,7 +617,7 @@ static int usbhost_hubpwr(FAR struct usbhost_hubpriv_s *priv, FAR struct usbhost ret = DRVR_CTRLOUT(hport->drvr, hport->ep0, ctrlreq, NULL); if (ret < 0) { - udbg("ERROR: Failed to power %s port %d: %d\n", on ? "UP" : "DOWN", port, ret); + udbg("%s power %s port %d: %d\n", clog_message_str[CMN_LOG_FAILED_OP], on ? "UP" : "DOWN", port, ret); return ret; } } @@ -706,7 +707,7 @@ static void usbhost_hub_event(FAR void *arg) ret = DRVR_CTRLIN(hport->drvr, hport->ep0, ctrlreq, (FAR uint8_t *)&portstatus); if (ret < 0) { - udbg("ERROR: Failed to read port %d status: %d\n", port, ret); + udbg("%s read port %d status: %d\n", clog_message_str[CMN_LOG_FAILED_OP], port, ret); continue; } @@ -727,7 +728,7 @@ static void usbhost_hub_event(FAR void *arg) ret = DRVR_CTRLOUT(hport->drvr, hport->ep0, ctrlreq, NULL); if (ret < 0) { - udbg("ERROR: Failed to clear port %d change mask %04x: %d\n", port, mask, ret); + udbg("%s clear port %d change mask %04x: %d\n", clog_message_str[CMN_LOG_FAILED_OP], port, mask, ret); } change &= (~mask); @@ -759,7 +760,7 @@ static void usbhost_hub_event(FAR void *arg) ret = DRVR_CTRLIN(hport->drvr, hport->ep0, ctrlreq, (FAR uint8_t *)&portstatus); if (ret < 0) { - udbg("ERROR: Failed to get port %d status: %d\n", port, ret); + udbg("%s get port %d status: %d\n", clog_message_str[CMN_LOG_FAILED_OP], port, ret); break; } @@ -792,7 +793,7 @@ static void usbhost_hub_event(FAR void *arg) } if (ret < 0 || debouncetime >= 1500) { - udbg("ERROR: Failed to debounce port %d: %d\n", port, ret); + udbg("%s debounce port %d: %d\n", clog_message_str[CMN_LOG_FAILED_OP], port, ret); continue; } @@ -809,7 +810,7 @@ static void usbhost_hub_event(FAR void *arg) ret = DRVR_CTRLOUT(hport->drvr, hport->ep0, ctrlreq, NULL); if (ret < 0) { - udbg("ERROR: Failed to reset port %d: %d\n", port, ret); + udbg("%s reset port %d: %d\n", clog_message_str[CMN_LOG_FAILED_OP], port, ret); continue; } @@ -823,7 +824,7 @@ static void usbhost_hub_event(FAR void *arg) ret = DRVR_CTRLIN(hport->drvr, hport->ep0, ctrlreq, (FAR uint8_t *)&portstatus); if (ret < 0) { - udbg("ERROR: Failed to get port %d status: %d\n", port, ret); + udbg("%s get port %d status: %d\n", clog_message_str[CMN_LOG_FAILED_OP], port, ret); continue; } @@ -856,18 +857,18 @@ static void usbhost_hub_event(FAR void *arg) ret = usbhost_hport_activate(connport); if (ret < 0) { - udbg("ERROR: usbhost_hport_activate failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); } else { /* Inform waiters that a new device has been connected */ ret = DRVR_CONNECT(connport->drvr, connport, true); if (ret < 0) { - udbg("ERROR: DRVR_CONNECT failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); usbhost_hport_deactivate(connport); } } } else { - udbg("ERROR: Failed to enable port %d\n", port); + udbg("%s enable port %d\n", clog_message_str[CMN_LOG_FAILED_OP], port); continue; } } else { @@ -915,7 +916,7 @@ static void usbhost_hub_event(FAR void *arg) ret = DRVR_ASYNCH(hport->drvr, priv->intin, (FAR uint8_t *)priv->buffer, INTIN_BUFSIZE, usbhost_callback, hubclass); if (ret < 0) { - udbg("ERROR: Failed to queue interrupt endpoint: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); } } @@ -1112,7 +1113,7 @@ static void usbhost_callback(FAR void *arg, ssize_t nbytes) if (nbytes != -EAGAIN) #endif { - ulldbg("ERROR: Transfer failed: %d\n", (int)nbytes); + ulldbg("%s Transfer: %d\n", clog_message_str[CMN_LOG_FAILED_OP], (int)nbytes); } /* Indicate there there is nothing to do. So when the work is @@ -1203,7 +1204,7 @@ static FAR struct usbhost_class_s *usbhost_create(FAR struct usbhost_hubport_s * ret = DRVR_ALLOC(hport->drvr, (FAR uint8_t **)&priv->ctrlreq, &maxlen); if (ret < 0) { - udbg("ERROR: DRVR_ALLOC failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); goto errout_with_hub; } @@ -1211,7 +1212,7 @@ static FAR struct usbhost_class_s *usbhost_create(FAR struct usbhost_hubport_s * ret = DRVR_IOALLOC(hport->drvr, &priv->buffer, INTIN_BUFSIZE); if (ret < 0) { - udbg("ERROR: DRVR_IOALLOC failed: %d\n", ret); + udbg("%s DRVR_IOALLOC: %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); goto errout_with_ctrlreq; } @@ -1297,7 +1298,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *hubclass, FAR const uint8 ret = usbhost_cfgdesc(hubclass, configdesc, desclen); if (ret < 0) { - udbg("ERROR: Failed to parse config descriptor: %d\n", ret); + udbg("%s parse config descriptor: %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); return ret; } @@ -1317,7 +1318,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *hubclass, FAR const uint8 ret = usbhost_hubpwr(priv, hport, true); if (ret < 0) { - udbg("ERROR: usbhost_hubpwr failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); return ret; } @@ -1325,7 +1326,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *hubclass, FAR const uint8 ret = DRVR_ASYNCH(hport->drvr, priv->intin, (FAR uint8_t *)priv->buffer, INTIN_BUFSIZE, usbhost_callback, hubclass); if (ret < 0) { - udbg("ERROR: DRVR_ASYNCH failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); (void)usbhost_hubpwr(priv, hport, false); } diff --git a/os/drivers/usbhost/usbhost_registerclass.c b/os/drivers/usbhost/usbhost_registerclass.c index e65123f4d5..5781e90308 100644 --- a/os/drivers/usbhost/usbhost_registerclass.c +++ b/os/drivers/usbhost/usbhost_registerclass.c @@ -55,6 +55,7 @@ ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/usbhost/usbhost_registry.c b/os/drivers/usbhost/usbhost_registry.c index e5597a0ef5..57f4495260 100644 --- a/os/drivers/usbhost/usbhost_registry.c +++ b/os/drivers/usbhost/usbhost_registry.c @@ -55,6 +55,7 @@ ****************************************************************************/ #include +#include #include diff --git a/os/drivers/usbhost/usbhost_skeleton.c b/os/drivers/usbhost/usbhost_skeleton.c index c36e0b292c..37749648e1 100644 --- a/os/drivers/usbhost/usbhost_skeleton.c +++ b/os/drivers/usbhost/usbhost_skeleton.c @@ -55,6 +55,7 @@ ****************************************************************************/ #include +#include #include #include @@ -570,13 +571,13 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, FAR const ui ret = DRVR_EPALLOC(hport->drvr, &boutdesc, &priv->epout); if (ret < 0) { - udbg("ERROR: Failed to allocate Bulk OUT endpoint\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); return ret; } ret = DRVR_EPALLOC(hport->drvr, &bindesc, &priv->epin); if (ret < 0) { - udbg("ERROR: Failed to allocate Bulk IN endpoint\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); (void)DRVR_EPFREE(hport->drvr, priv->epout); return ret; } @@ -921,13 +922,13 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass, FAR const uint8 ret = usbhost_cfgdesc(priv, configdesc, desclen); if (ret < 0) { - udbg("usbhost_cfgdesc() failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); } else { /* Now configure the device and register the TinyAra driver */ ret = usbhost_devinit(priv); if (ret < 0) { - udbg("usbhost_devinit() failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); } } diff --git a/os/drivers/usbhost/usbhost_storage.c b/os/drivers/usbhost/usbhost_storage.c index 4d088bbdc4..2e96f0dd1f 100644 --- a/os/drivers/usbhost/usbhost_storage.c +++ b/os/drivers/usbhost/usbhost_storage.c @@ -55,6 +55,7 @@ ****************************************************************************/ #include +#include #include #include @@ -705,7 +706,7 @@ static inline int usbhost_testunitready(FAR struct usbhost_state_s *priv) cbw = usbhost_cbwalloc(priv); if (!cbw) { - udbg("ERROR: Failed to create CBW\n"); + udbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); return -ENOMEM; } @@ -738,7 +739,7 @@ static inline int usbhost_requestsense(FAR struct usbhost_state_s *priv) cbw = usbhost_cbwalloc(priv); if (!cbw) { - udbg("ERROR: Failed to create CBW\n"); + udbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); return -ENOMEM; } @@ -777,7 +778,7 @@ static inline int usbhost_readcapacity(FAR struct usbhost_state_s *priv) cbw = usbhost_cbwalloc(priv); if (!cbw) { - udbg("ERROR: Failed to create CBW\n"); + udbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); return -ENOMEM; } @@ -821,7 +822,7 @@ static inline int usbhost_inquiry(FAR struct usbhost_state_s *priv) cbw = usbhost_cbwalloc(priv); if (!cbw) { - udbg("ERROR: Failed to create CBW\n"); + udbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); return -ENOMEM; } @@ -1108,13 +1109,13 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, FAR const ui ret = DRVR_EPALLOC(hport->drvr, &boutdesc, &priv->bulkout); if (ret < 0) { - udbg("ERROR: Failed to allocate Bulk OUT endpoint\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); return ret; } ret = DRVR_EPALLOC(hport->drvr, &bindesc, &priv->bulkin); if (ret < 0) { - udbg("ERROR: Failed to allocate Bulk IN endpoint\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); (void)DRVR_EPFREE(hport->drvr, priv->bulkout); return ret; } @@ -1154,7 +1155,7 @@ static inline int usbhost_initvolume(FAR struct usbhost_state_s *priv) ret = usbhost_talloc(priv); if (ret < 0) { - udbg("ERROR: Failed to allocate transfer buffer\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); return ret; } @@ -1681,13 +1682,13 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass, FAR const uint8 ret = usbhost_cfgdesc(priv, configdesc, desclen); if (ret < 0) { - udbg("usbhost_cfgdesc() failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); } else { /* Now configure the LUNs and register the block driver(s) */ ret = usbhost_initvolume(priv); if (ret < 0) { - udbg("usbhost_initvolume() failed: %d\n", ret); + udbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); } } diff --git a/os/drivers/usbhost/usbhost_trace.c b/os/drivers/usbhost/usbhost_trace.c index a8d50dc221..dfb2c666c0 100644 --- a/os/drivers/usbhost/usbhost_trace.c +++ b/os/drivers/usbhost/usbhost_trace.c @@ -55,6 +55,7 @@ ****************************************************************************/ #include +#include #include #include diff --git a/os/drivers/usbhost/uvc/usbhost_uvc_ctrl.c b/os/drivers/usbhost/uvc/usbhost_uvc_ctrl.c index e09d2fcca1..10fdfb8032 100644 --- a/os/drivers/usbhost/uvc/usbhost_uvc_ctrl.c +++ b/os/drivers/usbhost/uvc/usbhost_uvc_ctrl.c @@ -16,6 +16,7 @@ * ****************************************************************************/ #include +#include #include #include #include diff --git a/os/drivers/usbhost/uvc/usbhost_uvc_driver.c b/os/drivers/usbhost/uvc/usbhost_uvc_driver.c index c06db4fe57..d73bee9412 100644 --- a/os/drivers/usbhost/uvc/usbhost_uvc_driver.c +++ b/os/drivers/usbhost/uvc/usbhost_uvc_driver.c @@ -20,6 +20,7 @@ ****************************************************************************/ #include +#include #include #include @@ -1015,7 +1016,7 @@ int uvc_parse_vs_descriptor(FAR uvc_state_t *dev, const unsigned char *buffer, i uint32_t interval = 0; if (buflen <= 2) { - uvdbg("Invalid streaming interface descriptor.\n"); + uvdbg("%s\n", clog_message_str[CMN_LOG_INVALID_VAL]); return -EINVAL; } @@ -1031,13 +1032,13 @@ int uvc_parse_vs_descriptor(FAR uvc_state_t *dev, const unsigned char *buffer, i n = buflen >= size ? buffer[size - 1] : 0; if (buflen < size + p * n) { - uvdbg("Input descriptor is invalid.\n"); + uvdbg("%s\n", clog_message_str[CMN_LOG_INVALID_VAL]); goto error; } streaming = kmm_zalloc(sizeof(*streaming)); if (streaming == NULL) { - uvdbg("Memory allocation failure!!\n"); + uvdbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); return -ENOMEM; } @@ -1059,7 +1060,7 @@ int uvc_parse_vs_descriptor(FAR uvc_state_t *dev, const unsigned char *buffer, i streaming->header.bmaControls = kmm_zalloc(n); if (streaming->header.bmaControls == NULL) { ret = -ENOMEM; - uvdbg("Memory allocation failure!!\n"); + uvdbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); goto error; } @@ -1075,12 +1076,12 @@ int uvc_parse_vs_descriptor(FAR uvc_state_t *dev, const unsigned char *buffer, i /* Get the current stream from head and add the format to it */ streaming = queue_entry(dev->streams.head, struct uvc_streaming, list); if (streaming == NULL) { - uvdbg("No valid stream found!!\n"); + uvdbg("%s stream\n", clog_message_str[CMN_LOG_INVALID_VAL]); return -EINVAL; } format = kmm_zalloc(sizeof(*format)); if (format == NULL) { - uvdbg("Memory allocation failure!!\n"); + uvdbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); return -ENOMEM; } INIT_QUEUE_HEAD(&format->frames); @@ -1115,19 +1116,19 @@ int uvc_parse_vs_descriptor(FAR uvc_state_t *dev, const unsigned char *buffer, i case UVC_VS_FORMAT_MJPEG: if (buflen < 11) { - uvdbg("Not a valid MPEG header\n"); + uvdbg("%s MPEG header\n", clog_message_str[CMN_LOG_INVALID_VAL]); return -EINVAL; } /* Get the current stream and add the format to it */ streaming = queue_entry(dev->streams.head, struct uvc_streaming, list); if (streaming == NULL) { - uvdbg("No valid stream found!!\n"); + uvdbg("%s stream\n", clog_message_str[CMN_LOG_INVALID_VAL]); return -EINVAL; } format = kmm_zalloc(sizeof(*format)); if (format == NULL) { - udbg("Memory allocation failure!!\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); return -ENOMEM; } @@ -1157,13 +1158,13 @@ int uvc_parse_vs_descriptor(FAR uvc_state_t *dev, const unsigned char *buffer, i /* Get the current stream and add the format to it */ streaming = queue_entry(dev->streams.head, struct uvc_streaming, list); if (streaming == NULL) { - uvdbg("No valid stream found!!\n"); + uvdbg("%s\n", clog_message_str[CMN_LOG_NULL_CHECK_FAIL]); return -EINVAL; } format = queue_entry(streaming->formats.head, struct uvc_format, list); if (format == NULL) { - uvdbg("No valid format found!!\n"); + uvdbg("%s\n", clog_message_str[CMN_LOG_NULL_CHECK_FAIL]); return -EINVAL; } /* Check frame type matches with the one in format */ @@ -1177,13 +1178,13 @@ int uvc_parse_vs_descriptor(FAR uvc_state_t *dev, const unsigned char *buffer, i n = n ? n : 3; if (buflen < 26 + 4 * n) { - udbg("Invalid Frame Descriptor\n"); + udbg("%s Frame Descriptor\n", clog_message_str[CMN_LOG_INVALID_VAL]); return -EINVAL; } frame = kmm_zalloc(sizeof(*frame) + sizeof(uint32_t) * n); if (frame == NULL) { - uvdbg("Memory allocation failure!!\n"); + uvdbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); return -ENOMEM; } frame->bFrameIndex = buffer[3]; @@ -1227,19 +1228,19 @@ int uvc_parse_vs_descriptor(FAR uvc_state_t *dev, const unsigned char *buffer, i break; case UVC_VS_COLORFORMAT: if (buflen < 6) { - uvdbg("Invalid color format descriptor\n"); + uvdbg("%s descriptor\n", clog_message_str[CMN_LOG_INVALID_VAL]); return -EINVAL; } /* Get the current stream and format to it the color format */ streaming = queue_entry(dev->streams.head, struct uvc_streaming, list); if (streaming == NULL) { - uvdbg("No valid stream found!!"); + uvdbg("%s stream", clog_message_str[CMN_LOG_NULL_CHECK_FAIL]); return -EINVAL; } format = queue_entry(streaming->formats.head, struct uvc_format, list); if (format == NULL) { - uvdbg("No valid format found!!"); + uvdbg("%s\n", clog_message_str[CMN_LOG_NULL_CHECK_FAIL]); return -EINVAL; } format->colorspace = uvc_get_colorspace(buffer[3]); @@ -1319,7 +1320,7 @@ int uvc_parse_vc_descriptor(FAR uvc_state_t *dev, const unsigned char *buffer, i /* Allocate and initialize the input terminal entity */ term = uvc_alloc_entity(type | UVC_TERM_INPUT, itdes->bTerminalID, 1, itdes->bControlSize); if (term == NULL) { - udbg("Memory allocation failure!!\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); return -ENOMEM; } @@ -1353,7 +1354,7 @@ int uvc_parse_vc_descriptor(FAR uvc_state_t *dev, const unsigned char *buffer, i term = uvc_alloc_entity(type | UVC_TERM_OUTPUT, otdes->bTerminalID, 1, 0); if (term == NULL) { - udbg("Memory allocation failure!!\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); return -ENOMEM; } @@ -1373,7 +1374,7 @@ int uvc_parse_vc_descriptor(FAR uvc_state_t *dev, const unsigned char *buffer, i p = seldesc->bNrInPins; unit = uvc_alloc_entity(seldesc->bDescriptorType, seldesc->bUnitID, p + 1, 0); if (unit == NULL) { - udbg("Memory allocation failure!!\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); return -ENOMEM; } @@ -1396,7 +1397,7 @@ int uvc_parse_vc_descriptor(FAR uvc_state_t *dev, const unsigned char *buffer, i unit = uvc_alloc_entity(procdesc->bDescriptorSubtype, procdesc->bUnitID, 2, n); if (unit == NULL) { - udbg("Memory allocation failure!!\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); return -ENOMEM; } @@ -1423,7 +1424,7 @@ int uvc_parse_vc_descriptor(FAR uvc_state_t *dev, const unsigned char *buffer, i unit = uvc_alloc_entity(extdesc->bDescriptorSubtype, extdesc->bUnitID, p + 1, n); if (unit == NULL) { - udbg("Memory allocation failure!!\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); return -ENOMEM; } @@ -1488,7 +1489,7 @@ static int usbhost_uvc_cfgdesc(FAR struct usbhost_uvc_state_s *priv, FAR const u /* Verify that we were passed a configuration descriptor */ cfgdesc = (FAR struct usb_cfgdesc_s *)configdesc; if (cfgdesc->type != USB_DESC_TYPE_CONFIG) { - udbg("Not a valid configuration descriptor!!\n"); + udbg("%s descriptor!!\n", clog_message_str[CMN_LOG_INVALID_VAL]); return -EINVAL; } @@ -1533,7 +1534,7 @@ static int usbhost_uvc_cfgdesc(FAR struct usbhost_uvc_state_s *priv, FAR const u intf = kmm_zalloc(sizeof(*intf)); if (intf == NULL) { - udbg("Memory allocation failure!!\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); return -ENOMEM; } memcpy(intf, ifdesc, sizeof(struct usb_ifdesc_s)); @@ -1575,7 +1576,7 @@ static int usbhost_uvc_cfgdesc(FAR struct usbhost_uvc_state_s *priv, FAR const u ep = kmm_zalloc(sizeof(*ep)); if (ep == NULL) { - udbg("Memory allocation failure!!\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); return -ENOMEM; } @@ -1637,7 +1638,7 @@ int uvc_scan_device(FAR uvc_state_t *dev) chain = kmm_zalloc(sizeof(*chain)); if (chain == NULL) { - udbg("Memory allocation failed!!\n"); + udbg("%s\n", clog_message_str[CMN_LOG_ALLOC_FAIL]); return -ENOMEM; } @@ -1657,7 +1658,7 @@ int uvc_scan_device(FAR uvc_state_t *dev) } if (queue_empty(&dev->chains)) { - uvdbg("No valid video chain found.\n"); + uvdbg("%s video chain\n", clog_message_str[CMN_LOG_INVALID_VAL]); return -1; } @@ -1703,7 +1704,7 @@ static inline int usbhost_uvc_devinit(FAR struct usbhost_uvc_state_s *priv) /* Set aside a transfer buffer for exclusive use by the driver */ ret = usbhost_alloc_buffers(priv); if (ret < 0) { - udbg("Failed to allocate transfer buffer\n"); + udbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); goto errout; } @@ -1715,26 +1716,26 @@ static inline int usbhost_uvc_devinit(FAR struct usbhost_uvc_state_s *priv) /* Initialize controls. */ ret = uvc_ctrl_init_device(priv); if (ret < 0) { - udbg("Failed to initialize controls !\n"); + udbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); goto errout; } /* Scan the device for video chains. */ ret = uvc_scan_device(priv); if (ret < 0) { - udbg("Failed to scan and unit list !\n"); + udbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); goto errout; } ret = uvc_scan_stream(priv); if (ret < 0) { - udbg("Failed to scan and stream list !\n"); + udbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); } /* Register the Camera terminal to this device */ ret = uvc_register_camera(priv); if (ret < 0) { - udbg("Failed to get a camera terminal in this device !\n"); + udbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); goto errout; } @@ -1749,7 +1750,7 @@ static inline int usbhost_uvc_devinit(FAR struct usbhost_uvc_state_s *priv) g_lower_half.dev = priv; priv->video_priv = video_register(devname, &g_lower_half); if (priv->video_priv == NULL) { - udbg("Fail to register video driver!!\n"); + udbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); goto errout; } } @@ -1825,7 +1826,7 @@ static int uvc_register_camera(FAR uvc_state_t *dev) stream = (struct uvc_streaming *)uvc_stream_by_id(dev, term->id); if (stream == NULL) { - uvdbg("No streaming interface found for terminal %u.\n", term->id); + uvdbg("%s terminal %u.\n", clog_message_str[CMN_LOG_NULL_CHECK_FAIL], term->id); continue; } @@ -1969,7 +1970,7 @@ static int usbhost_uvc_connect(FAR struct usbhost_class_s *usbclass, FAR const u ret = usbhost_uvc_devinit(priv); if (ret < 0) { - uvdbg("usbhost_uvc_devinit() failed: %d\n", ret); + uvdbg("%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); goto errout; } } @@ -2085,7 +2086,7 @@ static int usbhost_uvc_ctrl_req(void *arg, uint8_t type, uint8_t req, uint16_t w ret = DRVR_CTRLOUT(hport->drvr, hport->ep0, ctrlreq, buf); } if (ret < 0) { - udbg("Failed to send EP0 request, %d\n", ret); + udbg("F%s %d\n", clog_message_str[CMN_LOG_FAILED_OP], ret); return ret; } /* On success return the length requested */ @@ -2145,7 +2146,7 @@ int usbhost_uvc_setinterface(FAR uvc_state_t *dev, uint8_t intfnum, uint8_t atli ret = usbhost_uvc_ctrl_req(dev, type, USB_REQ_SETINTERFACE, atlintf, intfnum, NULL, 0); if (ret < 0) { - uvdbg("Failed to set interface!!\n"); + uvdbg("%s\n", clog_message_str[CMN_LOG_FAILED_OP]); } return ret; diff --git a/os/drivers/usbhost/uvc/usbhost_uvc_v4l2.c b/os/drivers/usbhost/uvc/usbhost_uvc_v4l2.c index 212f9039d9..726364c0c8 100644 --- a/os/drivers/usbhost/uvc/usbhost_uvc_v4l2.c +++ b/os/drivers/usbhost/uvc/usbhost_uvc_v4l2.c @@ -24,6 +24,7 @@ #include #include +#include #include