target: move regmaps to armv7m.c

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

diff --git a/src/target/target_request.c b/src/target/target_request.c
index fc0ba1ac0a615955042eac099d58a8fe25249498..090de9fe64f45ba0b37a6af302db63ec739baf39 100644 (file)
--- a/src/target/target_request.c
+++ b/src/target/target_request.c
@@ -27,14 +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 <helper/binarybuffer.h>
 #include "trace.h"
-#include <helper/log.h>
 
 
+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)
@@ -117,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;
@@ -155,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)
@@ -181,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;
@@ -194,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)
@@ -290,7 +302,7 @@ COMMAND_HANDLER(handle_target_request_debugmsgs_command)
                }
                else
                {
-                       command_print(CMD_CTX, "usage: target_request debugmsgs ['enable'|'disable'|'charmsg']");
+                   return ERROR_COMMAND_SYNTAX_ERROR;
                }
        }
 
@@ -302,10 +314,10 @@ COMMAND_HANDLER(handle_target_request_debugmsgs_command)
 static const struct command_registration target_req_exec_command_handlers[] = {
        {
                .name = "debugmsgs",
-               .handler = &handle_target_request_debugmsgs_command,
+               .handler = handle_target_request_debugmsgs_command,
                .mode = COMMAND_EXEC,
-               .help = "set reception of debug messages from target",
-               .usage = "(enable|disable)",
+               .help = "display and/or modify reception of debug messages from target",
+               .usage = "['enable'|'charmsg'|'disable']",
        },
        COMMAND_REGISTRATION_DONE
 };
@@ -314,6 +326,7 @@ 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