build: cleanup src/server directory

[openocd.git] / src / target / target_request.c

diff --git a/src/target/target_request.c b/src/target/target_request.c
index c5de691ae9e107e422a0bc648355b5aeeaa49081..090de9fe64f45ba0b37a6af302db63ec739baf39 100644 (file)
--- a/src/target/target_request.c
+++ b/src/target/target_request.c
@@ -27,15 +27,24 @@
 #include "config.h"
 #endif
 
+#include <helper/log.h>
+#include <helper/binarybuffer.h>
+
 #include "target.h"
 #include "target_request.h"
 #include "target_type.h"
-#include "binarybuffer.h"
 #include "trace.h"
-#include "log.h"
 
 
-static struct command *target_request_cmd = NULL;
+static bool got_message = false;
+
+bool target_got_message(void)
+{
+       bool t = got_message;
+       got_message = false;
+       return t;
+}
+
 static int charmsg_mode = 0;
 
 static int target_asciimsg(struct target *target, uint32_t length)
@@ -118,6 +127,9 @@ int target_request(struct target *target, uint32_t request)
 {
        target_req_cmd_t target_req_cmd = request & 0xff;
 
+       /* Record that we got a target message for back-off algorithm */
+       got_message = true;
+
        if (charmsg_mode) {
                target_charmsg(target, target_req_cmd);
                return ERROR_OK;
@@ -156,7 +168,7 @@ static int add_debug_msg_receiver(struct command_context *cmd_ctx, struct target
        struct debug_msg_receiver **p = &target->dbgmsg;
 
        if (target == NULL)
-               return ERROR_INVALID_ARGUMENTS;
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
        /* see if there's already a list */
        if (*p)
@@ -182,11 +194,9 @@ static int add_debug_msg_receiver(struct command_context *cmd_ctx, struct target
 static struct debug_msg_receiver* find_debug_msg_receiver(struct command_context *cmd_ctx, struct target *target)
 {
        int do_all_targets = 0;
-       struct debug_msg_receiver **p = &target->dbgmsg;
 
        /* if no target has been specified search all of them */
-       if (target == NULL)
-       {
+       if (target == NULL) {
                /* if no targets haven been specified */
                if (all_targets == NULL)
                        return NULL;
@@ -195,8 +205,9 @@ static struct debug_msg_receiver* find_debug_msg_receiver(struct command_context
                do_all_targets = 1;
        }
 
-       do
-       {
+       /* so we target != null */
+       struct debug_msg_receiver **p = &target->dbgmsg;
+       do {
                while (*p)
                {
                        if ((*p)->cmd_ctx == cmd_ctx)
@@ -260,53 +271,68 @@ int delete_debug_msg_receiver(struct command_context *cmd_ctx, struct target *ta
 
 COMMAND_HANDLER(handle_target_request_debugmsgs_command)
 {
-       struct target *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
 
        int receiving = 0;
 
        /* see if reciever is already registered */
-       if (find_debug_msg_receiver(cmd_ctx, target) != NULL)
+       if (find_debug_msg_receiver(CMD_CTX, target) != NULL)
                receiving = 1;
 
        if (CMD_ARGC > 0)
        {
-               if (!strcmp(args[0], "enable") || !strcmp(args[0], "charmsg"))
+               if (!strcmp(CMD_ARGV[0], "enable") || !strcmp(CMD_ARGV[0], "charmsg"))
                {
                        /* don't register if this command context is already receiving */
                        if (!receiving)
                        {
                                receiving = 1;
-                               add_debug_msg_receiver(cmd_ctx, target);
+                               add_debug_msg_receiver(CMD_CTX, target);
                        }
-                       charmsg_mode = !strcmp(args[0], "charmsg");
+                       charmsg_mode = !strcmp(CMD_ARGV[0], "charmsg");
                }
-               else if (!strcmp(args[0], "disable"))
+               else if (!strcmp(CMD_ARGV[0], "disable"))
                {
                        /* no need to delete a receiver if none is registered */
                        if (receiving)
                        {
                                receiving = 0;
-                               delete_debug_msg_receiver(cmd_ctx, target);
+                               delete_debug_msg_receiver(CMD_CTX, target);
                        }
                }
                else
                {
-                       command_print(cmd_ctx, "usage: target_request debugmsgs ['enable'|'disable'|'charmsg']");
+                   return ERROR_COMMAND_SYNTAX_ERROR;
                }
        }
 
-       command_print(cmd_ctx, "receiving debug messages from current target %s",
+       command_print(CMD_CTX, "receiving debug messages from current target %s",
                      (receiving) ? (charmsg_mode?"charmsg":"enabled") : "disabled");
        return ERROR_OK;
 }
 
+static const struct command_registration target_req_exec_command_handlers[] = {
+       {
+               .name = "debugmsgs",
+               .handler = handle_target_request_debugmsgs_command,
+               .mode = COMMAND_EXEC,
+               .help = "display and/or modify reception of debug messages from target",
+               .usage = "['enable'|'charmsg'|'disable']",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration target_req_command_handlers[] = {
+       {
+               .name = "target_request",
+               .mode = COMMAND_ANY,
+               .help = "target request command group",
+               .usage = "",
+               .chain = target_req_exec_command_handlers,
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
 int target_request_register_commands(struct command_context *cmd_ctx)
 {
-       target_request_cmd =
-               register_command(cmd_ctx, NULL, "target_request", NULL, COMMAND_ANY, "target_request commands");
-
-       register_command(cmd_ctx, target_request_cmd, "debugmsgs", handle_target_request_debugmsgs_command,
-               COMMAND_EXEC, "enable/disable reception of debug messages from target");
-
-       return ERROR_OK;
+       return register_commands(cmd_ctx, NULL, target_req_command_handlers);
 }