From afe90db5c482fb494fd44522e10a2a990324f5a7 Mon Sep 17 00:00:00 2001 From: Neo Xu Date: Mon, 20 Jan 2025 16:40:55 +0800 Subject: [PATCH] gdbstub: change send buffer to const char Signed-off-by: Neo Xu --- drivers/serial/serial_gdbstub.c | 5 +++-- include/nuttx/gdbstub.h | 2 +- libs/libc/gdbstub/lib_gdbstub.c | 12 ++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/serial/serial_gdbstub.c b/drivers/serial/serial_gdbstub.c index 8e54d2a032b..1c44579b87f 100644 --- a/drivers/serial/serial_gdbstub.c +++ b/drivers/serial/serial_gdbstub.c @@ -253,7 +253,8 @@ static ssize_t uart_gdbstub_receive(FAR void *priv, FAR void *buf, * ****************************************************************************/ -static ssize_t uart_gdbstub_send(FAR void *priv, FAR void *buf, size_t len) +static ssize_t uart_gdbstub_send(FAR void *priv, FAR const char *buf, + size_t len) { FAR struct uart_gdbstub_s *uart_gdbstub = priv; FAR uart_dev_t *dev = uart_gdbstub->dev; @@ -269,7 +270,7 @@ static ssize_t uart_gdbstub_send(FAR void *priv, FAR void *buf, size_t len) } else { - uart_gdbstub->org_ops->send(dev, ((FAR char *)buf)[i++]); + uart_gdbstub->org_ops->send(dev, buf[i++]); } } } diff --git a/include/nuttx/gdbstub.h b/include/nuttx/gdbstub.h index 83f40adff5d..aefa35baa17 100644 --- a/include/nuttx/gdbstub.h +++ b/include/nuttx/gdbstub.h @@ -47,7 +47,7 @@ ****************************************************************************/ struct gdb_state_s; -typedef CODE ssize_t (*gdb_send_func_t)(FAR void *priv, FAR void *buf, +typedef CODE ssize_t (*gdb_send_func_t)(FAR void *priv, FAR const char *buf, size_t len); typedef CODE ssize_t (*gdb_recv_func_t)(FAR void *priv, FAR void *buf, size_t len); diff --git a/libs/libc/gdbstub/lib_gdbstub.c b/libs/libc/gdbstub/lib_gdbstub.c index 2da89228e3f..ad276a38060 100644 --- a/libs/libc/gdbstub/lib_gdbstub.c +++ b/libs/libc/gdbstub/lib_gdbstub.c @@ -269,7 +269,7 @@ static int gdb_expect_addr_lenth(FAR struct gdb_state_s *state, static int gdb_putchar(FAR struct gdb_state_s *state, int ch) { - unsigned char tmp = ch & 0xff; + char tmp = ch & 0xff; ssize_t ret; ret = state->send(state->priv, &tmp, 1); @@ -328,8 +328,8 @@ static int gdb_getchar(FAR struct gdb_state_s *state) static int gdb_send_packet(FAR struct gdb_state_s *state) { - unsigned char buf[3]; - unsigned char csum; + char buf[3]; + char csum; int ret; ret = gdb_putchar(state, '$'); /* Send packet start */ @@ -406,8 +406,8 @@ static int gdb_send_packet(FAR struct gdb_state_s *state) static int gdb_recv_packet(FAR struct gdb_state_s *state) { - unsigned char buf[2]; - unsigned char csum; + char buf[2]; + char csum; int ret; /* Wait for packet start */ @@ -525,7 +525,7 @@ static int gdb_recv_packet(FAR struct gdb_state_s *state) static int gdb_checksum(FAR const char *buf, size_t len) { - unsigned char csum = 0; + char csum = 0; while (len--) {