command_handler: change 'cmd_ctx' to CMD_CTX

[fw/openocd] / src / server / gdb_server.c

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 55ec7d4e1be3b2c8febf9ca5eaa81e4b7dbf883f..9605f81abef45ef443ff839323da92b14aa883fb 100644 (file)
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -1004,14 +1004,10 @@ int gdb_set_registers_packet(struct connection *connection, struct target *targe
                        LOG_ERROR("BUG: register packet is too small for registers");
                }
 
-               struct reg_arch_type *arch_type;
                bin_buf = malloc(DIV_ROUND_UP(reg_list[i]->size, 8));
                gdb_target_to_reg(target, packet_p, chars, bin_buf);
 
-               /* get register arch_type, and call set method */
-               arch_type = register_get_arch_type(reg_list[i]->arch_type);
-
-               arch_type->set(reg_list[i], bin_buf);
+               reg_list[i]->type->set(reg_list[i], bin_buf);
 
                /* advance packet pointer */
                packet_p += chars;
@@ -1071,7 +1067,6 @@ int gdb_set_register_packet(struct connection *connection, struct target *target
        struct reg **reg_list;
        int reg_list_size;
        int retval;
-       struct reg_arch_type *arch_type;
 
        LOG_DEBUG("-");
 
@@ -1100,9 +1095,7 @@ int gdb_set_register_packet(struct connection *connection, struct target *target
 
        gdb_target_to_reg(target, separator + 1, chars, bin_buf);
 
-               /* get register arch_type, and call set method */
-       arch_type = register_get_arch_type(reg_list[reg_num]->arch_type);
-       arch_type->set(reg_list[reg_num], bin_buf);
+       reg_list[reg_num]->type->set(reg_list[reg_num], bin_buf);
 
        gdb_put_packet(connection, "OK", 2);
 
@@ -2252,14 +2245,14 @@ int gdb_init(void)
 
 COMMAND_HANDLER(handle_gdb_sync_command)
 {
-       if (argc != 0)
+       if (CMD_ARGC != 0)
        {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        if (current_gdb_connection == NULL)
        {
-               command_print(cmd_ctx,
+               command_print(CMD_CTX,
                                "gdb_sync command can only be run from within gdb using \"monitor gdb_sync\"");
                return ERROR_FAIL;
        }
@@ -2277,20 +2270,20 @@ COMMAND_HANDLER(handle_gdb_port_command)
 
 COMMAND_HANDLER(handle_gdb_memory_map_command)
 {
-       if (argc == 1)
+       if (CMD_ARGC == 1)
        {
-               if (strcmp(args[0], "enable") == 0)
+               if (strcmp(CMD_ARGV[0], "enable") == 0)
                {
                        gdb_use_memory_map = 1;
                        return ERROR_OK;
                }
-               else if (strcmp(args[0], "disable") == 0)
+               else if (strcmp(CMD_ARGV[0], "disable") == 0)
                {
                        gdb_use_memory_map = 0;
                        return ERROR_OK;
                }
                else
-                       LOG_WARNING("invalid gdb_memory_map configuration directive %s", args[0]);
+                       LOG_WARNING("invalid gdb_memory_map configuration directive %s", CMD_ARGV[0]);
        }
 
        return ERROR_COMMAND_SYNTAX_ERROR;
@@ -2298,20 +2291,20 @@ COMMAND_HANDLER(handle_gdb_memory_map_command)
 
 COMMAND_HANDLER(handle_gdb_flash_program_command)
 {
-       if (argc == 1)
+       if (CMD_ARGC == 1)
        {
-               if (strcmp(args[0], "enable") == 0)
+               if (strcmp(CMD_ARGV[0], "enable") == 0)
                {
                        gdb_flash_program = 1;
                        return ERROR_OK;
                }
-               else if (strcmp(args[0], "disable") == 0)
+               else if (strcmp(CMD_ARGV[0], "disable") == 0)
                {
                        gdb_flash_program = 0;
                        return ERROR_OK;
                }
                else
-                       LOG_WARNING("invalid gdb_flash_program configuration directive: %s", args[0]);
+                       LOG_WARNING("invalid gdb_flash_program configuration directive: %s", CMD_ARGV[0]);
        }
 
        return ERROR_COMMAND_SYNTAX_ERROR;
@@ -2319,20 +2312,20 @@ COMMAND_HANDLER(handle_gdb_flash_program_command)
 
 COMMAND_HANDLER(handle_gdb_report_data_abort_command)
 {
-       if (argc == 1)
+       if (CMD_ARGC == 1)
        {
-               if (strcmp(args[0], "enable") == 0)
+               if (strcmp(CMD_ARGV[0], "enable") == 0)
                {
                        gdb_report_data_abort = 1;
                        return ERROR_OK;
                }
-               else if (strcmp(args[0], "disable") == 0)
+               else if (strcmp(CMD_ARGV[0], "disable") == 0)
                {
                        gdb_report_data_abort = 0;
                        return ERROR_OK;
                }
                else
-                       LOG_WARNING("invalid gdb_report_data_abort configuration directive: %s", args[0]);
+                       LOG_WARNING("invalid gdb_report_data_abort configuration directive: %s", CMD_ARGV[0]);
        }
 
        return ERROR_COMMAND_SYNTAX_ERROR;
@@ -2341,19 +2334,19 @@ COMMAND_HANDLER(handle_gdb_report_data_abort_command)
 /* gdb_breakpoint_override */
 COMMAND_HANDLER(handle_gdb_breakpoint_override_command)
 {
-       if (argc == 0)
+       if (CMD_ARGC == 0)
        {
 
-       } else if (argc == 1)
+       } else if (CMD_ARGC == 1)
        {
                gdb_breakpoint_override = 1;
-               if (strcmp(args[0], "hard") == 0)
+               if (strcmp(CMD_ARGV[0], "hard") == 0)
                {
                        gdb_breakpoint_override_type = BKPT_HARD;
-               } else if (strcmp(args[0], "soft") == 0)
+               } else if (strcmp(CMD_ARGV[0], "soft") == 0)
                {
                        gdb_breakpoint_override_type = BKPT_SOFT;
-               } else if (strcmp(args[0], "disable") == 0)
+               } else if (strcmp(CMD_ARGV[0], "disable") == 0)
                {
                        gdb_breakpoint_override = 0;
                }