mirror of
https://github.com/openocd-org/openocd.git
synced 2025-10-14 02:58:23 +08:00
server: gdb_server: use a macro for CTRL-C value
The numeric value '3' for the ASCII character CTRL-C is not immediately readable, even if the lines that follow explicitly mention CTRL-C. Use the same macro present in `telnet_server.c` to replace the numeric value. Change-Id: Iaf4296b1f0e384f8122d8a4875cad17e8ddaf66a Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com> Reviewed-on: https://review.openocd.org/c/openocd/+/8922 Reviewed-by: Tomas Vanek <vanekt@fbl.cz> Tested-by: jenkins
This commit is contained in:
@@ -50,6 +50,8 @@
|
||||
* found in most modern embedded processors.
|
||||
*/
|
||||
|
||||
#define CTRL(c) ((c) - '@')
|
||||
|
||||
enum gdb_output_flag {
|
||||
/* GDB doesn't accept 'O' packets */
|
||||
GDB_OUTPUT_NO,
|
||||
@@ -434,7 +436,7 @@ static int gdb_put_packet_inner(struct connection *connection,
|
||||
gdb_putback_char(connection, reply);
|
||||
LOG_DEBUG("Unexpected start of new packet");
|
||||
break;
|
||||
} else if (reply == 0x3) {
|
||||
} else if (reply == CTRL('C')) {
|
||||
/* do not discard Ctrl-C */
|
||||
gdb_putback_char(connection, reply);
|
||||
break;
|
||||
@@ -486,7 +488,7 @@ static int gdb_put_packet_inner(struct connection *connection,
|
||||
gdb_con->output_flag = GDB_OUTPUT_NO;
|
||||
gdb_log_incoming_packet(connection, "-");
|
||||
LOG_WARNING("negative reply, retrying");
|
||||
} else if (reply == 0x3) {
|
||||
} else if (reply == CTRL('C')) {
|
||||
gdb_con->ctrl_c = true;
|
||||
gdb_log_incoming_packet(connection, "<Ctrl-C>");
|
||||
retval = gdb_get_char(connection, &reply);
|
||||
@@ -696,7 +698,7 @@ static int gdb_get_packet_inner(struct connection *connection,
|
||||
gdb_log_incoming_packet(connection, "-");
|
||||
LOG_WARNING("negative acknowledgment, but no packet pending");
|
||||
break;
|
||||
case 0x3:
|
||||
case CTRL('C'):
|
||||
gdb_log_incoming_packet(connection, "<Ctrl-C>");
|
||||
gdb_con->ctrl_c = true;
|
||||
*len = 0;
|
||||
|
Reference in New Issue
Block a user