From aea3784f51d6e29283b09528bc01aa019b6fac5e Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 14:32:36 +0900 Subject: [PATCH 01/90] arch/arm/src/sam34/sam_udp.c: Replace non-ascii characters in comments --- arch/arm/src/sam34/sam_udp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/src/sam34/sam_udp.c b/arch/arm/src/sam34/sam_udp.c index da9e3fc7e4cd5..84ed26a22ebb5 100644 --- a/arch/arm/src/sam34/sam_udp.c +++ b/arch/arm/src/sam34/sam_udp.c @@ -1044,9 +1044,9 @@ static int sam_req_write(struct sam_usbdev_s *priv, struct sam_ep_s *privep) privreq->inflight = 0; /* Set TXPKTRDY to notify the USB hardware that there is (null) - * TX packet available. We will be notified that the endpoint’s + * TX packet available. We will be notified that the endpoint's * FIFO has been released by the USB device when TXCOMP in the - * endpoint’s UDPEP_CSRx register has been set. + * endpoint's UDPEP_CSRx register has been set. */ usbtrace(TRACE_WRITE(epno), 0); @@ -1284,8 +1284,8 @@ static void sam_ep0_wrstatus(const uint8_t *buffer, size_t buflen) } /* Set TXPKTRDY to notify the USB hardware that there is TX data in the - * endpoint FIFO. We will be notified that the endpoint’s FIFO has been - * released by the USB device when TXCOMP in the endpoint’s UDPEP_CSRx + * endpoint FIFO. We will be notified that the endpoint's FIFO has been + * released by the USB device when TXCOMP in the endpoint's UDPEP_CSRx * register has been set. */ From 190730d748a7b3f0ea89aa7b196100a0c3b7fac7 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Thu, 5 Nov 2020 20:25:27 +0900 Subject: [PATCH 02/90] arch/xtensa/src/esp32/esp32_wifi_adapter.c: Fix a printf format --- arch/xtensa/src/esp32/esp32_wifi_adapter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/xtensa/src/esp32/esp32_wifi_adapter.c b/arch/xtensa/src/esp32/esp32_wifi_adapter.c index 859eda40b2da8..63aac7d71e9ec 100644 --- a/arch/xtensa/src/esp32/esp32_wifi_adapter.c +++ b/arch/xtensa/src/esp32/esp32_wifi_adapter.c @@ -1154,7 +1154,7 @@ static void *esp_queue_create(uint32_t queue_len, uint32_t item_size) } snprintf(mq_adpt->name, sizeof(mq_adpt->name), - "/tmp/%X", mq_adpt); + "/tmp/%p", mq_adpt); attr.mq_maxmsg = queue_len; attr.mq_msgsize = item_size; From 7ea3e70888c7a2273abe9f338e56add753a61535 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Thu, 5 Nov 2020 20:44:13 +0900 Subject: [PATCH 03/90] arch/xtensa/src/esp32/esp32_wifi_adapter.c: Fix a type mismatch --- arch/xtensa/src/esp32/esp32_wifi_adapter.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/xtensa/src/esp32/esp32_wifi_adapter.c b/arch/xtensa/src/esp32/esp32_wifi_adapter.c index 63aac7d71e9ec..a0e7bfd625b04 100644 --- a/arch/xtensa/src/esp32/esp32_wifi_adapter.c +++ b/arch/xtensa/src/esp32/esp32_wifi_adapter.c @@ -259,6 +259,7 @@ static void esp_coex_condition_set(uint32_t type, bool dissatisfy); static int32_t esp_coex_wifi_request(uint32_t event, uint32_t latency, uint32_t duration); static int32_t esp_coex_wifi_release(uint32_t event); +static unsigned long esp_random_ulong(void); /**************************************************************************** * Public Functions declaration @@ -389,7 +390,7 @@ wifi_osi_funcs_t g_wifi_osi_funcs = ._nvs_erase_key = esp_nvs_erase_key, ._get_random = esp_get_random, ._get_time = esp_get_time, - ._random = esp_random, + ._random = esp_random_ulong, ._log_write = esp_log_write, ._log_writev = esp_log_writev, ._log_timestamp = esp_log_timestamp, @@ -3672,6 +3673,20 @@ static int32_t esp_coex_wifi_release(uint32_t event) return 0; } +/**************************************************************************** + * Name: esp_random_ulong + * + * Description: + * A simpler wrapper of esp_random. + * Just convert the return value from uint32_t to unsigned long. + * + ****************************************************************************/ + +static unsigned long esp_random_ulong(void) +{ + return esp_random(); +} + /**************************************************************************** * Functions needed by libphy.a ****************************************************************************/ From 2a48cbd9dfa98ddf3566f85fa08d018086a36f05 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Thu, 5 Nov 2020 21:01:11 +0900 Subject: [PATCH 04/90] fs/procfs/fs_procfsuptime.c: Fix a printf format --- fs/procfs/fs_procfsuptime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/procfs/fs_procfsuptime.c b/fs/procfs/fs_procfsuptime.c index fd92869bd1760..12dd895b7e965 100644 --- a/fs/procfs/fs_procfsuptime.c +++ b/fs/procfs/fs_procfsuptime.c @@ -268,7 +268,7 @@ static ssize_t uptime_read(FAR struct file *filep, FAR char *buffer, /* Convert the seconds + hundredths of seconds to a string */ #ifdef CONFIG_SYSTEM_TIME64 - linesize = snprintf(attr->line, UPTIME_LINELEN, "%7llu.%02u\n", + linesize = snprintf(attr->line, UPTIME_LINELEN, "%7" PRIu64 ".%02u\n", sec, csec); #else linesize = snprintf(attr->line, UPTIME_LINELEN, "%7lu.%02u\n", From 921ec40f2e99ed2b2495bc5e95d052f89acc51d4 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Mon, 9 Nov 2020 20:04:00 +0900 Subject: [PATCH 05/90] libs/libc/time/lib_strftime.c: Fix a printf format warning --- libs/libc/time/lib_strftime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libc/time/lib_strftime.c b/libs/libc/time/lib_strftime.c index eba947d91530f..c68d72fbc9ac6 100644 --- a/libs/libc/time/lib_strftime.c +++ b/libs/libc/time/lib_strftime.c @@ -397,8 +397,8 @@ size_t strftime(FAR char *s, size_t max, FAR const char *format, case 's': { - len = snprintf(dest, chleft, "%d", - mktime((FAR struct tm *)tm)); + len = snprintf(dest, chleft, "%ju", + (uintmax_t)mktime((FAR struct tm *)tm)); } break; From 4150438f05fcfdc05238ea6173605e0b5b8e9f81 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Mon, 9 Nov 2020 20:07:58 +0900 Subject: [PATCH 06/90] libs/libc/uuid/lib_uuid_to_string.c: Fix a printf format warning --- libs/libc/uuid/lib_uuid_to_string.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/libc/uuid/lib_uuid_to_string.c b/libs/libc/uuid/lib_uuid_to_string.c index dc8c56134802c..e6eb1c77101fd 100644 --- a/libs/libc/uuid/lib_uuid_to_string.c +++ b/libs/libc/uuid/lib_uuid_to_string.c @@ -64,7 +64,10 @@ void uuid_to_string(const uuid_t *u, char **s, uint32_t *status) } c = asprintf(s, - "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", + "%08" PRIx32 "-%04" PRIx16 "-%04" PRIx16 + "-%02" PRIx8 "%02" PRIx8 + "-%02" PRIx8 "%02" PRIx8 "%02" PRIx8 + "%02" PRIx8 "%02" PRIx8 "%02" PRIx8, u->time_low, u->time_mid, u->time_hi_and_version, u->clock_seq_hi_and_reserved, u->clock_seq_low, u->node[0], u->node[1], u->node[2], u->node[3], u->node[4], u->node[5]); From 097e8182672f20543ce12bb4db06180aa806064e Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Mon, 9 Nov 2020 20:11:04 +0900 Subject: [PATCH 07/90] arch/arm/src/efm32/efm32_leserial.c: Fix a type mismatch Error: chip/efm32_leserial.c:189:21: error: initialization of 'int (*)(struct uart_dev_s *, unsigned int *)' from incompatible pointer type 'int (*)(struct uart_dev_s *, uint32_t *)' {aka 'int (*)(struct uart_dev_s *, long unsigned int *)'} [-Werror=incompatible-pointer-types] 189 | .receive = efm32_receive, | ^~~~~~~~~~~~~ chip/efm32_leserial.c:189:21: note: (near initialization for 'g_leuart_ops.receive') --- arch/arm/src/efm32/efm32_leserial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/efm32/efm32_leserial.c b/arch/arm/src/efm32/efm32_leserial.c index 52be2151a1a26..951dda623cf9c 100644 --- a/arch/arm/src/efm32/efm32_leserial.c +++ b/arch/arm/src/efm32/efm32_leserial.c @@ -167,7 +167,7 @@ static int efm32_attach(struct uart_dev_s *dev); static void efm32_detach(struct uart_dev_s *dev); static int efm32_interrupt(int irq, void *context, FAR void *arg); static int efm32_ioctl(struct file *filep, int cmd, unsigned long arg); -static int efm32_receive(struct uart_dev_s *dev, uint32_t *status); +static int efm32_receive(struct uart_dev_s *dev, unsigned int *status); static void efm32_rxint(struct uart_dev_s *dev, bool enable); static bool efm32_rxavailable(struct uart_dev_s *dev); static void efm32_send(struct uart_dev_s *dev, int ch); @@ -583,7 +583,7 @@ static int efm32_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int efm32_receive(struct uart_dev_s *dev, uint32_t *status) +static int efm32_receive(struct uart_dev_s *dev, unsigned int *status) { struct efm32_leuart_s *priv = (struct efm32_leuart_s *)dev->priv; uint32_t rxdatax; From 110edb2687a66db6c9825bc3f69441db1ebb217c Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Mon, 9 Nov 2020 20:14:19 +0900 Subject: [PATCH 08/90] arch/arm/src/imx6/imx_serial.c: Fix a type mismatch Error: chip/imx_serial.c:259:21: error: initialization of 'int (*)(struct uart_dev_s *, unsigned int *)' from incompatible pointer type 'int (*)(struct uart_dev_s *, uint32_t *)' {aka 'int (*)(struct uart_dev_s *, long unsigned int *)'} [-Werror=incompatible-pointer-types] 259 | .receive = imx_receive, | ^~~~~~~~~~~ chip/imx_serial.c:259:21: note: (near initialization for 'g_uart_ops.receive') --- arch/arm/src/imx6/imx_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/imx6/imx_serial.c b/arch/arm/src/imx6/imx_serial.c index 9da387e354c51..a686b760d7c30 100644 --- a/arch/arm/src/imx6/imx_serial.c +++ b/arch/arm/src/imx6/imx_serial.c @@ -231,7 +231,7 @@ static int imx_attach(struct uart_dev_s *dev); static void imx_detach(struct uart_dev_s *dev); static int imx_interrupt(int irq, void *context, FAR void *arg); static int imx_ioctl(struct file *filep, int cmd, unsigned long arg); -static int imx_receive(struct uart_dev_s *dev, uint32_t *status); +static int imx_receive(struct uart_dev_s *dev, unsigned int *status); static void imx_rxint(struct uart_dev_s *dev, bool enable); static bool imx_rxavailable(struct uart_dev_s *dev); static void imx_send(struct uart_dev_s *dev, int ch); @@ -747,7 +747,7 @@ static int imx_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int imx_receive(struct uart_dev_s *dev, uint32_t *status) +static int imx_receive(struct uart_dev_s *dev, unsigned int *status) { struct imx_uart_s *priv = (struct imx_uart_s *)dev->priv; uint32_t rxd0; From 5267a93d227990df8975052d5a21cb431376f429 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Mon, 9 Nov 2020 20:16:44 +0900 Subject: [PATCH 09/90] fs/procfs/fs_procfsproc.c: Fix a printf format warning --- fs/procfs/fs_procfsproc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/procfs/fs_procfsproc.c b/fs/procfs/fs_procfsproc.c index 0584a9eaa8893..c20ab77dc4fc0 100644 --- a/fs/procfs/fs_procfsproc.c +++ b/fs/procfs/fs_procfsproc.c @@ -630,9 +630,9 @@ static ssize_t proc_status(FAR struct proc_file_s *procfile, return totalsize; } - /* Show the signal mask */ + /* Show the signal mask. Note: sigset_t is uint32_t on NuttX. */ - linesize = snprintf(procfile->line, STATUS_LINELEN, "%-12s%08x\n", + linesize = snprintf(procfile->line, STATUS_LINELEN, "%-12s%08" PRIx32 "\n", "SigMask:", tcb->sigprocmask); copysize = procfs_memcpy(procfile->line, linesize, buffer, remaining, &offset); From 2f610062a424a5bc1f9a4f9a560a6f7322eefba5 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 08:42:53 +0900 Subject: [PATCH 10/90] arch/arm/src/dm320/dm320_serial.c: Fix a type mismatch Error: chip/dm320_serial.c:111:21: error: initialization of 'int (*)(struct uart_dev_s *, unsigned int *)' from incompatible pointer type 'int (*)(struct uart_dev_s *, uint32_t *)' {aka 'int (*)(struct uart_dev_s *, long unsigned int *)'} [-Werror=incompatible-pointer-types] 111 | .receive = up_receive, | ^~~~~~~~~~ chip/dm320_serial.c:111:21: note: (near initialization for 'g_uart_ops.receive') --- arch/arm/src/dm320/dm320_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/dm320/dm320_serial.c b/arch/arm/src/dm320/dm320_serial.c index 28181d53cb89a..1e8de6b28bf18 100644 --- a/arch/arm/src/dm320/dm320_serial.c +++ b/arch/arm/src/dm320/dm320_serial.c @@ -90,7 +90,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupt(int irq, void *context, void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -592,7 +592,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint16_t dtrr; From 889d0ce63e0ef28e081c5ed0cd6ccb83bd95c055 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 08:48:25 +0900 Subject: [PATCH 11/90] arch/arm/src/a1x/a1x_serial.c: Fix a type mismatch --- arch/arm/src/a1x/a1x_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/a1x/a1x_serial.c b/arch/arm/src/a1x/a1x_serial.c index 10027ceeb7db7..8865d792bf74b 100644 --- a/arch/arm/src/a1x/a1x_serial.c +++ b/arch/arm/src/a1x/a1x_serial.c @@ -108,7 +108,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int uart_interrupt(int irq, void *context, void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -1316,7 +1316,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint32_t rbr; From 2974b7cb8eabd28b18c627096619290e74afddb8 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 08:49:07 +0900 Subject: [PATCH 12/90] arch/risc-v/src/nr5m100/nr5_serial.c: Fix a type mismatch --- arch/risc-v/src/nr5m100/nr5_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/risc-v/src/nr5m100/nr5_serial.c b/arch/risc-v/src/nr5m100/nr5_serial.c index 7765a1ac71bed..bc5c225f03ea4 100644 --- a/arch/risc-v/src/nr5m100/nr5_serial.c +++ b/arch/risc-v/src/nr5m100/nr5_serial.c @@ -161,7 +161,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupt(int irq, void *context, FAR void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -570,7 +570,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; From ca6835c8118d7dba4dd055a2e30a9694697982f7 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 08:49:41 +0900 Subject: [PATCH 13/90] arch/risc-v/src/litex/litex_serial.c: Fix a type mismatch --- arch/risc-v/src/litex/litex_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/risc-v/src/litex/litex_serial.c b/arch/risc-v/src/litex/litex_serial.c index 161843fb391dd..9647d26f539f6 100644 --- a/arch/risc-v/src/litex/litex_serial.c +++ b/arch/risc-v/src/litex/litex_serial.c @@ -144,7 +144,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupt(int irq, void *context, FAR void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -452,7 +452,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; int rxdata; From 7290068be0491f7c92ec2a9492c4948bbc00ded4 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 08:50:08 +0900 Subject: [PATCH 14/90] arch/risc-v/src/k210/k210_serial.c: Fix a type mismatch --- arch/risc-v/src/k210/k210_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/risc-v/src/k210/k210_serial.c b/arch/risc-v/src/k210/k210_serial.c index 572dd938dd525..e12fd89bf00d7 100644 --- a/arch/risc-v/src/k210/k210_serial.c +++ b/arch/risc-v/src/k210/k210_serial.c @@ -135,7 +135,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupt(int irq, void *context, FAR void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -444,7 +444,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { /* Return status information */ From e52082b3e9882e7f35c7d2186af1e9decabc18ca Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 08:51:26 +0900 Subject: [PATCH 15/90] arch/risc-v/src/fe310/fe310_serial.c: Fix a type mismatch --- arch/risc-v/src/fe310/fe310_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/risc-v/src/fe310/fe310_serial.c b/arch/risc-v/src/fe310/fe310_serial.c index 82bad7ea16053..fa8a69fb082db 100644 --- a/arch/risc-v/src/fe310/fe310_serial.c +++ b/arch/risc-v/src/fe310/fe310_serial.c @@ -135,7 +135,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupt(int irq, void *context, FAR void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -444,7 +444,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { /* Return status information */ From 96e05fd84b87662d868e16ca866cbaf29793c54c Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 08:52:05 +0900 Subject: [PATCH 16/90] arch/risc-v/src/gap8/gap8_uart.c: Fix a type mismatch --- arch/risc-v/src/gap8/gap8_uart.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/risc-v/src/gap8/gap8_uart.c b/arch/risc-v/src/gap8/gap8_uart.c index 26c6bc3b7cf6f..99aaa84f50733 100644 --- a/arch/risc-v/src/gap8/gap8_uart.c +++ b/arch/risc-v/src/gap8/gap8_uart.c @@ -115,7 +115,7 @@ static void up_shutdown(struct uart_dev_s *dev); static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -434,7 +434,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct gap8_uart_t *the_uart = (struct gap8_uart_t *)dev->priv; uint8_t ch = the_uart->rx_buf[0]; From 42ca26e397a0e5b9ade8c2d0ca751221e73f9fa5 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 09:01:23 +0900 Subject: [PATCH 17/90] arch/renesas/src/sh1/sh1_serial.c: Fix a type mismatch --- arch/renesas/src/sh1/sh1_serial.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/renesas/src/sh1/sh1_serial.c b/arch/renesas/src/sh1/sh1_serial.c index 6f83416b1dc55..0a075400d1cd9 100644 --- a/arch/renesas/src/sh1/sh1_serial.c +++ b/arch/renesas/src/sh1/sh1_serial.c @@ -157,7 +157,7 @@ static void up_shutdown(struct uart_dev_s *dev); static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupt(int irq, void *context, FAR void *arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); From 05652a37513f876e57f232bd5c37c93167a0f629 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 09:02:25 +0900 Subject: [PATCH 18/90] arch/renesas/src/rx65n/rx65n_serial.c: Fix a type mismatch --- arch/renesas/src/rx65n/rx65n_serial.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/renesas/src/rx65n/rx65n_serial.c b/arch/renesas/src/rx65n/rx65n_serial.c index 57d6b951ca546..82f10881d1fd5 100644 --- a/arch/renesas/src/rx65n/rx65n_serial.c +++ b/arch/renesas/src/rx65n/rx65n_serial.c @@ -284,7 +284,7 @@ static int up_xmtinterrupt(int irq, void *context, FAR void *arg); static int up_rcvinterrupt(int irq, void *context, FAR void *arg); static int up_eriinterrupt(int irq, void *context, FAR void *arg); static int up_teiinterrupt(int irq, void *context, FAR void *arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); From 80dfe72bebabe0517c780825d2681a6d78226ae8 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 09:03:03 +0900 Subject: [PATCH 19/90] arch/arm/src/nuc1xx/nuc_serial.c: Fix a type mismatch --- arch/arm/src/nuc1xx/nuc_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/nuc1xx/nuc_serial.c b/arch/arm/src/nuc1xx/nuc_serial.c index f1c8c06b09b33..f59dc81876126 100644 --- a/arch/arm/src/nuc1xx/nuc_serial.c +++ b/arch/arm/src/nuc1xx/nuc_serial.c @@ -102,7 +102,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupt(int irq, void *context, void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -835,7 +835,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct nuc_dev_s *priv = (struct nuc_dev_s *)dev->priv; uint32_t rbr; From bb0dcda47e6dc5462f2767ec1ba7792f8f0c233d Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 09:03:43 +0900 Subject: [PATCH 20/90] arch/mips/src/pic32mz/pic32mz_serial.c: Fix a type mismatch --- arch/mips/src/pic32mz/pic32mz_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/mips/src/pic32mz/pic32mz_serial.c b/arch/mips/src/pic32mz/pic32mz_serial.c index 6c0c1b9772a00..bcbf1c3db763a 100644 --- a/arch/mips/src/pic32mz/pic32mz_serial.c +++ b/arch/mips/src/pic32mz/pic32mz_serial.c @@ -278,7 +278,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupt(int irq, void *context, FAR void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -904,7 +904,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; From fc31d845c7d2ee2f83719acef325ee3cd464333c Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 09:04:24 +0900 Subject: [PATCH 21/90] arch/avr/src/at32uc3/at32uc3_serial.c: Fix a type mismatch --- arch/avr/src/at32uc3/at32uc3_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/avr/src/at32uc3/at32uc3_serial.c b/arch/avr/src/at32uc3/at32uc3_serial.c index dd3917318bd59..91249b84e43a3 100644 --- a/arch/avr/src/at32uc3/at32uc3_serial.c +++ b/arch/avr/src/at32uc3/at32uc3_serial.c @@ -161,7 +161,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupt(int irq, void *context, void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -539,7 +539,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint32_t rhr; From 2e24f1fbd1fb785fb5743c5d7c52800c005b7b36 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 09:05:06 +0900 Subject: [PATCH 22/90] arch/arm/src/lpc43xx/lpc43_serial.c: Fix a type mismatch --- arch/arm/src/lpc43xx/lpc43_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/lpc43xx/lpc43_serial.c b/arch/arm/src/lpc43xx/lpc43_serial.c index 419ec88cfdf30..da1d4f2d0b37e 100644 --- a/arch/arm/src/lpc43xx/lpc43_serial.c +++ b/arch/arm/src/lpc43xx/lpc43_serial.c @@ -114,7 +114,7 @@ static inline int up_set_rs485_mode(struct up_dev_s *priv, static inline int up_get_rs485_mode(struct up_dev_s *priv, struct serial_rs485 *mode); #endif -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -1139,7 +1139,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint32_t rbr; From 2bb6aab3a1e2b66bdf72c7d66ecbb7baf105972f Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 09:07:13 +0900 Subject: [PATCH 23/90] arch/arm/src/lpc31xx/lpc31_serial.c: Fix a type mismatch --- arch/arm/src/lpc31xx/lpc31_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/lpc31xx/lpc31_serial.c b/arch/arm/src/lpc31xx/lpc31_serial.c index 691e2449d050a..099fd1dfde967 100644 --- a/arch/arm/src/lpc31xx/lpc31_serial.c +++ b/arch/arm/src/lpc31xx/lpc31_serial.c @@ -89,7 +89,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupt(int irq, void *context, FAR void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -640,7 +640,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { uint32_t rbr; From 90a7521341e7234ee6d1d8a7826cadc60411538e Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 09:12:59 +0900 Subject: [PATCH 24/90] arch/mips/src/pic32mx/pic32mx_serial.c: Fix a type mismatch --- arch/mips/src/pic32mx/pic32mx_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/mips/src/pic32mx/pic32mx_serial.c b/arch/mips/src/pic32mx/pic32mx_serial.c index 6f753aca5bff9..727cd77578f16 100644 --- a/arch/mips/src/pic32mx/pic32mx_serial.c +++ b/arch/mips/src/pic32mx/pic32mx_serial.c @@ -176,7 +176,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupt(int irq, void *context, void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -653,7 +653,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; From e19c4ecc9181e5cdb25f7e4657d3df50acf914af Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 09:18:29 +0900 Subject: [PATCH 25/90] arch/hc/src/m9s12/m9s12_serial.c: Fix a type mismatch --- arch/hc/src/m9s12/m9s12_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/hc/src/m9s12/m9s12_serial.c b/arch/hc/src/m9s12/m9s12_serial.c index 21df04dd20fd2..374f2e0f0a3f6 100644 --- a/arch/hc/src/m9s12/m9s12_serial.c +++ b/arch/hc/src/m9s12/m9s12_serial.c @@ -126,7 +126,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupt(int irq, void *context, void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -552,7 +552,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; int rxd; From 20cde0af8846b47eac056c149bfb779292796fe7 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 18:07:13 +0900 Subject: [PATCH 26/90] arch/arm/src/tiva/common/tiva_serial.c: Fix a type mismatch --- arch/arm/src/tiva/common/tiva_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/tiva/common/tiva_serial.c b/arch/arm/src/tiva/common/tiva_serial.c index a6566611a1915..77ce40f5c9289 100644 --- a/arch/arm/src/tiva/common/tiva_serial.c +++ b/arch/arm/src/tiva/common/tiva_serial.c @@ -324,7 +324,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupt(int irq, void *context, void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -1168,7 +1168,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint32_t rxd; From 086ee6af27a85a17401a38b14020ce1106ce9fd7 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 18:11:25 +0900 Subject: [PATCH 27/90] arch/arm/src/str71x/str71x_serial.c: Fix a type mismatch --- arch/arm/src/str71x/str71x_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/str71x/str71x_serial.c b/arch/arm/src/str71x/str71x_serial.c index 2fcd1882b0e6e..2639471e2b2ca 100644 --- a/arch/arm/src/str71x/str71x_serial.c +++ b/arch/arm/src/str71x/str71x_serial.c @@ -249,7 +249,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupt(int irq, void *context, void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -758,7 +758,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint16_t rxbufr; From 92ea9e457e2659a397ec2faab4de3c698fffd4e8 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 18:12:11 +0900 Subject: [PATCH 28/90] arch/arm/src/sama5/sam_serial.c: Fix a type mismatch --- arch/arm/src/sama5/sam_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/sama5/sam_serial.c b/arch/arm/src/sama5/sam_serial.c index d553dd00fc79f..4380b58ab6e18 100644 --- a/arch/arm/src/sama5/sam_serial.c +++ b/arch/arm/src/sama5/sam_serial.c @@ -442,7 +442,7 @@ static void up_shutdown(struct uart_dev_s *dev); static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -1441,7 +1441,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; From fc146ebf0d2c3c320144cb7d05c81ba1a6b12a2e Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 18:13:06 +0900 Subject: [PATCH 29/90] arch/arm/src/sam34/sam_serial.c: Fix a type mismatch --- arch/arm/src/sam34/sam_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/sam34/sam_serial.c b/arch/arm/src/sam34/sam_serial.c index 7b60e496d5057..9f26b20c53281 100644 --- a/arch/arm/src/sam34/sam_serial.c +++ b/arch/arm/src/sam34/sam_serial.c @@ -379,7 +379,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupt(int irq, void *context, void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -1192,7 +1192,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; From cc400fae05d0bccda242ea0d186d4d60d099e745 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 18:18:20 +0900 Subject: [PATCH 30/90] arch/arm/src/lpc2378/lpc23xx_serial.c: Fix a type mismatch --- arch/arm/src/lpc2378/lpc23xx_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/lpc2378/lpc23xx_serial.c b/arch/arm/src/lpc2378/lpc23xx_serial.c index b1af72df5d026..89a9ce5ea6e72 100644 --- a/arch/arm/src/lpc2378/lpc23xx_serial.c +++ b/arch/arm/src/lpc2378/lpc23xx_serial.c @@ -97,7 +97,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupt(int irq, void *context, void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t * status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -740,7 +740,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t * status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint8_t rbr; From 35dc262bb14c60281e827d8a5896d13819a2ca19 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 18:21:54 +0900 Subject: [PATCH 31/90] arch/arm/src/lpc214x/lpc214x_serial.c: Fix a type mismatch --- arch/arm/src/lpc214x/lpc214x_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/lpc214x/lpc214x_serial.c b/arch/arm/src/lpc214x/lpc214x_serial.c index 89ec23d714735..36ff7e5e85a82 100644 --- a/arch/arm/src/lpc214x/lpc214x_serial.c +++ b/arch/arm/src/lpc214x/lpc214x_serial.c @@ -90,7 +90,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupt(int irq, void *context, void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -621,7 +621,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint8_t rbr; From 5d566a32e145937add9f2f5ca22132e1e4c1e87c Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 18:22:52 +0900 Subject: [PATCH 32/90] arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c: Fix a type mismatch --- arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c index 2047d216850da..42fe0474e2f71 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c @@ -105,7 +105,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupt(int irq, void *context, void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -1459,7 +1459,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint32_t rbr; From 2513518d828cb54b78c3762b7285f5405ee4a42b Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 18:23:57 +0900 Subject: [PATCH 33/90] arch/arm/src/lc823450/lc823450_serial.c: Fix a type mismatch --- arch/arm/src/lc823450/lc823450_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/lc823450/lc823450_serial.c b/arch/arm/src/lc823450/lc823450_serial.c index 7003f78f06519..005d4c096e109 100644 --- a/arch/arm/src/lc823450/lc823450_serial.c +++ b/arch/arm/src/lc823450/lc823450_serial.c @@ -186,7 +186,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupt(int irq, void *context, FAR void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -845,7 +845,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint32_t rxd; From c2921d7e4ee3e8d19a1782e81312d146c989c81a Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 18:25:07 +0900 Subject: [PATCH 34/90] arch/arm/src/kl/kl_serial.c: Fix a type mismatch --- arch/arm/src/kl/kl_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/kl/kl_serial.c b/arch/arm/src/kl/kl_serial.c index b0f01bb0cddf7..a4b41a2ca9290 100644 --- a/arch/arm/src/kl/kl_serial.c +++ b/arch/arm/src/kl/kl_serial.c @@ -173,7 +173,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupts(int irq, void *context, void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -635,7 +635,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint8_t s1; From 23843f05b35f31b5147fa42679f4c518ed95191c Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 18:29:21 +0900 Subject: [PATCH 35/90] arch/arm/src/kinetis/kinetis_serial.c: Fix a type mismatch --- arch/arm/src/kinetis/kinetis_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/kinetis/kinetis_serial.c b/arch/arm/src/kinetis/kinetis_serial.c index 7ef82e78e47c8..d81b40e2a7578 100644 --- a/arch/arm/src/kinetis/kinetis_serial.c +++ b/arch/arm/src/kinetis/kinetis_serial.c @@ -343,7 +343,7 @@ static int up_interrupts(int irq, void *context, FAR void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); static void up_rxint(struct uart_dev_s *dev, bool enable); #if !defined(SERIAL_HAVE_ALL_DMA) -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static bool up_rxavailable(struct uart_dev_s *dev); #endif #ifdef CONFIG_SERIAL_IFLOWCONTROL @@ -1567,7 +1567,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) ****************************************************************************/ #if !defined(SERIAL_HAVE_ALL_DMA) -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint8_t s1; From 0f59d602b7499d38f35be7bfe8abbc8b8fd9f49e Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 18:37:25 +0900 Subject: [PATCH 36/90] arch/arm/src/imx1/imx_serial.c: Fix a type mismatch --- arch/arm/src/imx1/imx_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/imx1/imx_serial.c b/arch/arm/src/imx1/imx_serial.c index 2396b5d8c9001..07ecbabf4c298 100644 --- a/arch/arm/src/imx1/imx_serial.c +++ b/arch/arm/src/imx1/imx_serial.c @@ -112,7 +112,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int up_interrupt(int irq, void *context, FAR void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -931,7 +931,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint32_t rxd0; From 16bac9de87238fb32754d003fd0e0dc3094f097a Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 18:38:14 +0900 Subject: [PATCH 37/90] arch/arm/src/cxd56xx/cxd56_serial.c: Fix a type mismatch --- arch/arm/src/cxd56xx/cxd56_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/cxd56xx/cxd56_serial.c b/arch/arm/src/cxd56xx/cxd56_serial.c index c44be0070b926..c28a1c22da504 100644 --- a/arch/arm/src/cxd56xx/cxd56_serial.c +++ b/arch/arm/src/cxd56xx/cxd56_serial.c @@ -121,7 +121,7 @@ static int up_ioctl(FAR struct file *filep, int cmd, unsigned long arg); static bool up_rxflowcontrol(FAR struct uart_dev_s *dev, unsigned int nbuffered, bool upper); #endif -static int up_receive(FAR struct uart_dev_s *dev, FAR uint32_t *status); +static int up_receive(FAR struct uart_dev_s *dev, FAR unsigned int *status); static void up_rxint(FAR struct uart_dev_s *dev, bool enable); static bool up_rxavailable(FAR struct uart_dev_s *dev); static void up_send(FAR struct uart_dev_s *dev, int ch); @@ -916,7 +916,7 @@ static int up_ioctl(FAR struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(FAR struct uart_dev_s *dev, FAR uint32_t *status) +static int up_receive(FAR struct uart_dev_s *dev, FAR unsigned int *status) { FAR struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint32_t rbr; From 44e7666310ebadb08f62496d22ddf69918637ed8 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 18:38:47 +0900 Subject: [PATCH 38/90] arch/arm/src/am335x/am335x_serial.c: Fix a type mismatch --- arch/arm/src/am335x/am335x_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/am335x/am335x_serial.c b/arch/arm/src/am335x/am335x_serial.c index 19bac0dccdc71..574de3793c905 100644 --- a/arch/arm/src/am335x/am335x_serial.c +++ b/arch/arm/src/am335x/am335x_serial.c @@ -109,7 +109,7 @@ static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); static int uart_interrupt(int irq, void *context, void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); static void up_send(struct uart_dev_s *dev, int ch); @@ -1142,7 +1142,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint32_t rbr; From 342d313fde59e58a7af2820415eb6d51489591e5 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 10 Nov 2020 23:18:01 +0900 Subject: [PATCH 39/90] drivers/syslog/vsyslog.c: Fix a printf format warning --- drivers/syslog/vsyslog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/syslog/vsyslog.c b/drivers/syslog/vsyslog.c index 3421f514dc2cb..e6cf91716c508 100644 --- a/drivers/syslog/vsyslog.c +++ b/drivers/syslog/vsyslog.c @@ -132,8 +132,8 @@ int nx_vsyslog(int priority, FAR const IPTR char *fmt, FAR va_list *ap) #if defined(CONFIG_SYSLOG_TIMESTAMP) /* Pre-pend the message with the current time, if available */ - ret = lib_sprintf(&stream.public, "[%5d.%06d] ", - ts.tv_sec, ts.tv_nsec / 1000); + ret = lib_sprintf(&stream.public, "[%5jd.%06ld] ", + (uintmax_t)ts.tv_sec, ts.tv_nsec / 1000); #else ret = 0; #endif From b7ce6ee0cd424c14c473def71ff08dfa14c22022 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Wed, 11 Nov 2020 10:44:10 +0900 Subject: [PATCH 40/90] arch/arm/src/stm32/stm32_sdio.c: Fix a type mismatch --- arch/arm/src/stm32/stm32_sdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c index b1150b61a6e90..ec529b957e027 100644 --- a/arch/arm/src/stm32/stm32_sdio.c +++ b/arch/arm/src/stm32/stm32_sdio.c @@ -458,7 +458,7 @@ static void stm32_blocksetup(FAR struct sdio_dev_s *dev, static int stm32_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, size_t nbytes); static int stm32_sendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, uint32_t nbytes); + FAR const uint8_t *buffer, size_t nbytes); static int stm32_cancel(FAR struct sdio_dev_s *dev); static int stm32_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd); From 9c93de0934139d6ebafb60ab34e6fc9d31c6f779 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Wed, 11 Nov 2020 10:44:48 +0900 Subject: [PATCH 41/90] arch/arm/src/stm32f7/stm32_sdmmc.c: Fix a type mismatch --- arch/arm/src/stm32f7/stm32_sdmmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.c b/arch/arm/src/stm32f7/stm32_sdmmc.c index c3c1cd5e8b557..0dee8f906111f 100644 --- a/arch/arm/src/stm32f7/stm32_sdmmc.c +++ b/arch/arm/src/stm32f7/stm32_sdmmc.c @@ -549,7 +549,7 @@ static void stm32_blocksetup(FAR struct sdio_dev_s *dev, static int stm32_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, size_t nbytes); static int stm32_sendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, uint32_t nbytes); + FAR const uint8_t *buffer, size_t nbytes); static int stm32_cancel(FAR struct sdio_dev_s *dev); static int stm32_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd); From 2c5af1f5eed808da24dcda675ab8114a3b4f4c8d Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Wed, 11 Nov 2020 10:45:30 +0900 Subject: [PATCH 42/90] arch/arm/src/stm32h7/stm32_sdmmc.c: Fix a type mismatch --- arch/arm/src/stm32h7/stm32_sdmmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/src/stm32h7/stm32_sdmmc.c b/arch/arm/src/stm32h7/stm32_sdmmc.c index 9b7462791c864..f60a5d79121a5 100644 --- a/arch/arm/src/stm32h7/stm32_sdmmc.c +++ b/arch/arm/src/stm32h7/stm32_sdmmc.c @@ -493,7 +493,7 @@ static void stm32_blocksetup(FAR struct sdio_dev_s *dev, static int stm32_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, size_t nbytes); static int stm32_sendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, uint32_t nbytes); + FAR const uint8_t *buffer, size_t nbytes); #endif static int stm32_cancel(FAR struct sdio_dev_s *dev); From c5f6d56b3de4f4a8bf61664f91395686559fe1ea Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Wed, 11 Nov 2020 10:46:01 +0900 Subject: [PATCH 43/90] arch/arm/src/stm32l4/stm32l4_sdmmc.c: Fix a type mismatch --- arch/arm/src/stm32l4/stm32l4_sdmmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/src/stm32l4/stm32l4_sdmmc.c b/arch/arm/src/stm32l4/stm32l4_sdmmc.c index f65d9da7ececa..0b2a4586106b3 100644 --- a/arch/arm/src/stm32l4/stm32l4_sdmmc.c +++ b/arch/arm/src/stm32l4/stm32l4_sdmmc.c @@ -484,7 +484,7 @@ static int stm32_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, static int stm32_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, size_t nbytes); static int stm32_sendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, uint32_t nbytes); + FAR const uint8_t *buffer, size_t nbytes); static int stm32_cancel(FAR struct sdio_dev_s *dev); static int stm32_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd); From eb333f706f06c1f6bcdd4b3da29bcd30e007f4c0 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Wed, 11 Nov 2020 11:05:57 +0900 Subject: [PATCH 44/90] stm32: Use the consistent type for stm32_dmacapable --- arch/arm/src/stm32/stm32_dma_v1.c | 2 +- arch/arm/src/stm32/stm32_dma_v2.c | 2 +- arch/arm/src/stm32/stm32_spi.c | 4 ++-- arch/arm/src/stm32f0l0g0/stm32_dma_v1.c | 2 +- arch/arm/src/stm32f0l0g0/stm32_spi.c | 4 ++-- arch/arm/src/stm32f7/stm32_dma.c | 2 +- arch/arm/src/stm32f7/stm32_spi.c | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/src/stm32/stm32_dma_v1.c b/arch/arm/src/stm32/stm32_dma_v1.c index d40ddca344559..d0e5582748c96 100644 --- a/arch/arm/src/stm32/stm32_dma_v1.c +++ b/arch/arm/src/stm32/stm32_dma_v1.c @@ -743,7 +743,7 @@ size_t stm32_dmaresidual(DMA_HANDLE handle) ****************************************************************************/ #ifdef CONFIG_STM32_DMACAPABLE -bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr) +bool stm32_dmacapable(uintptr_t maddr, uint32_t count, uint32_t ccr) { uint32_t transfer_size; uint32_t mend; diff --git a/arch/arm/src/stm32/stm32_dma_v2.c b/arch/arm/src/stm32/stm32_dma_v2.c index b02ec5aaf0126..8c2810ced3425 100644 --- a/arch/arm/src/stm32/stm32_dma_v2.c +++ b/arch/arm/src/stm32/stm32_dma_v2.c @@ -864,7 +864,7 @@ size_t stm32_dmaresidual(DMA_HANDLE handle) ****************************************************************************/ #ifdef CONFIG_STM32_DMACAPABLE -bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr) +bool stm32_dmacapable(uintptr_t maddr, uint32_t count, uint32_t ccr) { uint32_t transfer_size; uint32_t burst_length; diff --git a/arch/arm/src/stm32/stm32_spi.c b/arch/arm/src/stm32/stm32_spi.c index 5fb79c4f07923..3629b10734b27 100644 --- a/arch/arm/src/stm32/stm32_spi.c +++ b/arch/arm/src/stm32/stm32_spi.c @@ -1797,9 +1797,9 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, #ifdef CONFIG_STM32_DMACAPABLE if ((txbuffer && priv->txbuf == 0 && - !stm32_dmacapable((uint32_t)txbuffer, nwords, priv->txccr)) || + !stm32_dmacapable((uintptr_t)txbuffer, nwords, priv->txccr)) || (rxbuffer && priv->rxbuf == 0 && - !stm32_dmacapable((uint32_t)rxbuffer, nwords, priv->rxccr))) + !stm32_dmacapable((uintptr_t)rxbuffer, nwords, priv->rxccr))) { /* Unsupported memory region fall back to non-DMA method. */ diff --git a/arch/arm/src/stm32f0l0g0/stm32_dma_v1.c b/arch/arm/src/stm32f0l0g0/stm32_dma_v1.c index 157fe9cdeaacc..7098a9ca8e4ad 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_dma_v1.c +++ b/arch/arm/src/stm32f0l0g0/stm32_dma_v1.c @@ -650,7 +650,7 @@ size_t stm32_dmaresidual(DMA_HANDLE handle) ****************************************************************************/ #ifdef CONFIG_STM32F0L0G0_DMACAPABLE -bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr) +bool stm32_dmacapable(uintptr_t maddr, uint32_t count, uint32_t ccr) { uint32_t transfer_size; uint32_t mend; diff --git a/arch/arm/src/stm32f0l0g0/stm32_spi.c b/arch/arm/src/stm32f0l0g0/stm32_spi.c index d842760961768..7353d3693be4a 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_spi.c +++ b/arch/arm/src/stm32f0l0g0/stm32_spi.c @@ -1408,9 +1408,9 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, #ifdef CONFIG_STM32F0L0G0_DMACAPABLE if ((txbuffer && - !stm32_dmacapable((uint32_t)txbuffer, nwords, priv->txccr)) || + !stm32_dmacapable((uintptr_t)txbuffer, nwords, priv->txccr)) || (rxbuffer && - !stm32_dmacapable((uint32_t)rxbuffer, nwords, priv->rxccr))) + !stm32_dmacapable((uintptr_t)rxbuffer, nwords, priv->rxccr))) { /* Unsupported memory region, fall back to non-DMA method. */ diff --git a/arch/arm/src/stm32f7/stm32_dma.c b/arch/arm/src/stm32f7/stm32_dma.c index a1fbbcdd57bca..9fe6818dfed82 100644 --- a/arch/arm/src/stm32f7/stm32_dma.c +++ b/arch/arm/src/stm32f7/stm32_dma.c @@ -875,7 +875,7 @@ size_t stm32_dmaresidual(DMA_HANDLE handle) ****************************************************************************/ #ifdef CONFIG_STM32F7_DMACAPABLE -bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr) +bool stm32_dmacapable(uintptr_t maddr, uint32_t count, uint32_t ccr) { uint32_t transfer_size; uint32_t burst_length; diff --git a/arch/arm/src/stm32f7/stm32_spi.c b/arch/arm/src/stm32f7/stm32_spi.c index e394a44d090b5..4c03cf4609c96 100644 --- a/arch/arm/src/stm32f7/stm32_spi.c +++ b/arch/arm/src/stm32f7/stm32_spi.c @@ -1820,9 +1820,9 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, /* If this bus uses a in driver DMA aligned buffers we can skip the test */ if ((txbuffer && priv->txbuf == 0 && - !stm32_dmacapable((uint32_t)txbuffer, nwords, priv->txccr)) || + !stm32_dmacapable((uintptr_t)txbuffer, nwords, priv->txccr)) || (rxbuffer && priv->rxbuf == 0 && - !stm32_dmacapable((uint32_t)rxbuffer, nwords, priv->rxccr))) + !stm32_dmacapable((uintptr_t)rxbuffer, nwords, priv->rxccr))) { /* Unsupported memory region or not in driver buffers * fall back to non-DMA method. From bb0df5f2b0bcd38c27af6b1388efee36a6e9e0b4 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Wed, 11 Nov 2020 15:55:27 +0900 Subject: [PATCH 45/90] arch/arm/src/c5471/c5471_watchdog.c: Fix printf format warnings --- arch/arm/src/c5471/c5471_watchdog.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/src/c5471/c5471_watchdog.c b/arch/arm/src/c5471/c5471_watchdog.c index 40a7683fae8b1..7db0144750d94 100644 --- a/arch/arm/src/c5471/c5471_watchdog.c +++ b/arch/arm/src/c5471/c5471_watchdog.c @@ -262,7 +262,8 @@ static ssize_t wdt_read(struct file *filep, char *buffer, size_t buflen) wdinfo("buflen=%d\n", buflen); if (buflen >= 18) { - sprintf(buffer, "%08x %08x\n", c5471_wdt_cntl, c5471_wdt_count); + sprintf(buffer, "%08" PRIx32 " %08" PRIx32 "\n", + c5471_wdt_cntl, c5471_wdt_count); return 18; } From 1b2c67c3b96d453c62fbe68e246cfd761ec2727e Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Wed, 11 Nov 2020 16:05:57 +0900 Subject: [PATCH 46/90] arch/arm/src/cxd56xx/cxd56_irq.c: Fix a type mismatch --- arch/arm/src/cxd56xx/cxd56_irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/src/cxd56xx/cxd56_irq.c b/arch/arm/src/cxd56xx/cxd56_irq.c index d59872e61576e..7dc9d339a3d9c 100644 --- a/arch/arm/src/cxd56xx/cxd56_irq.c +++ b/arch/arm/src/cxd56xx/cxd56_irq.c @@ -277,7 +277,7 @@ static inline void cxd56_prioritize_syscall(int priority) } #endif -static int excinfo(int irq, uint32_t *regaddr, uint32_t *bit) +static int excinfo(int irq, uintptr_t *regaddr, uint32_t *bit) { *regaddr = NVIC_SYSHCON; switch (irq) From ad125d655939e3a29530ff31dede5b5fe0e37c40 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Wed, 11 Nov 2020 16:11:39 +0900 Subject: [PATCH 47/90] drivers/mtd/mtd_partition.c: Fix printf format warnings --- drivers/mtd/mtd_partition.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/mtd_partition.c b/drivers/mtd/mtd_partition.c index f0f92f46dd83c..32d59cfe2c521 100644 --- a/drivers/mtd/mtd_partition.c +++ b/drivers/mtd/mtd_partition.c @@ -629,14 +629,15 @@ static ssize_t part_procfs_read(FAR struct file *filep, FAR char *buffer, /* Terminate the partition name and add to output buffer */ - ret = snprintf(&buffer[total], buflen - total, "%s%7d %7d %s\n", - partname, attr->nextpart->firstblock / blkpererase, - attr->nextpart->neraseblocks, + ret = snprintf(&buffer[total], buflen - total, "%s%7ju %ju %s\n", + partname, + (uintmax_t)attr->nextpart->firstblock / blkpererase, + (uintmax_t)attr->nextpart->neraseblocks, attr->nextpart->parent->name); #else - ret = snprintf(&buffer[total], buflen - total, "%7d %7d %s\n", - attr->nextpart->firstblock / blkpererase, - attr->nextpart->neraseblocks, + ret = snprintf(&buffer[total], buflen - total, "%7ju %7ju %s\n", + (uintmax_t)attr->nextpart->firstblock / blkpererase, + (uintmax_t)attr->nextpart->neraseblocks, attr->nextpart->parent->name); #endif From 3315bc78346753e0550d0e80ac08cd33deffdd24 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Wed, 11 Nov 2020 16:15:30 +0900 Subject: [PATCH 48/90] fs/smartfs/smartfs_procfs.c: Fix printf format warnings --- fs/smartfs/smartfs_procfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/smartfs/smartfs_procfs.c b/fs/smartfs/smartfs_procfs.c index c302d302c282f..1d6db338aae85 100644 --- a/fs/smartfs/smartfs_procfs.c +++ b/fs/smartfs/smartfs_procfs.c @@ -847,10 +847,11 @@ static size_t smartfs_status_read(FAR struct file *filep, FAR char *buffer, "Total Sectors: %d\nSector Size: %d\n" "Format Sector: %d\nDir Sector: %d\n" "Free Sectors: %d\nReleased Sectors: %d\n" - "Unused Sectors: %d\nBlock Erases: %d\n" + "Unused Sectors: %" PRIu32 "\n" + "Block Erases: %" PRIu32 "\n" "Sectors Per Block: %d\nSector Utilization:%d%%\n" #ifdef CONFIG_MTD_SMART_WEAR_LEVEL - "Uneven Wear Count: %d\n" + "Uneven Wear Count: %" PRIu32 "\n" #endif , procfs_data.formatversion, procfs_data.namelen, From 5d36ffa5622c8307801004e350a8885052ae7c61 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 12:27:06 +0900 Subject: [PATCH 49/90] arch/arm/src/sama5/sam_sdmmc.c: Fix a type mismatch --- arch/arm/src/sama5/sam_sdmmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/src/sama5/sam_sdmmc.c b/arch/arm/src/sama5/sam_sdmmc.c index 842c1f70c1a8e..a0a8b86753f18 100644 --- a/arch/arm/src/sama5/sam_sdmmc.c +++ b/arch/arm/src/sama5/sam_sdmmc.c @@ -328,7 +328,7 @@ static void sam_blocksetup(FAR struct sdio_dev_s *dev, static int sam_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, size_t nbytes); static int sam_sendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, uint32_t nbytes); + FAR const uint8_t *buffer, size_t nbytes); #endif static int sam_cancel(FAR struct sdio_dev_s *dev); From cfac6e5343b7b913f6f1a82253158caa31ddebcf Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 12:57:35 +0900 Subject: [PATCH 50/90] arch/arm/src/sama5/sam_udphs.c: Fix a type mismatch --- arch/arm/src/sama5/sam_udphs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/src/sama5/sam_udphs.c b/arch/arm/src/sama5/sam_udphs.c index 93600f3b8ff70..fedcd0b655951 100644 --- a/arch/arm/src/sama5/sam_udphs.c +++ b/arch/arm/src/sama5/sam_udphs.c @@ -790,7 +790,7 @@ static void sam_putreg(uint32_t regval, uintptr_t regaddr) putreg32(regval, regaddr); } #else -static inline void sam_putreg(uint32_t regval, uint32_t regaddr) +static inline void sam_putreg(uint32_t regval, uintptr_t regaddr) { putreg32(regval, regaddr); } From 4076c91feed7c531bb4af255b2ee61cef5b280b1 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 12:58:38 +0900 Subject: [PATCH 51/90] arch/arm/src/lpc54xx/lpc54_serial.c: Fix a type mismatch --- arch/arm/src/lpc54xx/lpc54_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/lpc54xx/lpc54_serial.c b/arch/arm/src/lpc54xx/lpc54_serial.c index 065138314e220..788b35b4f21df 100644 --- a/arch/arm/src/lpc54xx/lpc54_serial.c +++ b/arch/arm/src/lpc54xx/lpc54_serial.c @@ -407,7 +407,7 @@ static int lpc54_attach(struct uart_dev_s *dev); static void lpc54_detach(struct uart_dev_s *dev); static int lpc54_interrupt(int irq, void *context, FAR void *arg); static int lpc54_ioctl(struct file *filep, int cmd, unsigned long arg); -static int lpc54_receive(struct uart_dev_s *dev, uint32_t *status); +static int lpc54_receive(struct uart_dev_s *dev, unsigned int *status); static void lpc54_rxint(struct uart_dev_s *dev, bool enable); static bool lpc54_rxavailable(struct uart_dev_s *dev); static void lpc54_send(struct uart_dev_s *dev, int ch); @@ -1199,7 +1199,7 @@ static int lpc54_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int lpc54_receive(struct uart_dev_s *dev, uint32_t *status) +static int lpc54_receive(struct uart_dev_s *dev, unsigned int *status) { struct lpc54_dev_s *priv = (struct lpc54_dev_s *)dev->priv; uint32_t fiford; From 5f3153ac3c658b613777a4eacbb37903f9aa562c Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 13:27:21 +0900 Subject: [PATCH 52/90] arch/arm/src/sama5/sam_dbgu.c: Fix a type mismatch --- arch/arm/src/sama5/sam_dbgu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/sama5/sam_dbgu.c b/arch/arm/src/sama5/sam_dbgu.c index d9d3ec7cc622b..c6ee15cf34fb4 100644 --- a/arch/arm/src/sama5/sam_dbgu.c +++ b/arch/arm/src/sama5/sam_dbgu.c @@ -92,7 +92,7 @@ static int dbgu_attach(struct uart_dev_s *dev); static void dbgu_detach(struct uart_dev_s *dev); static int dbgu_interrupt(int irq, void *context, FAR void *arg); static int dbgu_ioctl(struct file *filep, int cmd, unsigned long arg); -static int dbgu_receive(struct uart_dev_s *dev, uint32_t *status); +static int dbgu_receive(struct uart_dev_s *dev, unsigned int *status); static void dbgu_rxint(struct uart_dev_s *dev, bool enable); static bool dbgu_rxavailable(struct uart_dev_s *dev); static void dbgu_send(struct uart_dev_s *dev, int ch); @@ -437,7 +437,7 @@ static int dbgu_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int dbgu_receive(struct uart_dev_s *dev, uint32_t *status) +static int dbgu_receive(struct uart_dev_s *dev, unsigned int *status) { struct dbgu_dev_s *priv = (struct dbgu_dev_s *)dev->priv; From fdd2eefc184185b8f946bfd2ff267fa2c9f46dab Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 13:29:56 +0900 Subject: [PATCH 53/90] drivers/audio/wm8904.c: Fix a printf format warning --- drivers/audio/wm8904.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/audio/wm8904.c b/drivers/audio/wm8904.c index cb10c23d87cec..1ddb4e156846b 100644 --- a/drivers/audio/wm8904.c +++ b/drivers/audio/wm8904.c @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -1603,7 +1604,8 @@ static int wm8904_start(FAR struct audio_lowerhalf_s *dev) /* Create a message queue for the worker thread */ - snprintf(priv->mqname, sizeof(priv->mqname), "/tmp/%X", priv); + snprintf(priv->mqname, sizeof(priv->mqname), "/tmp/%" PRIXPTR, + (uintptr_t)priv); attr.mq_maxmsg = 16; attr.mq_msgsize = sizeof(struct audio_msg_s); From 57963a0226e5f393c2cdd1893970192aadfee8c1 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 14:23:11 +0900 Subject: [PATCH 54/90] drivers/audio/audio_null.c: Fix a printf format warning --- drivers/audio/audio_null.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/audio/audio_null.c b/drivers/audio/audio_null.c index c966e73f89399..0b7b709465e3e 100644 --- a/drivers/audio/audio_null.c +++ b/drivers/audio/audio_null.c @@ -46,6 +46,7 @@ #include #include +#include #include #include #include @@ -528,7 +529,8 @@ static int null_start(FAR struct audio_lowerhalf_s *dev) /* Create a message queue for the worker thread */ - snprintf(priv->mqname, sizeof(priv->mqname), "/tmp/%X", priv); + snprintf(priv->mqname, sizeof(priv->mqname), "/tmp/%" PRIXPTR, + (uintptr_t)priv); attr.mq_maxmsg = 16; attr.mq_msgsize = sizeof(struct audio_msg_s); From 6bd822077a8b1263145da680cc636e0cf8b75929 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 14:43:42 +0900 Subject: [PATCH 55/90] arch/arm/src/sam34/sam_udp.c: Fix a type mismatch --- arch/arm/src/sam34/sam_udp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/src/sam34/sam_udp.c b/arch/arm/src/sam34/sam_udp.c index 84ed26a22ebb5..fa1bd9e894ca5 100644 --- a/arch/arm/src/sam34/sam_udp.c +++ b/arch/arm/src/sam34/sam_udp.c @@ -731,7 +731,7 @@ static void sam_putreg(uint32_t regval, uintptr_t regaddr) putreg32(regval, regaddr); } #else -static inline void sam_putreg(uint32_t regval, uint32_t regaddr) +static inline void sam_putreg(uint32_t regval, uintptr_t regaddr) { putreg32(regval, regaddr); } From 32816c7a3db76aa57a602ed24cd4e11ed567efab Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 14:48:05 +0900 Subject: [PATCH 56/90] fs/procfs/fs_procfscpuload.c: Fix printf format warnings --- fs/procfs/fs_procfscpuload.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/procfs/fs_procfscpuload.c b/fs/procfs/fs_procfscpuload.c index da13d72e6f160..ee6970441ecbd 100644 --- a/fs/procfs/fs_procfscpuload.c +++ b/fs/procfs/fs_procfscpuload.c @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -252,7 +253,8 @@ static ssize_t cpuload_read(FAR struct file *filep, FAR char *buffer, fracpart = 0; } - linesize = snprintf(attr->line, CPULOAD_LINELEN, "%3d.%01d%%\n", + linesize = snprintf(attr->line, CPULOAD_LINELEN, + "%3" PRId32 ".%01" PRId32 "%%\n", intpart, fracpart); /* Save the linesize in case we are re-entered with f_pos > 0 */ From d6b4e27e6f523fd16ff353b3b7c690aa95655dc1 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 14:49:23 +0900 Subject: [PATCH 57/90] fs/procfs/fs_procfsproc.c: Fix prinf format warnings --- fs/procfs/fs_procfsproc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/procfs/fs_procfsproc.c b/fs/procfs/fs_procfsproc.c index c20ab77dc4fc0..3cbf4587a97e3 100644 --- a/fs/procfs/fs_procfsproc.c +++ b/fs/procfs/fs_procfsproc.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -769,7 +770,8 @@ static ssize_t proc_loadavg(FAR struct proc_file_s *procfile, fracpart = 0; } - linesize = snprintf(procfile->line, STATUS_LINELEN, "%3d.%01d%%", + linesize = snprintf(procfile->line, STATUS_LINELEN, + "%3" PRId32 ".%01" PRId32 "%%", intpart, fracpart); copysize = procfs_memcpy(procfile->line, linesize, buffer, buflen, &offset); From 257af85b3da461e1f62f8240d1b5b04ef994c940 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 14:52:08 +0900 Subject: [PATCH 58/90] arch/arm/src/samv7/sam_serial.c: Fix a type mismatch --- arch/arm/src/samv7/sam_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/samv7/sam_serial.c b/arch/arm/src/samv7/sam_serial.c index a9e3cf62d7d7b..f3a7b46904f6e 100644 --- a/arch/arm/src/samv7/sam_serial.c +++ b/arch/arm/src/samv7/sam_serial.c @@ -355,7 +355,7 @@ static int sam_attach(struct uart_dev_s *dev); static void sam_detach(struct uart_dev_s *dev); static int sam_interrupt(int irq, void *context, FAR void *arg); static int sam_ioctl(struct file *filep, int cmd, unsigned long arg); -static int sam_receive(struct uart_dev_s *dev, uint32_t *status); +static int sam_receive(struct uart_dev_s *dev, unsigned int *status); static void sam_rxint(struct uart_dev_s *dev, bool enable); static bool sam_rxavailable(struct uart_dev_s *dev); static void sam_send(struct uart_dev_s *dev, int ch); @@ -1255,7 +1255,7 @@ static int sam_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int sam_receive(struct uart_dev_s *dev, uint32_t *status) +static int sam_receive(struct uart_dev_s *dev, unsigned int *status) { struct sam_dev_s *priv = (struct sam_dev_s *)dev->priv; From 359cecdab144eeb2e25d30f149033c4f3e3f5505 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 14:54:13 +0900 Subject: [PATCH 59/90] arch/arm/src/samd2l2/sam_serial.c: Fix a type mismatch --- arch/arm/src/samd2l2/sam_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/samd2l2/sam_serial.c b/arch/arm/src/samd2l2/sam_serial.c index 5fc2cf7049bf9..040a84ad35830 100644 --- a/arch/arm/src/samd2l2/sam_serial.c +++ b/arch/arm/src/samd2l2/sam_serial.c @@ -262,7 +262,7 @@ static void sam_shutdown(struct uart_dev_s *dev); static int sam_attach(struct uart_dev_s *dev); static void sam_detach(struct uart_dev_s *dev); static int sam_ioctl(struct file *filep, int cmd, unsigned long arg); -static int sam_receive(struct uart_dev_s *dev, uint32_t *status); +static int sam_receive(struct uart_dev_s *dev, unsigned int *status); static void sam_rxint(struct uart_dev_s *dev, bool enable); static bool sam_rxavailable(struct uart_dev_s *dev); static void sam_send(struct uart_dev_s *dev, int ch); @@ -822,7 +822,7 @@ static int sam_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int sam_receive(struct uart_dev_s *dev, uint32_t *status) +static int sam_receive(struct uart_dev_s *dev, unsigned int *status) { struct sam_dev_s *priv = (struct sam_dev_s *)dev->priv; From 9bf9550f0e137afb238697db32f914c4bfbac621 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 14:56:11 +0900 Subject: [PATCH 60/90] arch/arm/src/samd5e5/sam_serial.c: Fix a type mismatch --- arch/arm/src/samd5e5/sam_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/samd5e5/sam_serial.c b/arch/arm/src/samd5e5/sam_serial.c index a3a733633c453..24447b6e9c675 100644 --- a/arch/arm/src/samd5e5/sam_serial.c +++ b/arch/arm/src/samd5e5/sam_serial.c @@ -329,7 +329,7 @@ static void sam_shutdown(struct uart_dev_s *dev); static int sam_attach(struct uart_dev_s *dev); static void sam_detach(struct uart_dev_s *dev); static int sam_ioctl(struct file *filep, int cmd, unsigned long arg); -static int sam_receive(struct uart_dev_s *dev, uint32_t *status); +static int sam_receive(struct uart_dev_s *dev, unsigned int *status); static void sam_rxint(struct uart_dev_s *dev, bool enable); static bool sam_rxavailable(struct uart_dev_s *dev); static void sam_send(struct uart_dev_s *dev, int ch); @@ -880,7 +880,7 @@ static int sam_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int sam_receive(struct uart_dev_s *dev, uint32_t *status) +static int sam_receive(struct uart_dev_s *dev, unsigned int *status) { struct sam_dev_s *priv = (struct sam_dev_s *)dev->priv; From 9570625f9913724fd86ea88a49a39f0ea976212a Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 14:58:29 +0900 Subject: [PATCH 61/90] net/procfs/netdev_statistics.c: Fix a printf format warning --- net/procfs/netdev_statistics.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/procfs/netdev_statistics.c b/net/procfs/netdev_statistics.c index bbb499e4b5410..95b18ac7e414e 100644 --- a/net/procfs/netdev_statistics.c +++ b/net/procfs/netdev_statistics.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -542,7 +543,8 @@ static int netprocfs_errors(FAR struct netprocfs_file_s *netfile) dev = netfile->dev; stats = &dev->d_statistics; - return snprintf(netfile->line, NET_LINELEN , "\tTotal Errors: %08x\n\n", + return snprintf(netfile->line, NET_LINELEN, + "\tTotal Errors: %08" PRIx32 "\n\n", stats->errors); } #endif /* CONFIG_NETDEV_STATISTICS */ From f41d223e5754706b299d54cec19b150cebe5e9b8 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 15:05:10 +0900 Subject: [PATCH 62/90] drivers/wireless/ieee802154/mrf24j40/mrf24j40_regops.c: Fix a printf format warning --- drivers/wireless/ieee802154/mrf24j40/mrf24j40_regops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/wireless/ieee802154/mrf24j40/mrf24j40_regops.c b/drivers/wireless/ieee802154/mrf24j40/mrf24j40_regops.c index b6d6cc32be224..8ccfcdad8ca6f 100644 --- a/drivers/wireless/ieee802154/mrf24j40/mrf24j40_regops.c +++ b/drivers/wireless/ieee802154/mrf24j40/mrf24j40_regops.c @@ -158,7 +158,7 @@ int mrf24j40_regdump(FAR struct mrf24j40_radio_s *dev) { if ((i & 15) == 0) { - len = sprintf(buf, "%02x: ", i & 0xff); + len = sprintf(buf, "%02" PRIx32 ": ", i & 0xff); } len += sprintf(buf + len, "%02x ", mrf24j40_getreg(dev->spi, i)); From 3a0d95483b7564cf089a836f3d07bf67502055af Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 15:37:56 +0900 Subject: [PATCH 63/90] arch/arm/src/imxrt/imxrt_serial.c: Fix a type mismatch --- arch/arm/src/imxrt/imxrt_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/imxrt/imxrt_serial.c b/arch/arm/src/imxrt/imxrt_serial.c index 0cd9e833abd09..1d713abd2cd8e 100644 --- a/arch/arm/src/imxrt/imxrt_serial.c +++ b/arch/arm/src/imxrt/imxrt_serial.c @@ -366,7 +366,7 @@ static int imxrt_attach(struct uart_dev_s *dev); static void imxrt_detach(struct uart_dev_s *dev); static int imxrt_interrupt(int irq, void *context, FAR void *arg); static int imxrt_ioctl(struct file *filep, int cmd, unsigned long arg); -static int imxrt_receive(struct uart_dev_s *dev, uint32_t *status); +static int imxrt_receive(struct uart_dev_s *dev, unsigned int *status); static void imxrt_rxint(struct uart_dev_s *dev, bool enable); static bool imxrt_rxavailable(struct uart_dev_s *dev); static void imxrt_send(struct uart_dev_s *dev, int ch); @@ -1385,7 +1385,7 @@ static int imxrt_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int imxrt_receive(struct uart_dev_s *dev, uint32_t *status) +static int imxrt_receive(struct uart_dev_s *dev, unsigned int *status) { struct imxrt_uart_s *priv = (struct imxrt_uart_s *)dev->priv; uint32_t rxd; From 686b4dc3466cc1a64ad5d119871c073dcebd73c8 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 15:50:47 +0900 Subject: [PATCH 64/90] fs/procfs/fs_procfsiobinfo.c: Add a missing entry for can Found by the following compiler warning: procfs/fs_procfsiobinfo.c: In function 'iobinfo_read': procfs/fs_procfsiobinfo.c:344:20: error: '%-16s' directive argument is null [-Werror=format-overflow=] 344 | linesize = snprintf(iobfile->line, IOBINFO_LINELEN, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 345 | "\n%-16s%16lu%16lu\n", | ~~~~~~~~~~~~~~~~~~~~~~ 346 | g_iob_user_names[IOBUSER_GLOBAL], | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 347 | (unsigned long)userstats->totalconsumed, | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 348 | (unsigned long)userstats->totalproduced); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors --- fs/procfs/fs_procfsiobinfo.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/procfs/fs_procfsiobinfo.c b/fs/procfs/fs_procfsiobinfo.c index 72fe6977e7fee..dad8fdc4a4dab 100644 --- a/fs/procfs/fs_procfsiobinfo.c +++ b/fs/procfs/fs_procfsiobinfo.c @@ -168,6 +168,9 @@ static FAR const char *g_iob_user_names[] = #endif #ifdef CONFIG_WIRELESS_BLUETOOTH "bluetooth", +#endif +#ifdef CONFIG_NET_CAN + "can", #endif "global", }; From 4f04efe517ee19cc4945dc9657506a4964caac3c Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 15:57:22 +0900 Subject: [PATCH 65/90] arch/arm/src/kinetis/kinetis_lpserial.c: Fix a type mismatch --- arch/arm/src/kinetis/kinetis_lpserial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/kinetis/kinetis_lpserial.c b/arch/arm/src/kinetis/kinetis_lpserial.c index d53d4177966c6..6bf44b0189fde 100644 --- a/arch/arm/src/kinetis/kinetis_lpserial.c +++ b/arch/arm/src/kinetis/kinetis_lpserial.c @@ -257,7 +257,7 @@ static int kinetis_attach(struct uart_dev_s *dev); static void kinetis_detach(struct uart_dev_s *dev); static int kinetis_interrupt(int irq, void *context, void *arg); static int kinetis_ioctl(struct file *filep, int cmd, unsigned long arg); -static int kinetis_receive(struct uart_dev_s *dev, uint32_t *status); +static int kinetis_receive(struct uart_dev_s *dev, unsigned int *status); static void kinetis_rxint(struct uart_dev_s *dev, bool enable); static bool kinetis_rxavailable(struct uart_dev_s *dev); #ifdef CONFIG_SERIAL_IFLOWCONTROL @@ -1076,7 +1076,7 @@ static int kinetis_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int kinetis_receive(struct uart_dev_s *dev, uint32_t *status) +static int kinetis_receive(struct uart_dev_s *dev, unsigned int *status) { struct kinetis_dev_s *priv = (struct kinetis_dev_s *)dev->priv; uint32_t regval; From 827c3e6a57b77e6a92e3d554dc1dca45879e7968 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 15:58:41 +0900 Subject: [PATCH 66/90] arch/arm/src/kinetis/kinetis_sdhc.c: Fix a type mismatch --- arch/arm/src/kinetis/kinetis_sdhc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c index 9fafc7b3b827f..077c42676ed42 100644 --- a/arch/arm/src/kinetis/kinetis_sdhc.c +++ b/arch/arm/src/kinetis/kinetis_sdhc.c @@ -310,7 +310,7 @@ static void kinetis_blocksetup(FAR struct sdio_dev_s *dev, static int kinetis_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, size_t nbytes); static int kinetis_sendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, uint32_t nbytes); + FAR const uint8_t *buffer, size_t nbytes); #endif static int kinetis_cancel(FAR struct sdio_dev_s *dev); From e63ac799e488ac48e6fa6275b59d8893f1d0e224 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 15:59:26 +0900 Subject: [PATCH 67/90] arch/arm/src/s32k1xx/s32k1xx_serial.c: Fix a type mismatch --- arch/arm/src/s32k1xx/s32k1xx_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/s32k1xx/s32k1xx_serial.c b/arch/arm/src/s32k1xx/s32k1xx_serial.c index 3144d40084917..8e6da23dbeb9d 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_serial.c +++ b/arch/arm/src/s32k1xx/s32k1xx_serial.c @@ -199,7 +199,7 @@ static int s32k1xx_attach(struct uart_dev_s *dev); static void s32k1xx_detach(struct uart_dev_s *dev); static int s32k1xx_interrupt(int irq, void *context, FAR void *arg); static int s32k1xx_ioctl(struct file *filep, int cmd, unsigned long arg); -static int s32k1xx_receive(struct uart_dev_s *dev, uint32_t *status); +static int s32k1xx_receive(struct uart_dev_s *dev, unsigned int *status); static void s32k1xx_rxint(struct uart_dev_s *dev, bool enable); static bool s32k1xx_rxavailable(struct uart_dev_s *dev); static void s32k1xx_send(struct uart_dev_s *dev, int ch); @@ -955,7 +955,7 @@ static int s32k1xx_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int s32k1xx_receive(struct uart_dev_s *dev, uint32_t *status) +static int s32k1xx_receive(struct uart_dev_s *dev, unsigned int *status) { struct s32k1xx_uart_s *priv = (struct s32k1xx_uart_s *)dev->priv; uint32_t rxd; From faad9b88a4bd3be10061535b5bdacdbd43c502ba Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 16:03:01 +0900 Subject: [PATCH 68/90] net/can/can_getsockopt.c: Fix type mismatches --- net/can/can_getsockopt.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/net/can/can_getsockopt.c b/net/can/can_getsockopt.c index af46244f89611..319b5b3667eee 100644 --- a/net/can/can_getsockopt.c +++ b/net/can/can_getsockopt.c @@ -139,10 +139,10 @@ int can_getsockopt(FAR struct socket *psock, int option, } else { - FAR int *loopback = (FAR int32_t *)value; - *loopback = conn->loopback; - *value_len = sizeof(conn->loopback); - ret = OK; + FAR int32_t *loopback = (FAR int32_t *)value; + *loopback = conn->loopback; + *value_len = sizeof(conn->loopback); + ret = OK; } break; @@ -158,10 +158,10 @@ int can_getsockopt(FAR struct socket *psock, int option, } else { - FAR int *recv_own_msgs = (FAR int32_t *)value; - *recv_own_msgs = conn->recv_own_msgs; - *value_len = sizeof(conn->recv_own_msgs); - ret = OK; + FAR int32_t *recv_own_msgs = (FAR int32_t *)value; + *recv_own_msgs = conn->recv_own_msgs; + *value_len = sizeof(conn->recv_own_msgs); + ret = OK; } break; @@ -178,10 +178,10 @@ int can_getsockopt(FAR struct socket *psock, int option, } else { - FAR int *fd_frames = (FAR int32_t *)value; - *fd_frames = conn->fd_frames; - *value_len = sizeof(conn->fd_frames); - ret = OK; + FAR int32_t *fd_frames = (FAR int32_t *)value; + *fd_frames = conn->fd_frames; + *value_len = sizeof(conn->fd_frames); + ret = OK; } break; #endif @@ -202,10 +202,10 @@ int can_getsockopt(FAR struct socket *psock, int option, } else { - FAR int *tx_deadline = (FAR int32_t *)value; - *tx_deadline = conn->tx_deadline; - *value_len = sizeof(conn->tx_deadline); - ret = OK; + FAR int32_t *tx_deadline = (FAR int32_t *)value; + *tx_deadline = conn->tx_deadline; + *value_len = sizeof(conn->tx_deadline); + ret = OK; } break; #endif From 734e06ce7aee9eb12459aae307bcee21f8051027 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 16:53:18 +0900 Subject: [PATCH 69/90] drivers/audio/cxd56.c: Fix a printf format warning --- drivers/audio/cxd56.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/audio/cxd56.c b/drivers/audio/cxd56.c index 259e7aee39a78..ea5d5582a1a38 100644 --- a/drivers/audio/cxd56.c +++ b/drivers/audio/cxd56.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -3475,7 +3476,8 @@ static int cxd56_init_worker(FAR struct audio_lowerhalf_s *dev) void *value; int ret; - snprintf(priv->mqname, sizeof(priv->mqname), "/tmp/%X", priv); + snprintf(priv->mqname, sizeof(priv->mqname), "/tmp/%" PRIXPTR, + (uintptr_t)priv); m_attr.mq_maxmsg = 16; m_attr.mq_msgsize = sizeof(struct audio_msg_s); From 030fd7a1c2fc32f0ba79f46095220b54137f226e Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 17:39:00 +0900 Subject: [PATCH 70/90] drivers/wireless/ieee802154/mrf24j40/mrf24j40_regops.c: Fix a printf format warning --- drivers/wireless/ieee802154/mrf24j40/mrf24j40_regops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/wireless/ieee802154/mrf24j40/mrf24j40_regops.c b/drivers/wireless/ieee802154/mrf24j40/mrf24j40_regops.c index 8ccfcdad8ca6f..7cae957de1271 100644 --- a/drivers/wireless/ieee802154/mrf24j40/mrf24j40_regops.c +++ b/drivers/wireless/ieee802154/mrf24j40/mrf24j40_regops.c @@ -43,6 +43,7 @@ #include #include +#include #include #include "mrf24j40.h" @@ -175,7 +176,7 @@ int mrf24j40_regdump(FAR struct mrf24j40_radio_s *dev) { if ((i & 15) == 0) { - len = sprintf(buf, "%02x: ", i & 0xff); + len = sprintf(buf, "%02" PRIx32 ": ", i & 0xff); } len += sprintf(buf + len, "%02x ", mrf24j40_getreg(dev->spi, i)); From 79c905e972d21207d02d84a7668c383127914e36 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 17:42:14 +0900 Subject: [PATCH 71/90] drivers/audio/cs43l22.c: Fix a printf format warning --- drivers/audio/cs43l22.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/audio/cs43l22.c b/drivers/audio/cs43l22.c index dac7854320fb1..24e37a04765ef 100644 --- a/drivers/audio/cs43l22.c +++ b/drivers/audio/cs43l22.c @@ -44,6 +44,7 @@ #include #include +#include #include #include #include @@ -1214,7 +1215,8 @@ static int cs43l22_start(FAR struct audio_lowerhalf_s *dev) /* Create a message queue for the worker thread */ - snprintf(priv->mqname, sizeof(priv->mqname), "/tmp/%X", priv); + snprintf(priv->mqname, sizeof(priv->mqname), "/tmp/%" PRIXPTR, + (uintptr_t)priv); attr.mq_maxmsg = 16; attr.mq_msgsize = sizeof(struct audio_msg_s); From 68ca62094c1fed6965d2b8b4b8be56dc69b5b4b6 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 17:56:51 +0900 Subject: [PATCH 72/90] boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c: Fix printf format warnings --- boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c index 06b0083f785ff..3eed410dc00d7 100644 --- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c +++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c @@ -24,6 +24,7 @@ #include +#include #include #include #include @@ -175,8 +176,9 @@ int highpri_main(int argc, char *argv[]) g_highpri.dev = dev; prescaler = STM32_TIM_SETCLOCK(dev, CONFIG_VIEWTOOL_TIM6_FREQUENCY); - printf("TIM6 CLKIN=%d Hz, Frequency=%d Hz, prescaler=%d\n", - STM32_APB1_TIM6_CLKIN, CONFIG_VIEWTOOL_TIM6_FREQUENCY, prescaler); + printf("TIM6 CLKIN=%jd Hz, Frequency=%d Hz, prescaler=%d\n", + (uintmax_t)STM32_APB1_TIM6_CLKIN, CONFIG_VIEWTOOL_TIM6_FREQUENCY, + prescaler); STM32_TIM_SETPERIOD(dev, CONFIG_VIEWTOOL_TIM6_PERIOD); printf("TIM6 period=%d cyles; interrupt rate=%d Hz\n", @@ -233,7 +235,7 @@ int highpri_main(int argc, char *argv[]) /* Then print out what is happening */ - printf("Elapsed time: %d seconds\n\n", seconds); + printf("Elapsed time: %" PRId32 " seconds\n\n", seconds); for (i = 0, total = 0; i < 16; i++) { total += basepri[i]; From cccc2fecba9fdc8aadd55ef4158aacd1baf5e07e Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 18:28:44 +0900 Subject: [PATCH 73/90] net/local/local_fifo.c: Fix a few printf format warnings --- net/local/local_fifo.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/local/local_fifo.c b/net/local/local_fifo.c index bae37da1be049..2b4f9b741c7e8 100644 --- a/net/local/local_fifo.c +++ b/net/local/local_fifo.c @@ -43,6 +43,7 @@ #include #include +#include #include #include #include @@ -87,7 +88,7 @@ static inline void local_cs_name(FAR struct local_conn_s *conn, } else { - snprintf(path, LOCAL_FULLPATH_LEN - 1, "%s" LOCAL_CS_SUFFIX "%x", + snprintf(path, LOCAL_FULLPATH_LEN - 1, "%s" LOCAL_CS_SUFFIX "%" PRIx32, conn->lc_path, conn->lc_instance_id); } @@ -114,7 +115,7 @@ static inline void local_sc_name(FAR struct local_conn_s *conn, } else { - snprintf(path, LOCAL_FULLPATH_LEN - 1, "%s" LOCAL_SC_SUFFIX "%x", + snprintf(path, LOCAL_FULLPATH_LEN - 1, "%s" LOCAL_SC_SUFFIX "%" PRIx32, conn->lc_path, conn->lc_instance_id); } From a45bb4ef7de3d86a6ffa6395f26f93233dffbf8c Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 18:38:42 +0900 Subject: [PATCH 74/90] boards/arm/stm32/nucleo-f334r8/src/stm32_spwm.c: Fix a printf format warning --- boards/arm/stm32/nucleo-f334r8/src/stm32_spwm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/boards/arm/stm32/nucleo-f334r8/src/stm32_spwm.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_spwm.c index a5d0662deeb1d..b3af2a5a11db1 100644 --- a/boards/arm/stm32/nucleo-f334r8/src/stm32_spwm.c +++ b/boards/arm/stm32/nucleo-f334r8/src/stm32_spwm.c @@ -24,6 +24,7 @@ #include +#include #include #include #include @@ -453,8 +454,8 @@ static int slaves_configure(FAR struct spwm_s *spwm) per = fclk / CONFIG_NUCLEOF334R8_SPWM_PWM_FREQ; if (per > HRTIM_PER_MAX) { - printf("ERROR: can not achieve pwm freq=%llu if fclk=%llu\n", - CONFIG_NUCLEOF334R8_SPWM_PWM_FREQ, fclk); + printf("ERROR: can not achieve pwm freq=%ju if fclk=%llu\n", + (uintmax_t)CONFIG_NUCLEOF334R8_SPWM_PWM_FREQ, fclk); ret = -EINVAL; goto errout; } From 8957be5556cd5917b10c09315d0a36f78e372eca Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 18:40:22 +0900 Subject: [PATCH 75/90] boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c: Fix a printf format warning --- boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c index 32acb0ac4ee4e..161b5c0ea0dc5 100644 --- a/boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c +++ b/boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c @@ -24,6 +24,7 @@ #include +#include #include #include #include @@ -543,10 +544,10 @@ int highpri_main(int argc, char *argv[]) g_highpri.lock = true; #ifndef CONFIG_STM32_ADC1_DMA - printf("%d [%d] %0.3fV\n", g_highpri.cntr1, g_highpri.current, + printf("%" PRId32 " [%d] %0.3fV\n", g_highpri.cntr1, g_highpri.current, g_highpri.r_volt[g_highpri.current]); #else - printf("%d ", g_highpri.cntr1); + printf("%" PRId32 " ", g_highpri.cntr1); for (i = 0; i < REG_NCHANNELS; i += 1) { @@ -559,7 +560,7 @@ int highpri_main(int argc, char *argv[]) #ifdef HIGHPRI_HAVE_INJECTED /* Print data from injected channels */ - printf("%d ", g_highpri.cntr2); + printf("%" PRId32 " ", g_highpri.cntr2); for (i = 0; i < INJ_NCHANNELS; i += 1) { From a40e697af17b28892a43e15fa4c1fc68c9a4a8df Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 18:41:27 +0900 Subject: [PATCH 76/90] boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c: Fix a printf format warning --- boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c b/boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c index a1deac11e120e..f5d79d6db6c07 100644 --- a/boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c +++ b/boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c @@ -24,6 +24,7 @@ #include +#include #include #include #include @@ -501,10 +502,10 @@ int highpri_main(int argc, char *argv[]) g_highpri.lock = true; #ifndef CONFIG_STM32_ADC1_DMA - printf("%d [%d] %0.3fV\n", g_highpri.cntr1, g_highpri.current, + printf("%" PRId32 " [%d] %0.3fV\n", g_highpri.cntr1, g_highpri.current, g_highpri.r_volt[g_highpri.current]); #else - printf("%d ", g_highpri.cntr1); + printf("%" PRId32 " ", g_highpri.cntr1); for (i = 0; i < REG_NCHANNELS; i += 1) { @@ -517,7 +518,7 @@ int highpri_main(int argc, char *argv[]) #ifdef HIGHPRI_HAVE_INJECTED /* Print data from injected channels */ - printf("%d ", g_highpri.cntr2); + printf("%" PRId32 " ", g_highpri.cntr2); for (i = 0; i < INJ_NCHANNELS; i += 1) { From d168ef52ec3fdee7c6876edcb2bb9d086653d6dc Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 17:06:39 +0900 Subject: [PATCH 77/90] boards/arm/stm32/stm32f429i-disco/src/stm32_highpri.c: Fix printf format warnings --- boards/arm/stm32/stm32f429i-disco/src/stm32_highpri.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_highpri.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_highpri.c index e965a440d4440..67a8f288f74dd 100644 --- a/boards/arm/stm32/stm32f429i-disco/src/stm32_highpri.c +++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_highpri.c @@ -24,6 +24,7 @@ #include +#include #include #include #include @@ -492,10 +493,10 @@ int highpri_main(int argc, char *argv[]) g_highpri.lock = true; #ifndef CONFIG_STM32_ADC1_DMA - printf("%d [%d] %0.3fV\n", g_highpri.cntr1, g_highpri.current, + printf("%" PRId32 " [%d] %0.3fV\n", g_highpri.cntr1, g_highpri.current, g_highpri.r_volt[g_highpri.current]); #else - printf("%d ", g_highpri.cntr1); + printf("%" PRId32 " ", g_highpri.cntr1); for (i = 0; i < REG_NCHANNELS; i += 1) { @@ -508,7 +509,7 @@ int highpri_main(int argc, char *argv[]) #ifdef HIGHPRI_HAVE_INJECTED /* Print data from injected channels */ - printf("%d ", g_highpri.cntr2); + printf("%" PRId32 " ", g_highpri.cntr2); for (i = 0; i < INJ_NCHANNELS; i += 1) { From a7dcf28b8de62dec7d5f164a3b0cc1060725d410 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 19:02:08 +0900 Subject: [PATCH 78/90] drivers/audio/vs1053.c: Fix a printf format warning --- drivers/audio/vs1053.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/audio/vs1053.c b/drivers/audio/vs1053.c index 296c26211cf1c..5dcf1c3e5e9f2 100644 --- a/drivers/audio/vs1053.c +++ b/drivers/audio/vs1053.c @@ -45,6 +45,7 @@ #include #include +#include #include #include #include @@ -1486,7 +1487,8 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower) /* Create a message queue for the worker thread */ - snprintf(dev->mqname, sizeof(dev->mqname), "/tmp/%X", dev); + snprintf(dev->mqname, sizeof(dev->mqname), "/tmp/%" PRIXPTR, + (uintptr_t)dev); attr.mq_maxmsg = 16; attr.mq_msgsize = sizeof(struct audio_msg_s); attr.mq_curmsgs = 0; From 2b7ad08c1d69eeb1c5db09669b2362b3a67cf523 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 19:29:05 +0900 Subject: [PATCH 79/90] drivers/audio/cs4344.c: Fix a printf format warning --- drivers/audio/cs4344.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/audio/cs4344.c b/drivers/audio/cs4344.c index 907ef4c7c18bf..928a573bb3b16 100644 --- a/drivers/audio/cs4344.c +++ b/drivers/audio/cs4344.c @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -777,7 +778,8 @@ static int cs4344_start(FAR struct audio_lowerhalf_s *dev) /* Create a message queue for the worker thread */ - snprintf(priv->mqname, sizeof(priv->mqname), "/tmp/%X", priv); + snprintf(priv->mqname, sizeof(priv->mqname), "/tmp/%" PRIXPTR, + (uintptr_t)priv); attr.mq_maxmsg = 16; attr.mq_msgsize = sizeof(struct audio_msg_s); From 29a0f9c423071f0105cc3fbb57cf21602c09569f Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 19:37:51 +0900 Subject: [PATCH 80/90] drivers/audio/wm8776.c: Fix a printf format warning --- drivers/audio/wm8776.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/audio/wm8776.c b/drivers/audio/wm8776.c index dc35179f42a1d..8794965710cf3 100644 --- a/drivers/audio/wm8776.c +++ b/drivers/audio/wm8776.c @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -747,7 +748,8 @@ static int wm8776_start(FAR struct audio_lowerhalf_s *dev) /* Create a message queue for the worker thread */ - snprintf(priv->mqname, sizeof(priv->mqname), "/tmp/%X", priv); + snprintf(priv->mqname, sizeof(priv->mqname), "/tmp/%" PRIXPTR, + (uintptr_t)priv); attr.mq_maxmsg = 16; attr.mq_msgsize = sizeof(struct audio_msg_s); From a0e054b2341f8958805fbec386bb8a17eefe21bd Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 19:39:34 +0900 Subject: [PATCH 81/90] arch/arm/src/lc823450/lc823450_procfs_dvfs.c: Fix printf format warnings --- arch/arm/src/lc823450/lc823450_procfs_dvfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/src/lc823450/lc823450_procfs_dvfs.c b/arch/arm/src/lc823450/lc823450_procfs_dvfs.c index b379b1bca68a9..bd3e5973c9b36 100644 --- a/arch/arm/src/lc823450/lc823450_procfs_dvfs.c +++ b/arch/arm/src/lc823450/lc823450_procfs_dvfs.c @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -234,7 +235,7 @@ static ssize_t dvfs_read(FAR struct file *filep, FAR char *buffer, linesize = snprintf(priv->line, DVFS_LINELEN, - "fstat %d %d %d \n", + "fstat %" PRId32 " %" PRId32 " %" PRId32 " \n", g_dvfs_freq_stat[0], g_dvfs_freq_stat[1], g_dvfs_freq_stat[2]); From d8608001fb1a5736337587cfb4e65b03d4e1749c Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 19:40:33 +0900 Subject: [PATCH 82/90] arch/arm/src/lc823450/lc823450_mtd.c: Fix a printf format warning --- arch/arm/src/lc823450/lc823450_mtd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/src/lc823450/lc823450_mtd.c b/arch/arm/src/lc823450/lc823450_mtd.c index e78bbb2bfd4d2..7ef0d0e715636 100644 --- a/arch/arm/src/lc823450/lc823450_mtd.c +++ b/arch/arm/src/lc823450/lc823450_mtd.c @@ -26,6 +26,7 @@ #include +#include #include #include #include @@ -788,7 +789,7 @@ int lc823450_mtd_uninitialize(uint32_t devno) return -ENODEV; } - snprintf(devname, 16, "/dev/mtdblock%d", devno); + snprintf(devname, 16, "/dev/mtdblock%" PRId32, devno); #ifdef CONFIG_MTD_REGISTRATION mtd_unregister(g_mtdmaster[ch]); From dec37ee7dc321ae1495089b7fb3715d8040b3434 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 20:11:30 +0900 Subject: [PATCH 83/90] arch/arm/src/max326xx/max32660/max32660_serial.c: Fix a printf format warning --- arch/arm/src/max326xx/max32660/max32660_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/max326xx/max32660/max32660_serial.c b/arch/arm/src/max326xx/max32660/max32660_serial.c index eb8a027852620..20cadea29e614 100644 --- a/arch/arm/src/max326xx/max32660/max32660_serial.c +++ b/arch/arm/src/max326xx/max32660/max32660_serial.c @@ -158,7 +158,7 @@ static int max326_attach(struct uart_dev_s *dev); static void max326_detach(struct uart_dev_s *dev); static int max326_interrupt(int irq, void *context, void *arg); static int max326_ioctl(struct file *filep, int cmd, unsigned long arg); -static int max326_receive(struct uart_dev_s *dev, uint32_t *status); +static int max326_receive(struct uart_dev_s *dev, unsigned int *status); static void max326_rxint(struct uart_dev_s *dev, bool enable); static bool max326_rxavailable(struct uart_dev_s *dev); static void max326_send(struct uart_dev_s *dev, int ch); @@ -631,7 +631,7 @@ static int max326_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int max326_receive(struct uart_dev_s *dev, uint32_t *status) +static int max326_receive(struct uart_dev_s *dev, unsigned int *status) { struct max326_dev_s *priv = (struct max326_dev_s *)dev->priv; From b07d3bb675bdde961afb9a57832b4ed8fb4c4cf8 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 20:15:37 +0900 Subject: [PATCH 84/90] arch/arm/src/samd2l2/sam_usb.c: Fix type mismatches --- arch/arm/src/samd2l2/sam_usb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/src/samd2l2/sam_usb.c b/arch/arm/src/samd2l2/sam_usb.c index 1a8b6a54e5fe6..ce709bf2c43f2 100644 --- a/arch/arm/src/samd2l2/sam_usb.c +++ b/arch/arm/src/samd2l2/sam_usb.c @@ -783,7 +783,7 @@ static void sam_putreg32(uint32_t regval, uintptr_t regaddr) putreg32(regval, regaddr); } #else -static inline void sam_putreg32(uint32_t regval, uint32_t regaddr) +static inline void sam_putreg32(uint32_t regval, uintptr_t regaddr) { putreg32(regval, regaddr); } @@ -836,7 +836,7 @@ static void sam_putreg16(uint16_t regval, uintptr_t regaddr) putreg16(regval, regaddr); } #else -static inline void sam_putreg16(uint16_t regval, uint32_t regaddr) +static inline void sam_putreg16(uint16_t regval, uintptr_t regaddr) { putreg16(regval, regaddr); } @@ -889,7 +889,7 @@ static void sam_putreg8(uint8_t regval, uintptr_t regaddr) putreg8(regval, regaddr); } #else -static inline void sam_putreg8(uint8_t regval, uint32_t regaddr) +static inline void sam_putreg8(uint8_t regval, uintptr_t regaddr) { putreg8(regval, regaddr); } From d19118950045f0c4b9aec085eae8f86d8030cd13 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 20:17:21 +0900 Subject: [PATCH 85/90] arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c: Fix a type mismatch --- arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c index 0bf2840180e70..a866663d101e8 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c @@ -382,7 +382,7 @@ static int lpc17_40_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, static int lpc17_40_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, size_t nbytes); static int lpc17_40_sendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, uint32_t nbytes); + FAR const uint8_t *buffer, size_t nbytes); static int lpc17_40_cancel(FAR struct sdio_dev_s *dev); static int lpc17_40_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd); From 34fc02f397711fd0ecdb139fc029c60d35052999 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 20:45:41 +0900 Subject: [PATCH 86/90] arch/arm/src/eoss3/eoss3_serial.c: Fix a type mismatch --- arch/arm/src/eoss3/eoss3_serial.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/src/eoss3/eoss3_serial.c b/arch/arm/src/eoss3/eoss3_serial.c index b38bdcec1a7ab..ad14b0d8ac076 100644 --- a/arch/arm/src/eoss3/eoss3_serial.c +++ b/arch/arm/src/eoss3/eoss3_serial.c @@ -80,7 +80,7 @@ static int eoss3_attach(struct uart_dev_s *dev); static void eoss3_detach(struct uart_dev_s *dev); static int eoss3_interrupt(int irq, void *context, FAR void *arg); static int eoss3_ioctl(struct file *filep, int cmd, unsigned long arg); -static int eoss3_receive(struct uart_dev_s *dev, uint32_t *status); +static int eoss3_receive(struct uart_dev_s *dev, unsigned int *status); static void eoss3_rxint(struct uart_dev_s *dev, bool enable); static bool eoss3_rxavailable(struct uart_dev_s *dev); static void eoss3_send(struct uart_dev_s *dev, int ch); @@ -414,7 +414,7 @@ static int eoss3_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int eoss3_receive(struct uart_dev_s *dev, uint32_t *status) +static int eoss3_receive(struct uart_dev_s *dev, unsigned int *status) { *status = getreg32(EOSS3_UART_RSR_ECR); return (getreg32(EOSS3_UART_DR) & UART_DR_DATA_MASK); @@ -633,4 +633,4 @@ int up_putc(int ch) return ch; } -#endif /* USE_SERIALDRIVER */ \ No newline at end of file +#endif /* USE_SERIALDRIVER */ From 97bb462a0269bd09c1f67a94233c3fd62f44fa53 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Nov 2020 20:53:53 +0900 Subject: [PATCH 87/90] arch/arm/src/nrf52/nrf52_serial.c: Fix a type mismatch --- arch/arm/src/nrf52/nrf52_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/nrf52/nrf52_serial.c b/arch/arm/src/nrf52/nrf52_serial.c index c26234a000a3e..b1c17f25cbf19 100644 --- a/arch/arm/src/nrf52/nrf52_serial.c +++ b/arch/arm/src/nrf52/nrf52_serial.c @@ -136,7 +136,7 @@ static int nrf52_attach(struct uart_dev_s *dev); static void nrf52_detach(struct uart_dev_s *dev); static int nrf52_interrupt(int irq, void *context, FAR void *arg); static int nrf52_ioctl(struct file *filep, int cmd, unsigned long arg); -static int nrf52_receive(struct uart_dev_s *dev, uint32_t *status); +static int nrf52_receive(struct uart_dev_s *dev, unsigned int *status); static void nrf52_rxint(struct uart_dev_s *dev, bool enable); static bool nrf52_rxavailable(struct uart_dev_s *dev); static void nrf52_send(struct uart_dev_s *dev, int ch); @@ -576,7 +576,7 @@ static int nrf52_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int nrf52_receive(struct uart_dev_s *dev, uint32_t *status) +static int nrf52_receive(struct uart_dev_s *dev, unsigned int *status) { struct nrf52_dev_s *priv = (struct nrf52_dev_s *)dev->priv; uint32_t data; From 7146f715ec6aee410c968c6d063cbdece1a436a3 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Sat, 14 Nov 2020 08:40:54 +0900 Subject: [PATCH 88/90] arch/arm/src/xmc4/xmc4_serial.c: Fix a type mismatch --- arch/arm/src/xmc4/xmc4_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/xmc4/xmc4_serial.c b/arch/arm/src/xmc4/xmc4_serial.c index 85d59ce369aa1..7aa3b4cd93fe7 100644 --- a/arch/arm/src/xmc4/xmc4_serial.c +++ b/arch/arm/src/xmc4/xmc4_serial.c @@ -263,7 +263,7 @@ static int xmc4_attach(struct uart_dev_s *dev); static void xmc4_detach(struct uart_dev_s *dev); static int xmc4_interrupt(int irq, void *context, FAR void *arg); static int xmc4_ioctl(struct file *filep, int cmd, unsigned long arg); -static int xmc4_receive(struct uart_dev_s *dev, uint32_t *status); +static int xmc4_receive(struct uart_dev_s *dev, unsigned int *status); static void xmc4_rxint(struct uart_dev_s *dev, bool enable); static bool xmc4_rxavailable(struct uart_dev_s *dev); static void xmc4_send(struct uart_dev_s *dev, int ch); @@ -851,7 +851,7 @@ static int xmc4_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int xmc4_receive(struct uart_dev_s *dev, uint32_t *status) +static int xmc4_receive(struct uart_dev_s *dev, unsigned int *status) { struct xmc4_dev_s *priv = (struct xmc4_dev_s *)dev->priv; uint32_t outr; From 2b6254661b4a309cae3242228b8aa758cfb665dc Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Sat, 14 Nov 2020 08:45:31 +0900 Subject: [PATCH 89/90] drivers/modem/altair/altmdm_spi.c: Fix type mismatches --- drivers/modem/altair/altmdm_spi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/modem/altair/altmdm_spi.c b/drivers/modem/altair/altmdm_spi.c index 10738c38755a8..d2bccd6bad94f 100644 --- a/drivers/modem/altair/altmdm_spi.c +++ b/drivers/modem/altair/altmdm_spi.c @@ -719,8 +719,8 @@ static void show_txheader(FAR struct altmdm_dev_s *priv) ****************************************************************************/ static void parse_rxheader(FAR struct altmdm_dev_s *priv, - FAR int *total_size, FAR int *actual_size, - FAR int *is_reset, FAR int *is_bufful) + FAR int32_t *total_size, FAR int32_t *actual_size, + FAR int *is_reset, FAR int32_t *is_bufful) { FAR struct altmdm_spi_xferhdr_s *rx_header = &priv->spidev.rx_param.header; @@ -1286,9 +1286,9 @@ static int do_xfersleep(FAR struct altmdm_dev_s *priv, uint32_t is_rcvrready) int ret; int resp = 0; int is_reset = 0; - int total_size; - int actual_size; - int is_bufful; + int32_t total_size; + int32_t actual_size; + int32_t is_bufful; /* Transfer header for sleep request */ From cf2dbaefd82abad8080f442b6ef38a65e233b81e Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Sat, 14 Nov 2020 08:56:06 +0900 Subject: [PATCH 90/90] boards/arm/nrf52/nrf52840-dk/src/nrf52_highpri.c: Fix a printf format warning --- boards/arm/nrf52/nrf52840-dk/src/nrf52_highpri.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52_highpri.c b/boards/arm/nrf52/nrf52840-dk/src/nrf52_highpri.c index 5420939498e39..391e8769dd63d 100644 --- a/boards/arm/nrf52/nrf52840-dk/src/nrf52_highpri.c +++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52_highpri.c @@ -24,6 +24,7 @@ #include +#include #include #include #include @@ -265,7 +266,7 @@ int highpri_main(int argc, char *argv[]) /* Then print out what is happening */ - printf("Elapsed time: %d seconds\n\n", seconds); + printf("Elapsed time: %" PRId32 " seconds\n\n", seconds); for (i = 0, total = 0; i < 16; i++) { total += basepri[i];