This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 7b18f9d19fa4abfc279cd14ce2784690944ea17e Author: Petro Karashchenko <[email protected]> AuthorDate: Sat Aug 24 13:25:04 2024 -0400 nuttx: add missing 'FAR' and fix style issues Signed-off-by: Petro Karashchenko <[email protected]> --- arch/risc-v/src/common/riscv_exception.c | 4 +- boards/arm/stm32/common/src/stm32_drv8825.c | 53 ++++--- drivers/audio/vs1053.c | 223 ++++++++++++++-------------- drivers/usbhost/usbhost_cdcacm.c | 2 +- 4 files changed, 141 insertions(+), 141 deletions(-) diff --git a/arch/risc-v/src/common/riscv_exception.c b/arch/risc-v/src/common/riscv_exception.c index 6c296f67ef..ffa0b370dc 100644 --- a/arch/risc-v/src/common/riscv_exception.c +++ b/arch/risc-v/src/common/riscv_exception.c @@ -177,7 +177,7 @@ int riscv_fillpage(int mcause, void *regs, void *args) uintptr_t vaddr; uint32_t ptlevel; uintptr_t satp; - uint32_t mmuflags; + uint32_t mmuflags; _info("EXCEPTION: %s. MCAUSE: %" PRIxREG ", EPC: %" PRIxREG ", MTVAL: %" PRIxREG "\n", @@ -213,7 +213,7 @@ int riscv_fillpage(int mcause, void *regs, void *args) satp = READ_CSR(CSR_SATP); ptprev = riscv_pgvaddr(mmu_satp_to_paddr(satp)); ptlevel = ARCH_SPGTS; - paddr = mmu_pte_to_paddr(mmu_ln_getentry(ptlevel, ptprev, vaddr)); + paddr = mmu_pte_to_paddr(mmu_ln_getentry(ptlevel, ptprev, vaddr)); if (!paddr) { /* Nothing yet, allocate one page for final level page table */ diff --git a/boards/arm/stm32/common/src/stm32_drv8825.c b/boards/arm/stm32/common/src/stm32_drv8825.c index 9e597658a8..32796dedb2 100644 --- a/boards/arm/stm32/common/src/stm32_drv8825.c +++ b/boards/arm/stm32/common/src/stm32_drv8825.c @@ -59,13 +59,13 @@ static int drv8825_fault(void); static struct drv8825_ops_s g_drv8825_ops = { - drv8825_initialize, /* initialize */ - drv8825_step, /* step */ - drv8825_direction, /* direction */ - drv8825_microstepping, /* microstepping */ - drv8825_enable, /* enable */ - drv8825_idle, /* idle */ - drv8825_fault /* fault */ + drv8825_initialize, /* initialize */ + drv8825_step, /* step */ + drv8825_direction, /* direction */ + drv8825_microstepping, /* microstepping */ + drv8825_enable, /* enable */ + drv8825_idle, /* idle */ + drv8825_fault /* fault */ }; /**************************************************************************** @@ -82,13 +82,13 @@ static struct drv8825_ops_s g_drv8825_ops = static void drv8825_initialize(void) { - stm32_configgpio(GPIO_DIR); - stm32_configgpio(GPIO_STEP); - stm32_configgpio(GPIO_SLEEP); - stm32_configgpio(GPIO_M1); - stm32_configgpio(GPIO_M2); - stm32_configgpio(GPIO_M3); - stm32_configgpio(GPIO_RESET); + stm32_configgpio(GPIO_DIR); + stm32_configgpio(GPIO_STEP); + stm32_configgpio(GPIO_SLEEP); + stm32_configgpio(GPIO_M1); + stm32_configgpio(GPIO_M2); + stm32_configgpio(GPIO_M3); + stm32_configgpio(GPIO_RESET); } /**************************************************************************** @@ -101,7 +101,7 @@ static void drv8825_initialize(void) static void drv8825_step(int level) { - stm32_gpiowrite(GPIO_STEP, (bool)level); + stm32_gpiowrite(GPIO_STEP, (bool)level); } /**************************************************************************** @@ -114,7 +114,7 @@ static void drv8825_step(int level) static void drv8825_direction(int level) { - stm32_gpiowrite(GPIO_DIR, (bool)level); + stm32_gpiowrite(GPIO_DIR, (bool)level); } /**************************************************************************** @@ -127,9 +127,9 @@ static void drv8825_direction(int level) static void drv8825_microstepping(int ms1, int ms2, int ms3) { - stm32_gpiowrite(GPIO_M1, (bool)ms1); - stm32_gpiowrite(GPIO_M2, (bool)ms2); - stm32_gpiowrite(GPIO_M3, (bool)ms3); + stm32_gpiowrite(GPIO_M1, (bool)ms1); + stm32_gpiowrite(GPIO_M2, (bool)ms2); + stm32_gpiowrite(GPIO_M3, (bool)ms3); } /**************************************************************************** @@ -142,7 +142,7 @@ static void drv8825_microstepping(int ms1, int ms2, int ms3) static void drv8825_enable(int level) { - stm32_gpiowrite(GPIO_RESET, (bool)level); + stm32_gpiowrite(GPIO_RESET, (bool)level); } /**************************************************************************** @@ -155,7 +155,7 @@ static void drv8825_enable(int level) static void drv8825_idle(int level) { - stm32_gpiowrite(GPIO_SLEEP, !level); + stm32_gpiowrite(GPIO_SLEEP, !level); } /**************************************************************************** @@ -185,14 +185,11 @@ static int drv8825_fault(void) int board_drv8825_initialize(int devno) { - int ret; - char devname[15]; + char devname[15]; - drv8825_initialize(); + drv8825_initialize(); - snprintf(devname, sizeof(devname), "/dev/stepper%d", devno); + snprintf(devname, sizeof(devname), "/dev/stepper%d", devno); - ret = drv8825_register(devname, &g_drv8825_ops); - - return ret; + return drv8825_register(devname, &g_drv8825_ops); } diff --git a/drivers/audio/vs1053.c b/drivers/audio/vs1053.c index 8a31bb2cd5..2b2b1c1b5f 100644 --- a/drivers/audio/vs1053.c +++ b/drivers/audio/vs1053.c @@ -132,48 +132,49 @@ struct vs1053_struct_s * Private Function Prototypes ****************************************************************************/ -static int vs1053_getcaps(FAR struct audio_lowerhalf_s *lower, int type, - FAR struct audio_caps_s *caps); -static int vs1053_shutdown(FAR struct audio_lowerhalf_s *lower); +static int vs1053_getcaps(FAR struct audio_lowerhalf_s *lower, int type, + FAR struct audio_caps_s *caps); +static int vs1053_shutdown(FAR struct audio_lowerhalf_s *lower); #ifdef CONFIG_AUDIO_MULTI_SESSION -static int vs1053_configure(FAR struct audio_lowerhalf_s *lower, - FAR void *session, FAR const struct audio_caps_s *caps); -static int vs1053_start(FAR struct audio_lowerhalf_s *lower, - FAR void *session); +static int vs1053_configure(FAR struct audio_lowerhalf_s *lower, + FAR void *session, + FAR const struct audio_caps_s *caps); +static int vs1053_start(FAR struct audio_lowerhalf_s *lower, + FAR void *session); #ifndef CONFIG_AUDIO_EXCLUDE_STOP -static int vs1053_stop(FAR struct audio_lowerhalf_s *lower, - FAR void *session); +static int vs1053_stop(FAR struct audio_lowerhalf_s *lower, + FAR void *session); #endif #ifndef CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME -static int vs1053_pause(FAR struct audio_lowerhalf_s *lower, - FAR void *session); -static int vs1053_resume(FAR struct audio_lowerhalf_s *lower, - FAR void *session); +static int vs1053_pause(FAR struct audio_lowerhalf_s *lower, + FAR void *session); +static int vs1053_resume(FAR struct audio_lowerhalf_s *lower, + FAR void *session); #endif /* CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME */ -static int vs1053_reserve(FAR struct audio_lowerhalf_s *lower, - FAR void** session); -static int vs1053_release(FAR struct audio_lowerhalf_s *lower, - FAR void *session); +static int vs1053_reserve(FAR struct audio_lowerhalf_s *lower, + FAR void** session); +static int vs1053_release(FAR struct audio_lowerhalf_s *lower, + FAR void *session); #else -static int vs1053_configure(FAR struct audio_lowerhalf_s *lower, - FAR const struct audio_caps_s *caps); -static int vs1053_start(FAR struct audio_lowerhalf_s *lower); +static int vs1053_configure(FAR struct audio_lowerhalf_s *lower, + FAR const struct audio_caps_s *caps); +static int vs1053_start(FAR struct audio_lowerhalf_s *lower); #ifndef CONFIG_AUDIO_EXCLUDE_STOP -static int vs1053_stop(FAR struct audio_lowerhalf_s *lower); +static int vs1053_stop(FAR struct audio_lowerhalf_s *lower); #endif #ifndef CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME -static int vs1053_pause(FAR struct audio_lowerhalf_s *lower); -static int vs1053_resume(FAR struct audio_lowerhalf_s *lower); +static int vs1053_pause(FAR struct audio_lowerhalf_s *lower); +static int vs1053_resume(FAR struct audio_lowerhalf_s *lower); #endif /* CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME */ -static int vs1053_reserve(FAR struct audio_lowerhalf_s *lower); -static int vs1053_release(FAR struct audio_lowerhalf_s *lower); +static int vs1053_reserve(FAR struct audio_lowerhalf_s *lower); +static int vs1053_release(FAR struct audio_lowerhalf_s *lower); #endif /* CONFIG_AUDIO_MULTI_SESION */ -static int vs1053_enqueuebuffer(FAR struct audio_lowerhalf_s *lower, - FAR struct ap_buffer_s *apb); -static int vs1053_cancelbuffer(FAR struct audio_lowerhalf_s *lower, - FAR struct ap_buffer_s *apb); -static int vs1053_ioctl(FAR struct audio_lowerhalf_s *lower, int cmd, - unsigned long arg); +static int vs1053_enqueuebuffer(FAR struct audio_lowerhalf_s *lower, + FAR struct ap_buffer_s *apb); +static int vs1053_cancelbuffer(FAR struct audio_lowerhalf_s *lower, + FAR struct ap_buffer_s *apb); +static int vs1053_ioctl(FAR struct audio_lowerhalf_s *lower, int cmd, + unsigned long arg); /**************************************************************************** * Private Data @@ -209,7 +210,7 @@ static const struct audio_ops_s g_audioops = */ #ifndef CONFIG_AUDIO_EXCLUDE_VOLUME -static const uint8_t g_logtable [] = +static const uint8_t g_logtable[] = { 254, 170, 140, 122, 110, /* 0 - 8 */ 100, 92, 85, 80, 74, /* 10 - 18 */ @@ -306,8 +307,7 @@ static uint16_t vs1053_readreg(FAR struct vs1053_struct_s *dev, uint8_t reg) ****************************************************************************/ static void vs1053_writereg(FAR struct vs1053_struct_s *dev, - uint8_t reg, - uint16_t val) + uint8_t reg, uint16_t val) { FAR struct spi_dev_s *spi = dev->spi; @@ -343,18 +343,17 @@ static void vs1053_writereg(FAR struct vs1053_struct_s *dev, * ****************************************************************************/ -static int vs1053_setfrequency(FAR struct vs1053_struct_s *dev, - uint32_t freq) +static int vs1053_setfrequency(FAR struct vs1053_struct_s *dev, uint32_t freq) { - double factor; - uint16_t reg; - uint8_t timeout; + double factor; + uint16_t reg; + uint8_t timeout; audinfo("Entry\n"); /* Calculate the clock divisor based on the input frequency */ - factor = (double) freq / (double) CONFIG_VS1053_XTALI * 10.0 + 0.5; + factor = (double)freq / (double)CONFIG_VS1053_XTALI * 10.0 + 0.5; /* Check the input frequency against bounds */ @@ -372,13 +371,13 @@ static int vs1053_setfrequency(FAR struct vs1053_struct_s *dev, /* Calculate the clock mulit register based on the factor */ - if ((int) factor == 10) + if ((int)factor == 10) { reg = 0; } else { - reg = (((int) factor - 15) / 5) << VS1053_SC_MULT_SHIFT; + reg = (((int)factor - 15) / 5) << VS1053_SC_MULT_SHIFT; } /* Set the MULT_ADD factor to the max to allow the chip to dynamically @@ -526,10 +525,10 @@ static void vs1053_setvolume(FAR struct vs1053_struct_s *dev) static void vs1053_setbass(FAR struct vs1053_struct_s *dev) { FAR struct spi_dev_s *spi = dev->spi; - int bass_range; - int bass_boost; - int treble_range; - int treble_boost; + int bass_range; + int bass_boost; + int treble_range; + int treble_boost; /* Calculate range and boost based on level */ @@ -542,8 +541,8 @@ static void vs1053_setbass(FAR struct vs1053_struct_s *dev) vs1053_spi_lock(spi, dev->spi_freq); vs1053_writereg(dev, VS1053_SCI_BASS, - (treble_boost << 12) | (treble_range << 8) | - (bass_boost << 4) | bass_range); + (treble_boost << 12) | (treble_range << 8) | + (bass_boost << 4) | bass_range); vs1053_spi_unlock(spi); } #endif /* CONFIG_AUDIO_EXCLUDE_TONE */ @@ -556,7 +555,7 @@ static void vs1053_setbass(FAR struct vs1053_struct_s *dev) ****************************************************************************/ static int vs1053_getcaps(FAR struct audio_lowerhalf_s *lower, int type, - FAR struct audio_caps_s *caps) + FAR struct audio_caps_s *caps) { audinfo("Entry\n"); @@ -770,15 +769,15 @@ static int vs1053_getcaps(FAR struct audio_lowerhalf_s *lower, int type, #ifdef CONFIG_AUDIO_MULTI_SESSION static int vs1053_configure(FAR struct audio_lowerhalf_s *lower, - FAR void *session, FAR const struct audio_caps_s *caps) + FAR void *session, + FAR const struct audio_caps_s *caps) #else static int vs1053_configure(FAR struct audio_lowerhalf_s *lower, - FAR const struct audio_caps_s *caps) + FAR const struct audio_caps_s *caps) #endif { - int ret = OK; #if !defined(CONFIG_AUDIO_EXCLUDE_VOLUME) || !defined(CONFIG_AUDIO_EXCLUDE_TONE) - FAR struct vs1053_struct_s *dev = (struct vs1053_struct_s *) lower; + FAR struct vs1053_struct_s *dev = (FAR struct vs1053_struct_s *)lower; #endif audinfo("Entry\n"); @@ -824,7 +823,9 @@ static int vs1053_configure(FAR struct audio_lowerhalf_s *lower, dev->bass = caps->ac_controls.b[0]; if (dev->bass > 100) - dev->bass = 100; + { + dev->bass = 100; + } vs1053_setbass(dev); break; @@ -836,7 +837,9 @@ static int vs1053_configure(FAR struct audio_lowerhalf_s *lower, dev->treble = caps->ac_controls.b[0]; if (dev->treble > 100) - dev->treble = 100; + { + dev->treble = 100; + } vs1053_setbass(dev); break; @@ -865,7 +868,7 @@ static int vs1053_configure(FAR struct audio_lowerhalf_s *lower, break; } - return ret; + return OK; } /**************************************************************************** @@ -937,8 +940,8 @@ static int vs1053_hardreset(FAR struct vs1053_struct_s *dev) static int vs1053_shutdown(FAR struct audio_lowerhalf_s *lower) { - FAR struct vs1053_struct_s *dev = (struct vs1053_struct_s *) lower; - FAR struct spi_dev_s *spi = dev->spi; + FAR struct vs1053_struct_s *dev = (FAR struct vs1053_struct_s *)lower; + FAR struct spi_dev_s *spi = dev->spi; audinfo("Entry\n"); vs1053_spi_lock(spi, dev->spi_freq); /* Lock the device */ @@ -959,12 +962,12 @@ static int vs1053_shutdown(FAR struct audio_lowerhalf_s *lower) static void vs1053_feeddata(FAR struct vs1053_struct_s *dev) { - int bytecount; - int ret; - uint8_t *samp = NULL; - uint16_t reg; - struct ap_buffer_s *apb; - FAR struct spi_dev_s *spi = dev->spi; + int bytecount; + int ret; + uint8_t *samp = NULL; + uint16_t reg; + FAR struct ap_buffer_s *apb; + FAR struct spi_dev_s *spi = dev->spi; /* Check for false interrupt caused by an SCI transaction */ @@ -1189,10 +1192,10 @@ static void vs1053_feeddata(FAR struct vs1053_struct_s *dev) apb_free(apb); #ifdef CONFIG_AUDIO_MULTI_SESSION dev->lower.upper(dev->lower.priv, AUDIO_CALLBACK_DEQUEUE, - apb, OK, NULL); + apb, OK, NULL); #else dev->lower.upper(dev->lower.priv, AUDIO_CALLBACK_DEQUEUE, - apb, OK); + apb, OK); #endif /* Lock the buffer queue to pop the next buffer */ @@ -1200,11 +1203,11 @@ static void vs1053_feeddata(FAR struct vs1053_struct_s *dev) if ((ret = nxmutex_lock(&dev->apbq_lock)) < 0) { #ifdef CONFIG_AUDIO_MULTI_SESSION - dev->lower.upper(dev->lower.priv, - AUDIO_CALLBACK_IOERR, NULL, ret, NULL); + dev->lower.upper(dev->lower.priv, AUDIO_CALLBACK_IOERR, + NULL, ret, NULL); #else - dev->lower.upper(dev->lower.priv, - AUDIO_CALLBACK_IOERR, NULL, ret); + dev->lower.upper(dev->lower.priv, AUDIO_CALLBACK_IOERR, + NULL, ret); #endif auderr("ERROR: I/O error!\n"); @@ -1213,7 +1216,7 @@ static void vs1053_feeddata(FAR struct vs1053_struct_s *dev) /* Pop the next entry */ - apb = (struct ap_buffer_s *) dq_remfirst(&dev->apbq); + apb = (FAR struct ap_buffer_s *)dq_remfirst(&dev->apbq); dev->apb = apb; /* audinfo("Next Buffer = %p, bytes = %d\n", @@ -1252,8 +1255,8 @@ err_out: static int vs1053_dreq_isr(int irq, FAR void *context, FAR void *arg) { - struct vs1053_struct_s *dev = (struct vs1053_struct_s *)arg; - struct audio_msg_s msg; + FAR struct vs1053_struct_s *dev = (FAR struct vs1053_struct_s *)arg; + struct audio_msg_s msg; DEBUGASSERT(dev != NULL); @@ -1283,15 +1286,15 @@ static int vs1053_dreq_isr(int irq, FAR void *context, FAR void *arg) static void *vs1053_workerthread(pthread_addr_t pvarg) { - FAR struct vs1053_struct_s *dev = (struct vs1053_struct_s *) pvarg; - struct audio_msg_s msg; - FAR struct ap_buffer_s *apb; - int size; - unsigned int prio; + FAR struct vs1053_struct_s *dev = (FAR struct vs1053_struct_s *)pvarg; + struct audio_msg_s msg; + FAR struct ap_buffer_s *apb; + int size; + unsigned int prio; #ifndef CONFIG_AUDIO_EXCLUDE_STOP - uint16_t reg; + uint16_t reg; #endif - uint8_t timeout; + uint8_t timeout; audinfo("Entry\n"); @@ -1395,7 +1398,7 @@ static void *vs1053_workerthread(pthread_addr_t pvarg) { /* Get the next buffer from the queue */ - while ((apb = (FAR struct ap_buffer_s *) dq_remfirst(&dev->apbq)) + while ((apb = (FAR struct ap_buffer_s *)dq_remfirst(&dev->apbq)) != NULL) ; } @@ -1442,12 +1445,12 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower, static int vs1053_start(FAR struct audio_lowerhalf_s *lower) #endif { - FAR struct vs1053_struct_s *dev = (struct vs1053_struct_s *) lower; - struct mq_attr attr; - struct sched_param sparam; - pthread_attr_t tattr; - int ret; - void *value; + FAR struct vs1053_struct_s *dev = (FAR struct vs1053_struct_s *)lower; + struct mq_attr attr; + struct sched_param sparam; + pthread_attr_t tattr; + int ret; + FAR void *value; audinfo("Entry\n"); @@ -1492,7 +1495,7 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower) if ((ret = nxmutex_lock(&dev->apbq_lock)) == OK) { - dev->apb = (FAR struct ap_buffer_s *) dq_remfirst(&dev->apbq); + dev->apb = (FAR struct ap_buffer_s *)dq_remfirst(&dev->apbq); apb_reference(dev->apb); /* Add our buffer reference */ nxmutex_unlock(&dev->apbq_lock); } @@ -1519,7 +1522,7 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower) audinfo("Starting workerthread\n"); ret = pthread_create(&dev->threadid, &tattr, vs1053_workerthread, - (pthread_addr_t) dev); + (pthread_addr_t)dev); if (ret != OK) { auderr("ERROR: Can't create worker thread, ret=%d\n", ret); @@ -1549,9 +1552,9 @@ static int vs1053_stop(FAR struct audio_lowerhalf_s *lower, static int vs1053_stop(FAR struct audio_lowerhalf_s *lower) #endif { - FAR struct vs1053_struct_s *dev = (struct vs1053_struct_s *) lower; - struct audio_msg_s term_msg; - FAR void *value; + FAR struct vs1053_struct_s *dev = (FAR struct vs1053_struct_s *)lower; + struct audio_msg_s term_msg; + FAR void *value; /* Send a message to stop all audio streaming */ @@ -1594,7 +1597,7 @@ static int vs1053_pause(FAR struct audio_lowerhalf_s *lower, static int vs1053_pause(FAR struct audio_lowerhalf_s *lower) #endif { - FAR struct vs1053_struct_s *dev = (struct vs1053_struct_s *) lower; + FAR struct vs1053_struct_s *dev = (FAR struct vs1053_struct_s *)lower; if (!dev->running) { @@ -1624,7 +1627,7 @@ static int vs1053_resume(FAR struct audio_lowerhalf_s *lower, static int vs1053_resume(FAR struct audio_lowerhalf_s *lower) #endif { - FAR struct vs1053_struct_s *dev = (struct vs1053_struct_s *) lower; + FAR struct vs1053_struct_s *dev = (FAR struct vs1053_struct_s *)lower; if (!dev->running) { @@ -1650,9 +1653,9 @@ static int vs1053_resume(FAR struct audio_lowerhalf_s *lower) static int vs1053_enqueuebuffer(FAR struct audio_lowerhalf_s *lower, FAR struct ap_buffer_s *apb) { - FAR struct vs1053_struct_s *dev = (struct vs1053_struct_s *)lower; - struct audio_msg_s term_msg; - int ret; + FAR struct vs1053_struct_s *dev = (FAR struct vs1053_struct_s *)lower; + struct audio_msg_s term_msg; + int ret; audinfo("Entry\n"); @@ -1702,7 +1705,7 @@ static int vs1053_cancelbuffer(FAR struct audio_lowerhalf_s *lower, ****************************************************************************/ static int vs1053_ioctl(FAR struct audio_lowerhalf_s *lower, int cmd, - unsigned long arg) + unsigned long arg) { int ret = OK; #ifdef CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS @@ -1718,7 +1721,7 @@ static int vs1053_ioctl(FAR struct audio_lowerhalf_s *lower, int cmd, */ case AUDIOIOC_HWRESET: - vs1053_hardreset((FAR struct vs1053_struct_s *) lower); + vs1053_hardreset((FAR struct vs1053_struct_s *)lower); break; /* Report our preferred buffer size and quantity */ @@ -1726,7 +1729,7 @@ static int vs1053_ioctl(FAR struct audio_lowerhalf_s *lower, int cmd, #ifdef CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS case AUDIOIOC_GETBUFFERINFO: - bufinfo = (FAR struct ap_buffer_info_s *) arg; + bufinfo = (FAR struct ap_buffer_info_s *)arg; bufinfo->buffer_size = CONFIG_VS1053_BUFFER_SIZE; bufinfo->nbuffers = CONFIG_VS1053_NUM_BUFFERS; break; @@ -1749,13 +1752,13 @@ static int vs1053_ioctl(FAR struct audio_lowerhalf_s *lower, int cmd, #ifdef CONFIG_AUDIO_MULTI_SESSION static int vs1053_reserve(FAR struct audio_lowerhalf_s *lower, - FAR void **psession) + FAR void **psession) #else static int vs1053_reserve(FAR struct audio_lowerhalf_s *lower) #endif { - FAR struct vs1053_struct_s *dev = (struct vs1053_struct_s *) lower; - int ret; + FAR struct vs1053_struct_s *dev = (FAR struct vs1053_struct_s *)lower; + int ret; /* Borrow the APBQ mutex for thread sync */ @@ -1794,14 +1797,14 @@ static int vs1053_reserve(FAR struct audio_lowerhalf_s *lower) #ifdef CONFIG_AUDIO_MULTI_SESSION static int vs1053_release(FAR struct audio_lowerhalf_s *lower, - FAR void *psession) + FAR void *psession) #else static int vs1053_release(FAR struct audio_lowerhalf_s *lower) #endif { - FAR struct vs1053_struct_s *dev = (struct vs1053_struct_s *) lower; - void *value; - int ret; + FAR struct vs1053_struct_s *dev = (FAR struct vs1053_struct_s *)lower; + FAR void *value; + int ret; /* Join any old worker thread we had created to prevent a memory leak */ @@ -1843,9 +1846,9 @@ static int vs1053_release(FAR struct audio_lowerhalf_s *lower) * ****************************************************************************/ -struct audio_lowerhalf_s *vs1053_initialize(FAR struct spi_dev_s *spi, - FAR const struct vs1053_lower_s *lower, - unsigned int devno) +FAR struct audio_lowerhalf_s *vs1053_initialize(FAR struct spi_dev_s *spi, + FAR const struct vs1053_lower_s *lower, + unsigned int devno) { FAR struct vs1053_struct_s *dev; uint16_t status; diff --git a/drivers/usbhost/usbhost_cdcacm.c b/drivers/usbhost/usbhost_cdcacm.c index 2abb630833..bc4df2fe0f 100644 --- a/drivers/usbhost/usbhost_cdcacm.c +++ b/drivers/usbhost/usbhost_cdcacm.c @@ -296,7 +296,7 @@ static void usbhost_freeclass(FAR struct usbhost_cdcacm_s *usbclass); static int usbhost_devno_alloc(FAR struct usbhost_cdcacm_s *priv); static void usbhost_devno_free(FAR struct usbhost_cdcacm_s *priv); static inline void usbhost_mkdevname(FAR struct usbhost_cdcacm_s *priv, - FAR char *devname); + FAR char *devname); /* CDC/ACM request helpers */
