use COMMAND_REGISTER macro

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

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 9581ea63aa35e45abba3ca245c52850971374ccd..be1f8dbc7805ea8ed877f2e3f6a8a7a96379f66a 100644 (file)
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -2245,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;
        }
@@ -2270,63 +2270,24 @@ COMMAND_HANDLER(handle_gdb_port_command)
 
 COMMAND_HANDLER(handle_gdb_memory_map_command)
 {
-       if (argc == 1)
-       {
-               if (strcmp(args[0], "enable") == 0)
-               {
-                       gdb_use_memory_map = 1;
-                       return ERROR_OK;
-               }
-               else if (strcmp(args[0], "disable") == 0)
-               {
-                       gdb_use_memory_map = 0;
-                       return ERROR_OK;
-               }
-               else
-                       LOG_WARNING("invalid gdb_memory_map configuration directive %s", args[0]);
-       }
+       if (CMD_ARGC == 1)
+               COMMAND_PARSE_ENABLE(CMD_ARGV[0], gdb_use_memory_map);
 
        return ERROR_COMMAND_SYNTAX_ERROR;
 }
 
 COMMAND_HANDLER(handle_gdb_flash_program_command)
 {
-       if (argc == 1)
-       {
-               if (strcmp(args[0], "enable") == 0)
-               {
-                       gdb_flash_program = 1;
-                       return ERROR_OK;
-               }
-               else if (strcmp(args[0], "disable") == 0)
-               {
-                       gdb_flash_program = 0;
-                       return ERROR_OK;
-               }
-               else
-                       LOG_WARNING("invalid gdb_flash_program configuration directive: %s", args[0]);
-       }
+       if (CMD_ARGC == 1)
+               COMMAND_PARSE_ENABLE(CMD_ARGV[0], gdb_flash_program);
 
        return ERROR_COMMAND_SYNTAX_ERROR;
 }
 
 COMMAND_HANDLER(handle_gdb_report_data_abort_command)
 {
-       if (argc == 1)
-       {
-               if (strcmp(args[0], "enable") == 0)
-               {
-                       gdb_report_data_abort = 1;
-                       return ERROR_OK;
-               }
-               else if (strcmp(args[0], "disable") == 0)
-               {
-                       gdb_report_data_abort = 0;
-                       return ERROR_OK;
-               }
-               else
-                       LOG_WARNING("invalid gdb_report_data_abort configuration directive: %s", args[0]);
-       }
+       if (CMD_ARGC == 1)
+               COMMAND_PARSE_ENABLE(CMD_ARGV[0], gdb_report_data_abort);
 
        return ERROR_COMMAND_SYNTAX_ERROR;
 }
@@ -2334,19 +2295,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;
                }
@@ -2367,23 +2328,23 @@ COMMAND_HANDLER(handle_gdb_breakpoint_override_command)
 
 int gdb_register_commands(struct command_context *command_context)
 {
-       register_command(command_context, NULL, "gdb_sync",
+       COMMAND_REGISTER(command_context, NULL, "gdb_sync",
                        handle_gdb_sync_command, COMMAND_ANY,
                        "next stepi will return immediately allowing GDB to "
                        "fetch register state without affecting target state");
-       register_command(command_context, NULL, "gdb_port",
+       COMMAND_REGISTER(command_context, NULL, "gdb_port",
                        handle_gdb_port_command, COMMAND_ANY,
                        "daemon configuration command gdb_port");
-       register_command(command_context, NULL, "gdb_memory_map",
+       COMMAND_REGISTER(command_context, NULL, "gdb_memory_map",
                        handle_gdb_memory_map_command, COMMAND_CONFIG,
                        "enable or disable memory map");
-       register_command(command_context, NULL, "gdb_flash_program",
+       COMMAND_REGISTER(command_context, NULL, "gdb_flash_program",
                        handle_gdb_flash_program_command, COMMAND_CONFIG,
                        "enable or disable flash program");
-       register_command(command_context, NULL, "gdb_report_data_abort",
+       COMMAND_REGISTER(command_context, NULL, "gdb_report_data_abort",
                        handle_gdb_report_data_abort_command, COMMAND_CONFIG,
                        "enable or disable reporting data aborts");
-       register_command(command_context, NULL, "gdb_breakpoint_override",
+       COMMAND_REGISTER(command_context, NULL, "gdb_breakpoint_override",
                        handle_gdb_breakpoint_override_command, COMMAND_EXEC,
                        "hard/soft/disable - force type of breakpoint "
                        "used by gdb 'break' commands.");