diff --git a/arch b/arch index cc863e71f9f..4664ce223db 160000 --- a/arch +++ b/arch @@ -1 +1 @@ -Subproject commit cc863e71f9fdf2b418365ff58ec2103dc1abbfcd +Subproject commit 4664ce223dba7c4190fca215b74a74b9bafcf30a diff --git a/configs b/configs index dbc09272e2e..bc95908f1bc 160000 --- a/configs +++ b/configs @@ -1 +1 @@ -Subproject commit dbc09272e2e97c118372075d47281a563dc61db1 +Subproject commit bc95908f1bc1fd8f2895d91509cba860fe381474 diff --git a/drivers/lcd/ssd1351.c b/drivers/lcd/ssd1351.c index 88f6e55dbf9..45e768a879a 100644 --- a/drivers/lcd/ssd1351.c +++ b/drivers/lcd/ssd1351.c @@ -892,9 +892,9 @@ static int ssd1351_setpower(FAR struct lcd_dev_s *dev, int power) DEBUGASSERT(priv != NULL && (unsigned int)power <= LCD_FULL_ON); gvdbg("power: %d\n", power); - + /* Select and lock the device */ - + ssd1351_select(priv); if (power > LCD_FULL_OFF) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index d804eea2cbd..b8c5ca09d34 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1112,7 +1112,7 @@ int tun_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup) FAR struct tun_device_s *priv = filep->f_priv; pollevent_t eventset; int ret = OK; - + if (!priv) { return -EINVAL; diff --git a/drivers/sensors/adxl345_spi.c b/drivers/sensors/adxl345_spi.c index a87765e8193..0c9cf0b118e 100644 --- a/drivers/sensors/adxl345_spi.c +++ b/drivers/sensors/adxl345_spi.c @@ -101,7 +101,7 @@ uint8_t adxl345_getreg8(FAR struct adxl345_dev_s *priv, uint8_t regaddr) /* Select the ADXL345 */ SPI_SELECT(priv->spi, SPIDEV_ACCELEROMETER, true); - + /* Send register to read and get the next byte */ (void)SPI_SEND(priv->spi, regaddr); @@ -148,7 +148,7 @@ void adxl345_putreg8(FAR struct adxl345_dev_s *priv, uint8_t regaddr, /* Select the ADXL345 */ SPI_SELECT(priv->spi, SPIDEV_ACCELEROMETER, true); - + /* Send register address and set the value */ (void)SPI_SEND(priv->spi, regaddr); @@ -186,7 +186,7 @@ uint16_t adxl345_getreg16(FAR struct adxl345_dev_s *priv, uint8_t regaddr) /* Select the ADXL345 */ SPI_SELECT(priv->spi, SPIDEV_ACCELEROMETER, true); - + /* Send register to read and get the next 2 bytes */ (void)SPI_SEND(priv->spi, regaddr); diff --git a/drivers/sensors/ms58xx.c b/drivers/sensors/ms58xx.c index e539b1eaa8f..ad5108f6cf2 100644 --- a/drivers/sensors/ms58xx.c +++ b/drivers/sensors/ms58xx.c @@ -991,7 +991,7 @@ int ms58xx_register(FAR const char *devpath, FAR struct i2c_dev_s *i2c, priv->sensdivhs = 0; break; } - + switch (priv->model) { case MS58XX_MODEL_MS5803_02: diff --git a/drivers/timers/cs2100-cp.c b/drivers/timers/cs2100-cp.c index 2fb4f29f92a..76ec3232aac 100644 --- a/drivers/timers/cs2100-cp.c +++ b/drivers/timers/cs2100-cp.c @@ -409,7 +409,7 @@ static int cs2100_refclk(FAR const struct cs2100_config_s *config) csdbg("ERROR: Failed to set CS2100_FNCCFG3: %d\n", ret); return ret; } - + /* Configure so that CLK_OUT will be enabled when the registers are * unlocked (also clears other settings). * NOTE: This implicitly sets High Multiplier mode for the Rud. @@ -446,7 +446,7 @@ static int cs2100_ratio(FAR const struct cs2100_config_s *config) bool highmul; int rmod; int ret; - + DEBUGASSERT(config->clkin > 0 && config->clkout > 0); /* Calculate a 64-bit RUD value: diff --git a/drivers/timers/timer.c b/drivers/timers/timer.c index 57c2c0eca9b..c1c8a9ee42f 100644 --- a/drivers/timers/timer.c +++ b/drivers/timers/timer.c @@ -88,7 +88,7 @@ struct timer_upperhalf_s FAR char *path; /* Registration path */ /* The contained lower-half driver */ - + FAR struct timer_lowerhalf_s *lower; }; @@ -173,7 +173,7 @@ static int timer_open(FAR struct file *filep) errout_with_sem: // sem_post(&upper->exclsem); - + errout: return ret; } @@ -214,7 +214,7 @@ static int timer_close(FAR struct file *filep) //sem_post(&upper->exclsem); ret = OK; - + errout: return ret; } @@ -254,7 +254,7 @@ static ssize_t timer_write(FAR struct file *filep, FAR const char *buffer, * Description: * The standard ioctl method. This is where ALL of the timer work is * done. - * + * ************************************************************************************/ static int timer_ioctl(FAR struct file *filep, int cmd, unsigned long arg) diff --git a/drivers/usbhost/usbhost_cdcacm.c b/drivers/usbhost/usbhost_cdcacm.c index ee639603942..eb3fe49cd52 100644 --- a/drivers/usbhost/usbhost_cdcacm.c +++ b/drivers/usbhost/usbhost_cdcacm.c @@ -1129,12 +1129,12 @@ static void usbhost_rxdata_work(FAR void *arg) rxbuf->head = nexthead; priv->rxndx = rxndx; - + /* Update the head point for for the next pass through the loop * handling. If nexthead incremented to rxbuf->tail, then the * RX buffer will and we will exit the loop at the top. */ - + if (++nexthead >= rxbuf->size) { nexthead = 0; @@ -1759,7 +1759,7 @@ static int usbhost_alloc_buffers(FAR struct usbhost_cdcacm_s *priv) ret, priv->pktsize); goto errout; } - + /* Allocate a TX buffer for Bulk IN transfers */ ret = DRVR_IOALLOC(hport->drvr, &priv->outbuf, priv->pktsize); @@ -2213,7 +2213,7 @@ static int usbhost_setup(FAR struct uart_dev_s *uartdev) usbhost_takesem(&priv->exclsem); /* Check if the CDC/ACM device is still connected. We need to disable - * interrupts momentarily to assure that there are no asynchronous + * interrupts momentarily to assure that there are no asynchronous * isconnect events. */ @@ -2592,7 +2592,7 @@ static void usbhost_rxint(FAR struct uart_dev_s *uartdev, bool enable) static bool usbhost_rxavailable(FAR struct uart_dev_s *uartdev) { - + FAR struct usbhost_cdcacm_s *priv; DEBUGASSERT(uartdev && uartdev->priv); diff --git a/fs/mount/fs_automount.c b/fs/mount/fs_automount.c index 1efa80ada05..e961fb5db8a 100644 --- a/fs/mount/fs_automount.c +++ b/fs/mount/fs_automount.c @@ -249,7 +249,7 @@ static void automount_mount(FAR struct automounter_state_s *priv) priv->mounted = true; break; - + default: fdbg("ERROR: automount_findinode failed: %d\n", ret); break; diff --git a/libc/math/lib_erf.c b/libc/math/lib_erf.c index ecb1e36dbd0..1923638dbad 100644 --- a/libc/math/lib_erf.c +++ b/libc/math/lib_erf.c @@ -64,7 +64,7 @@ double erf(double x) a4 = -1.453152027; a5 = 1.061405429; p = 0.3275911; - + sign = (x >= 0 ? 1 : -1); t = 1.0/(1.0 + p*x); return sign * (1.0 - (((((a5 * t + a4) * t) + a3) * t + a2) * t + a1) * t * expf(-x * x)); diff --git a/libc/math/lib_erff.c b/libc/math/lib_erff.c index 2b38808caa4..75199c828c2 100644 --- a/libc/math/lib_erff.c +++ b/libc/math/lib_erff.c @@ -63,7 +63,7 @@ float erff(float x) a4 = -1.453152027; a5 = 1.061405429; p = 0.3275911; - + sign = (x >= 0 ? 1 : -1); t = 1.0/(1.0 + p*x); return sign * (1.0 - (((((a5 * t + a4) * t) + a3) * t + a2) * t + a1) * t * expf(-x * x)); diff --git a/libc/math/lib_erfl.c b/libc/math/lib_erfl.c index 1ebb736db23..44d62389808 100644 --- a/libc/math/lib_erfl.c +++ b/libc/math/lib_erfl.c @@ -64,7 +64,7 @@ long double erfl(long double x) a4 = -1.453152027; a5 = 1.061405429; p = 0.3275911; - + sign = (x >= 0 ? 1 : -1); t = 1.0/(1.0 + p*x); return sign * (1.0 - (((((a5 * t + a4) * t) + a3) * t + a2) * t + a1) * t * expf(-x * x)); diff --git a/libc/stdlib/lib_mkstemp.c b/libc/stdlib/lib_mkstemp.c index 6b92d0093db..fdf93cdfaf4 100644 --- a/libc/stdlib/lib_mkstemp.c +++ b/libc/stdlib/lib_mkstemp.c @@ -61,7 +61,7 @@ #define MAX_XS 6 #define MIN_NUMERIC 0 /* 0-9: Numeric */ #define MAX_NUMERIC 9 -#define MIN_UPPERCASE 10 /* 10-35: Upper case */ +#define MIN_UPPERCASE 10 /* 10-35: Upper case */ #define MAX_UPPERCASE 35 #define MIN_LOWERCASE 36 /* 36-61: Lower case */ #define MAX_LOWERCASE 61 @@ -153,7 +153,7 @@ static void get_base62(FAR uint8_t *ptr) { DEBUGASSERT(errno == EINTR); } - + memcpy(ptr, g_base62, MAX_XS); incr_base62(); sem_post(&g_b62sem); diff --git a/mm/mm_gran/mm_pgalloc.c b/mm/mm_gran/mm_pgalloc.c index 6f7b33acdf2..c4bda32d325 100644 --- a/mm/mm_gran/mm_pgalloc.c +++ b/mm/mm_gran/mm_pgalloc.c @@ -61,7 +61,7 @@ * * Dependencies: CONFIG_ARCH_USE_MMU and CONFIG_GRAN */ - + /* Debug */ #ifdef CONFIG_CPP_HAVE_VARARGS diff --git a/net/devif/devif_callback.c b/net/devif/devif_callback.c index a72b15b4bfd..fc89eaf7d59 100644 --- a/net/devif/devif_callback.c +++ b/net/devif/devif_callback.c @@ -226,7 +226,7 @@ FAR struct devif_callback_s * /* Add the newly allocated instance to the head of the device event * list. */ - + if (dev) { /* Verify that the device pointer is valid, i.e., that it still diff --git a/net/icmp/icmp_ping.c b/net/icmp/icmp_ping.c index 9f231612273..41bc604dfd3 100644 --- a/net/icmp/icmp_ping.c +++ b/net/icmp/icmp_ping.c @@ -345,7 +345,7 @@ int icmp_ping(in_addr_t addr, uint16_t id, uint16_t seqno, uint16_t datalen, #ifdef CONFIG_NET_ARP_SEND int ret; #endif - + /* Get the device that will be used to route this ICMP ECHO request */ #ifdef CONFIG_NETDEV_MULTINIC diff --git a/net/icmpv6/icmpv6_solicit.c b/net/icmpv6/icmpv6_solicit.c index 05486200209..cceac688da8 100644 --- a/net/icmpv6/icmpv6_solicit.c +++ b/net/icmpv6/icmpv6_solicit.c @@ -126,7 +126,7 @@ void icmpv6_solicit(FAR struct net_driver_s *dev, icmp->destipaddr[7] = ipaddr[7]; /* Add out IPv6 address as the source address */ - + net_ipv6addr_copy(icmp->srcipaddr, dev->d_ipv6addr); /* Set up the ICMPv6 Neighbor Solicitation message */ diff --git a/net/iob/iob_concat.c b/net/iob/iob_concat.c index ecaa33b87eb..21ad4e1fc04 100644 --- a/net/iob/iob_concat.c +++ b/net/iob/iob_concat.c @@ -83,7 +83,7 @@ void iob_concat(FAR struct iob_s *iob1, FAR struct iob_s *iob2) { /* Find the last buffer in the iob1 buffer chain */ - + while (iob1->io_flink) { iob1 = iob1->io_flink; diff --git a/net/iob/iob_test.c b/net/iob/iob_test.c index 871f1e0126d..fe683f9d2d5 100644 --- a/net/iob/iob_test.c +++ b/net/iob/iob_test.c @@ -77,7 +77,7 @@ static void dump_chain(struct iob_s *iob) struct iob_s *head = iob; unsigned int pktlen; int n; - + printf("=========================================================\n"); printf("pktlen: %d\n", iob->io_pktlen); diff --git a/net/iob/iob_trimtail.c b/net/iob/iob_trimtail.c index 36eebb26f81..63050698607 100644 --- a/net/iob/iob_trimtail.c +++ b/net/iob/iob_trimtail.c @@ -143,7 +143,7 @@ FAR struct iob_s *iob_trimtail(FAR struct iob_s *iob, unsigned int trimlen) penultimate->io_flink = NULL; } - + else { /* No, then just take what we need from this I/O buffer and diff --git a/net/local/local_recvfrom.c b/net/local/local_recvfrom.c index 1197285e5ab..5ea052cd426 100644 --- a/net/local/local_recvfrom.c +++ b/net/local/local_recvfrom.c @@ -115,7 +115,7 @@ static int psock_fifo_read(FAR struct socket *psock, FAR void *buf, return ret; } } - + return OK; } diff --git a/sched/group/group_addrenv.c b/sched/group/group_addrenv.c index c1ddb07b6e5..da25bdacdc1 100644 --- a/sched/group/group_addrenv.c +++ b/sched/group/group_addrenv.c @@ -174,7 +174,7 @@ int group_addrenv(FAR struct tcb_s *tcb) } /* Save the new, current group */ - + g_gid_current = gid; } diff --git a/sched/sched/sched_timerexpiration.c b/sched/sched/sched_timerexpiration.c index c968da6bc82..76d5a1de28d 100644 --- a/sched/sched/sched_timerexpiration.c +++ b/sched/sched/sched_timerexpiration.c @@ -111,7 +111,7 @@ uint32_t g_oneshot_maxticks = UINT32_MAX; /**************************************************************************** * Private Variables ****************************************************************************/ -/* This is the duration of the currently active timer or, when +/* This is the duration of the currently active timer or, when * sched_timer_expiration() is called, the duration of interval timer * that just expired. The value zero means that no timer was active. */ @@ -211,7 +211,7 @@ static inline uint32_t sched_process_scheduler(uint32_t ticks, bool noswitches) /* If a context switch occurred, then need to return delay remaining for * the new task at the head of the ready to run list. */ - + ntcb = (FAR struct tcb_s*)g_readytorun.head; /* Check if the new task at the head of the ready-to-run has changed. */