X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftarget_request.c;h=090de9fe64f45ba0b37a6af302db63ec739baf39;hp=3f3af5eaaab2dbb6cc1707100d24beb7926deae9;hb=b48d1f66378fac886d5bc32d7302da48c89d8a75;hpb=3c2eabd20f5182c53f0bfb0c6f2a9f2595434e87 diff --git a/src/target/target_request.c b/src/target/target_request.c index 3f3af5eaaa..090de9fe64 100644 --- a/src/target/target_request.c +++ b/src/target/target_request.c @@ -2,7 +2,7 @@ * Copyright (C) 2007 by Dominic Rath * * Dominic.Rath@gmx.de * * * - * Copyright (C) 2007,2008 Øyvind Harboe * + * Copyright (C) 2007,2008 Øyvind Harboe * * oyvind.harboe@zylin.com * * * * Copyright (C) 2008 by Spencer Oliver * @@ -27,22 +27,32 @@ #include "config.h" #endif +#include +#include + +#include "target.h" #include "target_request.h" #include "target_type.h" -#include "binarybuffer.h" #include "trace.h" -#include "log.h" -static command_t *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(target_t *target, uint32_t length) +static int target_asciimsg(struct target *target, uint32_t length) { - char *msg = malloc(CEIL(length + 1, 4) * 4); - debug_msg_receiver_t *c = target->dbgmsg; + char *msg = malloc(DIV_ROUND_UP(length + 1, 4) * 4); + struct debug_msg_receiver *c = target->dbgmsg; - target->type->target_request_data(target, CEIL(length, 4), (uint8_t*)msg); + target->type->target_request_data(target, DIV_ROUND_UP(length, 4), (uint8_t*)msg); msg[length] = 0; LOG_DEBUG("%s", msg); @@ -56,24 +66,24 @@ static int target_asciimsg(target_t *target, uint32_t length) return ERROR_OK; } -static int target_charmsg(target_t *target, uint8_t msg) +static int target_charmsg(struct target *target, uint8_t msg) { LOG_USER_N("%c", msg); return ERROR_OK; } -static int target_hexmsg(target_t *target, int size, uint32_t length) +static int target_hexmsg(struct target *target, int size, uint32_t length) { - uint8_t *data = malloc(CEIL(length * size, 4) * 4); + uint8_t *data = malloc(DIV_ROUND_UP(length * size, 4) * 4); char line[128]; int line_len; - debug_msg_receiver_t *c = target->dbgmsg; + struct debug_msg_receiver *c = target->dbgmsg; uint32_t i; - LOG_DEBUG("size: %i, length: %i", size, length); + LOG_DEBUG("size: %i, length: %i", (int)size, (int)length); - target->type->target_request_data(target, CEIL(length * size, 4), (uint8_t*)data); + target->type->target_request_data(target, DIV_ROUND_UP(length * size, 4), (uint8_t*)data); line_len = 0; for (i = 0; i < length; i++) @@ -81,7 +91,7 @@ static int target_hexmsg(target_t *target, int size, uint32_t length) switch (size) { case 4: - line_len += snprintf(line + line_len, 128 - line_len, "%8.8x ", le_to_h_u32(data + (4*i))); + line_len += snprintf(line + line_len, 128 - line_len, "%8.8" PRIx32 " ", le_to_h_u32(data + (4*i))); break; case 2: line_len += snprintf(line + line_len, 128 - line_len, "%4.4x ", le_to_h_u16(data + (2*i))); @@ -113,12 +123,15 @@ static int target_hexmsg(target_t *target, int size, uint32_t length) /* handle requests from the target received by a target specific * side-band channel (e.g. ARM7/9 DCC) */ -int target_request(target_t *target, uint32_t request) +int target_request(struct target *target, uint32_t request) { target_req_cmd_t target_req_cmd = request & 0xff; - if ( charmsg_mode ) { - target_charmsg(target, target_req_cmd ); + /* 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; } switch (target_req_cmd) @@ -150,12 +163,12 @@ int target_request(target_t *target, uint32_t request) return ERROR_OK; } -static int add_debug_msg_receiver(struct command_context_s *cmd_ctx, target_t *target) +static int add_debug_msg_receiver(struct command_context *cmd_ctx, struct target *target) { - debug_msg_receiver_t **p = &target->dbgmsg; + 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) @@ -168,7 +181,7 @@ static int add_debug_msg_receiver(struct command_context_s *cmd_ctx, target_t *t } /* add new debug message receiver */ - (*p) = malloc(sizeof(debug_msg_receiver_t)); + (*p) = malloc(sizeof(struct debug_msg_receiver)); (*p)->cmd_ctx = cmd_ctx; (*p)->next = NULL; @@ -178,14 +191,12 @@ static int add_debug_msg_receiver(struct command_context_s *cmd_ctx, target_t *t return ERROR_OK; } -static debug_msg_receiver_t* find_debug_msg_receiver(struct command_context_s *cmd_ctx, target_t *target) +static struct debug_msg_receiver* find_debug_msg_receiver(struct command_context *cmd_ctx, struct target *target) { int do_all_targets = 0; - debug_msg_receiver_t **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 debug_msg_receiver_t* find_debug_msg_receiver(struct command_context_s *c 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) @@ -211,10 +223,10 @@ static debug_msg_receiver_t* find_debug_msg_receiver(struct command_context_s *c return NULL; } -int delete_debug_msg_receiver(struct command_context_s *cmd_ctx, target_t *target) +int delete_debug_msg_receiver(struct command_context *cmd_ctx, struct target *target) { - debug_msg_receiver_t **p; - debug_msg_receiver_t *c; + struct debug_msg_receiver **p; + struct debug_msg_receiver *c; int do_all_targets = 0; /* if no target has been specified search all of them */ @@ -234,7 +246,7 @@ int delete_debug_msg_receiver(struct command_context_s *cmd_ctx, target_t *targe c = *p; while (c) { - debug_msg_receiver_t *next = c->next; + struct debug_msg_receiver *next = c->next; if (c->cmd_ctx == cmd_ctx) { *p = next; @@ -257,55 +269,70 @@ int delete_debug_msg_receiver(struct command_context_s *cmd_ctx, target_t *targe return ERROR_OK; } -static int handle_target_request_debugmsgs_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_target_request_debugmsgs_command) { - target_t *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 (argc > 0) + 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", - (receiving) ? (charmsg_mode?"charmsg":"enabled") : "disabled" ); + command_print(CMD_CTX, "receiving debug messages from current target %s", + (receiving) ? (charmsg_mode?"charmsg":"enabled") : "disabled"); return ERROR_OK; } -int target_request_register_commands(struct command_context_s *cmd_ctx) +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); }