diff --git a/arch/arm/src/imx6/imx_enet.c b/arch/arm/src/imx6/imx_enet.c index 9c5f6ba44e6..08bfd95fdb6 100644 --- a/arch/arm/src/imx6/imx_enet.c +++ b/arch/arm/src/imx6/imx_enet.c @@ -136,7 +136,7 @@ /* TX timeout = 1 minute */ -#define IMX_TXTIMEOUT (60 * CLK_TCK) +#define IMX_TXTIMEOUT (60 * CLK_TCK) #define MII_MAXPOLLS (0x1ffff) #define LINK_WAITUS (500 * 1000) #define LINK_NLOOPS (10) diff --git a/arch/arm/src/sama5/sam_twi.c b/arch/arm/src/sama5/sam_twi.c index 21f09b943d1..aa83c8c8363 100644 --- a/arch/arm/src/sama5/sam_twi.c +++ b/arch/arm/src/sama5/sam_twi.c @@ -337,113 +337,113 @@ static struct twi_dev_s g_twi3 = #ifdef CONFIG_SAMA5_FLEXCOM0_TWI static const struct twi_attr_s g_twi4attr = - { - .twi = 4, - .pid = SAM_PID_FLEXCOM0, - .irq = SAM_IRQ_FLEXCOM0, - .sclcfg = PIO_TWI4_CK, - .sdacfg = PIO_TWI4_D, - .base = SAM_FLEXCOM0_VBASE + SAM_FLEXCOM_TWI_OFFSET - }; +{ + .twi = 4, + .pid = SAM_PID_FLEXCOM0, + .irq = SAM_IRQ_FLEXCOM0, + .sclcfg = PIO_TWI4_CK, + .sdacfg = PIO_TWI4_D, + .base = SAM_FLEXCOM0_VBASE + SAM_FLEXCOM_TWI_OFFSET +}; static struct twi_dev_s g_twi4 = - { - .dev = - { - .ops = &g_twiops, - }, - .attr = &g_twi4attr, - .lock = NXMUTEX_INITIALIZER, - .waitsem = SEM_INITIALIZER(0), - }; +{ + .dev = + { + .ops = &g_twiops, + }, + .attr = &g_twi4attr, + .lock = NXMUTEX_INITIALIZER, + .waitsem = SEM_INITIALIZER(0), +}; #endif #ifdef CONFIG_SAMA5_FLEXCOM1_TWI static const struct twi_attr_s g_twi5attr = - { - .twi = 5, - .pid = SAM_PID_FLEXCOM1, - .irq = SAM_IRQ_FLEXCOM1, - .sclcfg = PIO_TWI5_CK, - .sdacfg = PIO_TWI5_D, - .base = SAM_FLEXCOM1_VBASE + SAM_FLEXCOM_TWI_OFFSET - }; +{ + .twi = 5, + .pid = SAM_PID_FLEXCOM1, + .irq = SAM_IRQ_FLEXCOM1, + .sclcfg = PIO_TWI5_CK, + .sdacfg = PIO_TWI5_D, + .base = SAM_FLEXCOM1_VBASE + SAM_FLEXCOM_TWI_OFFSET +}; static struct twi_dev_s g_twi4 = - { - .dev = - { - .ops = &g_twiops, - }, - .attr = &g_twi5attr, - .lock = NXMUTEX_INITIALIZER, - .waitsem = SEM_INITIALIZER(0), - }; +{ + .dev = + { + .ops = &g_twiops, + }, + .attr = &g_twi5attr, + .lock = NXMUTEX_INITIALIZER, + .waitsem = SEM_INITIALIZER(0), +}; #endif #ifdef CONFIG_SAMA5_FLEXCOM2_TWI static const struct twi_attr_s g_twi6attr = - { - .twi = 6, - .pid = SAM_PID_FLEXCOM2, - .irq = SAM_IRQ_FLEXCOM2, - .sclcfg = PIO_TWI6_CK, - .sdacfg = PIO_TWI6_D, - .base = SAM_FLEXCOM2_VBASE + SAM_FLEXCOM_TWI_OFFSET - }; +{ + .twi = 6, + .pid = SAM_PID_FLEXCOM2, + .irq = SAM_IRQ_FLEXCOM2, + .sclcfg = PIO_TWI6_CK, + .sdacfg = PIO_TWI6_D, + .base = SAM_FLEXCOM2_VBASE + SAM_FLEXCOM_TWI_OFFSET +}; static struct twi_dev_s g_twi6 = - { - .dev = - { - .ops = &g_twiops, - }, - .attr = &g_twi6attr, - .lock = NXMUTEX_INITIALIZER, - .waitsem = SEM_INITIALIZER(0), - }; +{ + .dev = + { + .ops = &g_twiops, + }, + .attr = &g_twi6attr, + .lock = NXMUTEX_INITIALIZER, + .waitsem = SEM_INITIALIZER(0), +}; #endif #ifdef CONFIG_SAMA5_FLEXCOM3_TWI static const struct twi_attr_s g_twi7attr = - { - .twi = 7, - .pid = SAM_PID_FLEXCOM3, - .irq = SAM_IRQ_FLEXCOM3, - .sclcfg = PIO_TWI7_CK, - .sdacfg = PIO_TWI7_D, - .base = SAM_FLEXCOM3_VBASE + SAM_FLEXCOM_TWI_OFFSET - }; +{ + .twi = 7, + .pid = SAM_PID_FLEXCOM3, + .irq = SAM_IRQ_FLEXCOM3, + .sclcfg = PIO_TWI7_CK, + .sdacfg = PIO_TWI7_D, + .base = SAM_FLEXCOM3_VBASE + SAM_FLEXCOM_TWI_OFFSET +}; static struct twi_dev_s g_twi7 = - { - .dev = - { - .ops = &g_twiops, - }, - .attr = &g_twi7attr, - .lock = NXMUTEX_INITIALIZER, - .waitsem = SEM_INITIALIZER(0), - }; +{ + .dev = + { + .ops = &g_twiops, + }, + .attr = &g_twi7attr, + .lock = NXMUTEX_INITIALIZER, + .waitsem = SEM_INITIALIZER(0), +}; #endif #ifdef CONFIG_SAMA5_FLEXCOM4_TWI static const struct twi_attr_s g_twi8attr = - { - .twi = 8, - .pid = SAM_PID_FLEXCOM3, - .irq = SAM_IRQ_FLEXCOM3, - .sclcfg = PIO_TWI8_CK, - .sdacfg = PIO_TWI8_D, - .base = SAM_FLEXCOM4_VBASE + SAM_FLEXCOM_TWI_OFFSET - }; +{ + .twi = 8, + .pid = SAM_PID_FLEXCOM3, + .irq = SAM_IRQ_FLEXCOM3, + .sclcfg = PIO_TWI8_CK, + .sdacfg = PIO_TWI8_D, + .base = SAM_FLEXCOM4_VBASE + SAM_FLEXCOM_TWI_OFFSET +}; static struct twi_dev_s g_twi8 = - { - .dev = - { - .ops = &g_twiops, - }, - .attr = &g_twi8attr, - .lock = NXMUTEX_INITIALIZER, - .waitsem = SEM_INITIALIZER(0), - }; +{ + .dev = + { + .ops = &g_twiops, + }, + .attr = &g_twi8attr, + .lock = NXMUTEX_INITIALIZER, + .waitsem = SEM_INITIALIZER(0), +}; #endif /**************************************************************************** diff --git a/arch/arm/src/samv7/sam_emac.c b/arch/arm/src/samv7/sam_emac.c index 4f4445e37d4..708cacc35b5 100644 --- a/arch/arm/src/samv7/sam_emac.c +++ b/arch/arm/src/samv7/sam_emac.c @@ -3044,10 +3044,10 @@ static int sam_ioctl(struct net_driver_s *dev, int cmd, unsigned long arg) { #ifdef CONFIG_NETDEV_PHY_IOCTL #ifdef CONFIG_ARCH_PHY_INTERRUPT - case SIOCMIINOTIFY: /* Set up for PHY event notifications */ - { + case SIOCMIINOTIFY: /* Set up for PHY event notifications */ + { struct mii_ioctl_notify_s *req = - (struct mii_ioctl_notify_s *)((uintptr_t)arg); + (struct mii_ioctl_notify_s *)((uintptr_t)arg); ret = phy_notify_subscribe(dev->d_ifname, req->pid, &req->event); if (ret == OK) @@ -3063,7 +3063,7 @@ static int sam_ioctl(struct net_driver_s *dev, int cmd, unsigned long arg) case SIOCGMIIPHY: /* Get MII PHY address */ { struct mii_ioctl_data_s *req = - (struct mii_ioctl_data_s *)((uintptr_t)arg); + (struct mii_ioctl_data_s *)((uintptr_t)arg); req->phy_id = priv->phyaddr; ret = OK; } @@ -3072,7 +3072,7 @@ static int sam_ioctl(struct net_driver_s *dev, int cmd, unsigned long arg) case SIOCGMIIREG: /* Get register from MII PHY */ { struct mii_ioctl_data_s *req = - (struct mii_ioctl_data_s *)((uintptr_t)arg); + (struct mii_ioctl_data_s *)((uintptr_t)arg); uint32_t regval; /* Enable management port */ @@ -3093,7 +3093,7 @@ static int sam_ioctl(struct net_driver_s *dev, int cmd, unsigned long arg) case SIOCSMIIREG: /* Set register in MII PHY */ { struct mii_ioctl_data_s *req = - (struct mii_ioctl_data_s *)((uintptr_t)arg); + (struct mii_ioctl_data_s *)((uintptr_t)arg); uint32_t regval; /* Enable management port */ diff --git a/arch/sim/src/sim/posix/sim_offload.c b/arch/sim/src/sim/posix/sim_offload.c index 25ed579c64d..c307981b2a0 100644 --- a/arch/sim/src/sim/posix/sim_offload.c +++ b/arch/sim/src/sim/posix/sim_offload.c @@ -50,8 +50,8 @@ static void sim_audio_mad_uninit(void *handle); static void *sim_audio_lame_init(struct audio_info_s *info); static int sim_audio_lame_samples(void *handle); static int sim_audio_lame_encode(void *handle, - uint8_t *in, uint32_t insize, - uint8_t **out, uint32_t *outsize); + uint8_t *in, uint32_t insize, + uint8_t **out, uint32_t *outsize); static void sim_audio_lame_uninit(void *handle); /**************************************************************************** @@ -163,8 +163,8 @@ static void *sim_audio_pcm_init(struct audio_info_s *info) } static int sim_audio_pcm_process(void *handle, - uint8_t *in, uint32_t insize, - uint8_t **out, uint32_t *outsize) + uint8_t *in, uint32_t insize, + uint8_t **out, uint32_t *outsize) { *out = in; *outsize = insize; @@ -499,8 +499,8 @@ static int sim_audio_lame_samples(void *handle) } static int sim_audio_lame_encode(void *handle, - uint8_t *in, uint32_t insize, - uint8_t **out, uint32_t *outsize) + uint8_t *in, uint32_t insize, + uint8_t **out, uint32_t *outsize) { struct sim_lame_s *codec = (struct sim_lame_s *)handle; int samples; diff --git a/drivers/mtd/filemtd.c b/drivers/mtd/filemtd.c index 36e2d7e9cf3..a7fc0ccc452 100644 --- a/drivers/mtd/filemtd.c +++ b/drivers/mtd/filemtd.c @@ -98,35 +98,35 @@ struct file_dev_s ****************************************************************************/ static ssize_t filemtd_read(FAR struct file_dev_s *priv, - FAR unsigned char *buffer, size_t offsetbytes, - unsigned int nbytes); + FAR unsigned char *buffer, size_t offsetbytes, + unsigned int nbytes); static ssize_t filemtd_write(FAR struct file_dev_s *priv, size_t offset, - FAR const void *src, size_t len); + FAR const void *src, size_t len); /* MTD driver methods */ -static int filemtd_erase(FAR struct mtd_dev_s *dev, off_t startblock, - size_t nblocks); +static int filemtd_erase(FAR struct mtd_dev_s *dev, off_t startblock, + size_t nblocks); static ssize_t filemtd_bread(FAR struct mtd_dev_s *dev, off_t startblock, - size_t nblocks, FAR uint8_t *buf); + size_t nblocks, FAR uint8_t *buf); static ssize_t filemtd_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, - size_t nblocks, FAR const uint8_t *buf); + size_t nblocks, FAR const uint8_t *buf); static ssize_t filemtd_byteread(FAR struct mtd_dev_s *dev, off_t offset, - size_t nbytes, FAR uint8_t *buf); + size_t nbytes, FAR uint8_t *buf); #ifdef CONFIG_MTD_BYTE_WRITE static ssize_t file_bytewrite(FAR struct mtd_dev_s *dev, off_t offset, - size_t nbytes, FAR const uint8_t *buf); + size_t nbytes, FAR const uint8_t *buf); #endif -static int filemtd_ioctl(FAR struct mtd_dev_s *dev, int cmd, - unsigned long arg); +static int filemtd_ioctl(FAR struct mtd_dev_s *dev, int cmd, + unsigned long arg); #ifdef CONFIG_MTD_LOOP static ssize_t mtd_loop_read(FAR struct file *filep, FAR char *buffer, - size_t buflen); + size_t buflen); static ssize_t mtd_loop_write(FAR struct file *filep, - FAR const char *buffer, size_t buflen); + FAR const char *buffer, size_t buflen); static int mtd_loop_ioctl(FAR struct file *filep, int cmd, - unsigned long arg); + unsigned long arg); #endif /* CONFIG_MTD_LOOP */ /**************************************************************************** @@ -610,7 +610,7 @@ static int mtd_loop_teardown(FAR const char *devname) #ifdef CONFIG_MTD_LOOP static ssize_t mtd_loop_read(FAR struct file *filep, FAR char *buffer, - size_t len) + size_t len) { return 0; /* Return EOF */ } @@ -622,7 +622,7 @@ static ssize_t mtd_loop_read(FAR struct file *filep, FAR char *buffer, #ifdef CONFIG_MTD_LOOP static ssize_t mtd_loop_write(FAR struct file *filep, - FAR const char *buffer, size_t len) + FAR const char *buffer, size_t len) { return len; /* Say that everything was written */ } @@ -658,8 +658,8 @@ static int mtd_loop_ioctl(FAR struct file *filep, int cmd, else { ret = mtd_loop_setup(setup->devname, setup->filename, - setup->sectsize, setup->erasesize, - setup->offset); + setup->sectsize, setup->erasesize, + setup->offset); } } break; diff --git a/include/nuttx/mtd/mtd.h b/include/nuttx/mtd/mtd.h index b01ad550fb4..eac22a7b9c8 100644 --- a/include/nuttx/mtd/mtd.h +++ b/include/nuttx/mtd/mtd.h @@ -610,7 +610,7 @@ FAR struct mtd_dev_s *n25qxxx_initialize(FAR struct qspi_dev_s *qspi, ****************************************************************************/ FAR struct mtd_dev_s *w25qxxxjv_initialize(FAR struct qspi_dev_s *qspi, - bool unprotect); + bool unprotect); /**************************************************************************** * Name: filemtd_initialize diff --git a/sched/sched/sched_get_stackinfo.c b/sched/sched/sched_get_stackinfo.c index ab5edd94097..4dde84ab2a3 100644 --- a/sched/sched/sched_get_stackinfo.c +++ b/sched/sched/sched_get_stackinfo.c @@ -100,7 +100,7 @@ int nxsched_get_stackinfo(pid_t pid, FAR struct stackinfo_s *stackinfo) stackinfo->adj_stack_size = qtcb->adj_stack_size; stackinfo->stack_alloc_ptr = qtcb->stack_alloc_ptr; - stackinfo->stack_base_ptr = qtcb->stack_base_ptr; + stackinfo->stack_base_ptr = qtcb->stack_base_ptr; return OK; }