michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: modem: Fix build errors on 64-bit platforms

Browse source 
If the modem drivers are built on a 64-bit platform we get errors with
the logging code due to use of size_t.  Update to use %zX to handle this
correctly between 32-bit and 64-bit platforms.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2021-05-07 14:59:17 -05:00 • committed by Kumar Gala
commit 27e33e25c9
5 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

20
drivers/modem/hl7800.c
View file

@ -1077,7 +1077,7 @@ static int send_data(struct hl7800_socket *sock, struct net_pkt *pkt)
/* start sending data */ /* start sending data */
k_sem_reset(&sock->sock_send_sem); k_sem_reset(&sock->sock_send_sem);
if (sock->type == SOCK_STREAM) { if (sock->type == SOCK_STREAM) {
snprintk(buf, sizeof(buf), "AT+KTCPSND=%d,%u", sock->socket_id, snprintk(buf, sizeof(buf), "AT+KTCPSND=%d,%zu", sock->socket_id,
send_len); send_len);
} else { } else {
if (!net_addr_ntop(sock->family, &net_sin(&sock->dst)->sin_addr, if (!net_addr_ntop(sock->family, &net_sin(&sock->dst)->sin_addr,
@ -1085,7 +1085,7 @@ static int send_data(struct hl7800_socket *sock, struct net_pkt *pkt)
LOG_ERR("Invalid dst addr"); LOG_ERR("Invalid dst addr");
return -EINVAL; return -EINVAL;
} }
snprintk(buf, sizeof(buf), "AT+KUDPSND=%d,\"%s\",%u,%u", snprintk(buf, sizeof(buf), "AT+KUDPSND=%d,\"%s\",%u,%zu",
sock->socket_id, dst_addr, sock->socket_id, dst_addr,
net_sin(&sock->dst)->sin_port, send_len); net_sin(&sock->dst)->sin_port, send_len);
} }
@ -1111,10 +1111,10 @@ static int send_data(struct hl7800_socket *sock, struct net_pkt *pkt)
frag = frag->frags; frag = frag->frags;
} }
if (actual_send_len != send_len) { if (actual_send_len != send_len) {
LOG_WRN("AT+K**PSND act: %d exp: %d", actual_send_len, LOG_WRN("AT+K**PSND act: %zd exp: %zd", actual_send_len,
send_len); send_len);
} }
LOG_DBG("Sent %u bytes", actual_send_len); LOG_DBG("Sent %zu bytes", actual_send_len);
/* Send EOF pattern to terminate data */ /* Send EOF pattern to terminate data */
k_sem_reset(&sock->sock_send_sem); k_sem_reset(&sock->sock_send_sem);
@ -2813,7 +2813,7 @@ static void sock_read(struct net_buf **buf, uint16_t len)
wait_for_modem_data(buf, 0, sock->rx_size); wait_for_modem_data(buf, 0, sock->rx_size);
} }
LOG_DBG("Processing RX, buf len: %d", net_buf_frags_len(*buf)); LOG_DBG("Processing RX, buf len: %zd", net_buf_frags_len(*buf));
/* allocate an RX pkt */ /* allocate an RX pkt */
sock->recv_pkt = net_pkt_rx_alloc_with_buffer( sock->recv_pkt = net_pkt_rx_alloc_with_buffer(
@ -2852,7 +2852,7 @@ static void sock_read(struct net_buf **buf, uint16_t len)
} }
} }
LOG_DBG("Got all data, get EOF and OK (buf len:%d)", LOG_DBG("Got all data, get EOF and OK (buf len:%zd)",
net_buf_frags_len(*buf)); net_buf_frags_len(*buf));
if (!*buf || (net_buf_frags_len(*buf) < strlen(EOF_PATTERN))) { if (!*buf || (net_buf_frags_len(*buf) < strlen(EOF_PATTERN))) {
@ -3161,7 +3161,7 @@ static size_t hl7800_read_rx(struct net_buf **buf)
BUF_ALLOC_TIMEOUT, BUF_ALLOC_TIMEOUT,
read_rx_allocator, &mdm_recv_pool); read_rx_allocator, &mdm_recv_pool);
if (rx_len < bytes_read) { if (rx_len < bytes_read) {
LOG_ERR("Data was lost! read %u of %u!", rx_len, LOG_ERR("Data was lost! read %u of %zu!", rx_len,
bytes_read); bytes_read);
} }
total_read += bytes_read; total_read += bytes_read;
@ -4650,7 +4650,7 @@ int32_t mdm_hl7800_update_fw(char *file_path)
/* get file info */ /* get file info */
ret = fs_stat(file_path, &file_info); ret = fs_stat(file_path, &file_info);
if (ret >= 0) { if (ret >= 0) {
LOG_DBG("file '%s' size %u", log_strdup(file_info.name), LOG_DBG("file '%s' size %zu", log_strdup(file_info.name),
file_info.size); file_info.size);
} else { } else {
LOG_ERR("Failed to get file [%s] info: %d", LOG_ERR("Failed to get file [%s] info: %d",
@ -4678,10 +4678,10 @@ int32_t mdm_hl7800_update_fw(char *file_path)
} }
/* start firmware update process */ /* start firmware update process */
LOG_INF("Initiate FW update, total packets: %d", LOG_INF("Initiate FW update, total packets: %zd",
((file_info.size / XMODEM_DATA_SIZE) + 1)); ((file_info.size / XMODEM_DATA_SIZE) + 1));
set_fota_state(HL7800_FOTA_START); set_fota_state(HL7800_FOTA_START);
snprintk(cmd1, sizeof(cmd1), "AT+WDSD=%d", file_info.size); snprintk(cmd1, sizeof(cmd1), "AT+WDSD=%zd", file_info.size);
send_at_cmd(NULL, cmd1, K_NO_WAIT, 0, false); send_at_cmd(NULL, cmd1, K_NO_WAIT, 0, false);
goto done; goto done;

4
drivers/modem/modem_cmd_handler.c
View file

@ -354,7 +354,7 @@ static void cmd_handler_process_rx_buf(struct modem_cmd_handler_data *data)
data->rx_buf, 0, len); data->rx_buf, 0, len);
if ((data->match_buf_len - 1) < match_len) { if ((data->match_buf_len - 1) < match_len) {
LOG_ERR("Match buffer size (%zu) is too small for " LOG_ERR("Match buffer size (%zu) is too small for "
"incoming command size: %u! Truncating!", "incoming command size: %zu! Truncating!",
data->match_buf_len - 1, match_len); data->match_buf_len - 1, match_len);
} }
@ -366,7 +366,7 @@ static void cmd_handler_process_rx_buf(struct modem_cmd_handler_data *data)
cmd = find_cmd_match(data); cmd = find_cmd_match(data);
if (cmd) { if (cmd) {
LOG_DBG("match cmd [%s] (len:%u)", LOG_DBG("match cmd [%s] (len:%zu)",
log_strdup(cmd->cmd), match_len); log_strdup(cmd->cmd), match_len);
if (process_cmd(cmd, match_len, data) == -EAGAIN) { if (process_cmd(cmd, match_len, data) == -EAGAIN) {

4
drivers/modem/quectel-bg9x.c
View file

@ -584,7 +584,7 @@ static ssize_t offload_recvfrom(void *obj, void *buf, size_t len,
return -1; return -1;
} }
snprintk(sendbuf, sizeof(sendbuf), "AT+QIRD=%d,%d", sock->sock_fd, len); snprintk(sendbuf, sizeof(sendbuf), "AT+QIRD=%d,%zd", sock->sock_fd, len);
/* Socket read settings */ /* Socket read settings */
(void) memset(&sock_data, 0, sizeof(sock_data)); (void) memset(&sock_data, 0, sizeof(sock_data));
@ -815,7 +815,7 @@ static ssize_t offload_sendmsg(void *obj, const struct msghdr *msg, int flags)
ssize_t sent = 0; ssize_t sent = 0;
int rc; int rc;
LOG_DBG("msg_iovlen:%d flags:%d", msg->msg_iovlen, flags); LOG_DBG("msg_iovlen:%zd flags:%d", msg->msg_iovlen, flags);
for (int i = 0; i < msg->msg_iovlen; i++) { for (int i = 0; i < msg->msg_iovlen; i++) {
const char *buf = msg->msg_iov[i].iov_base; const char *buf = msg->msg_iov[i].iov_base;

4
drivers/modem/ublox-sara-r4.c
View file

@ -1589,7 +1589,7 @@ static ssize_t offload_recvfrom(void *obj, void *buf, size_t len,
next_packet_size = MDM_MAX_DATA_LENGTH; next_packet_size = MDM_MAX_DATA_LENGTH;
} }
snprintk(sendbuf, sizeof(sendbuf), "AT+USO%s=%d,%d", snprintk(sendbuf, sizeof(sendbuf), "AT+USO%s=%d,%zd",
sock->ip_proto == IPPROTO_UDP ? "RF" : "RD", sock->id, sock->ip_proto == IPPROTO_UDP ? "RF" : "RD", sock->id,
len < next_packet_size ? len : next_packet_size); len < next_packet_size ? len : next_packet_size);
@ -1708,7 +1708,7 @@ static ssize_t offload_sendmsg(void *obj, const struct msghdr *msg, int flags)
full_len += msg->msg_iov[i].iov_len; full_len += msg->msg_iov[i].iov_len;
} }
LOG_DBG("msg_iovlen:%d flags:%d, full_len:%d", LOG_DBG("msg_iovlen:%zd flags:%d, full_len:%zd",
msg->msg_iovlen, flags, full_len); msg->msg_iovlen, flags, full_len);
while (full_len > sent) { while (full_len > sent) {

4
drivers/modem/wncm14a2a.c
View file

@ -390,7 +390,7 @@ static int send_data(struct wncm14a2a_socket *sock, struct net_pkt *pkt)
frag = pkt->frags; frag = pkt->frags;
/* use SOCKWRITE with binary mode formatting */ /* use SOCKWRITE with binary mode formatting */
snprintk(buf, sizeof(buf), "AT@SOCKWRITE=%d,%u,1\r", snprintk(buf, sizeof(buf), "AT@SOCKWRITE=%d,%zu,1\r",
sock->socket_id, net_buf_frags_len(frag)); sock->socket_id, net_buf_frags_len(frag));
mdm_receiver_send(&ictx.mdm_ctx, buf, strlen(buf)); mdm_receiver_send(&ictx.mdm_ctx, buf, strlen(buf));
@ -1091,7 +1091,7 @@ static void wncm14a2a_read_rx(struct net_buf **buf)
read_rx_allocator, read_rx_allocator,
&mdm_recv_pool); &mdm_recv_pool);
if (rx_len < bytes_read) { if (rx_len < bytes_read) {
LOG_ERR("Data was lost! read %u of %u!", LOG_ERR("Data was lost! read %u of %zu!",
rx_len, bytes_read); rx_len, bytes_read);
} }
} }