X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftarget_request.c;h=4bfda5bf700e4219116c7905b1d0f1cc719276e8;hp=df97a65f7975028c8341fb1f0379a9a762f7070f;hb=cfc4d5c6b7b6f8f82dc5bbf3ee661c179814666e;hpb=68c598e88d5e09728ea845a81ab279c615bbaf0f diff --git a/src/target/target_request.c b/src/target/target_request.c index df97a65f79..4bfda5bf70 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,56 +27,53 @@ #include "config.h" #endif -#include "replacements.h" -#include "log.h" -#include "target.h" #include "target_request.h" +#include "target_type.h" #include "binarybuffer.h" -#include "command.h" #include "trace.h" +#include "log.h" -#include -#include -command_t *target_request_cmd = NULL; +static command_t *target_request_cmd = NULL; +static int charmsg_mode = 0; -int target_asciimsg(target_t *target, u32 length) +static int target_asciimsg(target_t *target, uint32_t length) { char *msg = malloc(CEIL(length + 1, 4) * 4); debug_msg_receiver_t *c = target->dbgmsg; - - target->type->target_request_data(target, CEIL(length, 4), (u8*)msg); + + target->type->target_request_data(target, CEIL(length, 4), (uint8_t*)msg); msg[length] = 0; - + LOG_DEBUG("%s", msg); - + while (c) { command_print(c->cmd_ctx, "%s", msg); c = c->next; } - + return ERROR_OK; } -int target_charmsg(target_t *target, u8 msg) +static int target_charmsg(target_t *target, uint8_t msg) { LOG_USER_N("%c", msg); - + return ERROR_OK; } -int target_hexmsg(target_t *target, int size, u32 length) +static int target_hexmsg(target_t *target, int size, uint32_t length) { - u8 *data = malloc(CEIL(length * size, 4) * 4); + uint8_t *data = malloc(CEIL(length * size, 4) * 4); char line[128]; int line_len; debug_msg_receiver_t *c = target->dbgmsg; - int i; - - LOG_DEBUG("size: %i, length: %i", size, length); + uint32_t i; - target->type->target_request_data(target, CEIL(length * size, 4), (u8*)data); + LOG_DEBUG("size: %i, length: %i", (int)size, (int)length); + + target->type->target_request_data(target, CEIL(length * size, 4), (uint8_t*)data); line_len = 0; for (i = 0; i < length; i++) @@ -84,7 +81,7 @@ int target_hexmsg(target_t *target, int size, u32 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))); @@ -93,11 +90,11 @@ int target_hexmsg(target_t *target, int size, u32 length) line_len += snprintf(line + line_len, 128 - line_len, "%2.2x ", data[i]); break; } - + if ((i%8 == 7) || (i == length - 1)) { LOG_DEBUG("%s", line); - + while (c) { command_print(c->cmd_ctx, "%s", line); @@ -107,7 +104,7 @@ int target_hexmsg(target_t *target, int size, u32 length) line_len = 0; } } - + free(data); return ERROR_OK; @@ -116,10 +113,14 @@ int target_hexmsg(target_t *target, int size, u32 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, u32 request) +int target_request(target_t *target, uint32_t request) { target_req_cmd_t target_req_cmd = request & 0xff; - + + if (charmsg_mode) { + target_charmsg(target, target_req_cmd); + return ERROR_OK; + } switch (target_req_cmd) { case TARGET_REQ_TRACEMSG: @@ -145,14 +146,14 @@ int target_request(target_t *target, u32 request) LOG_ERROR("unknown target request: %2.2x", target_req_cmd); break; } - + return ERROR_OK; } -int add_debug_msg_receiver(struct command_context_s *cmd_ctx, target_t *target) +static int add_debug_msg_receiver(struct command_context_s *cmd_ctx, target_t *target) { debug_msg_receiver_t **p = &target->dbgmsg; - + if (target == NULL) return ERROR_INVALID_ARGUMENTS; @@ -170,18 +171,18 @@ int add_debug_msg_receiver(struct command_context_s *cmd_ctx, target_t *target) (*p) = malloc(sizeof(debug_msg_receiver_t)); (*p)->cmd_ctx = cmd_ctx; (*p)->next = NULL; - + /* enable callback */ target->dbg_msg_enabled = 1; - + return ERROR_OK; } -debug_msg_receiver_t* find_debug_msg_receiver(struct command_context_s *cmd_ctx, target_t *target) +static debug_msg_receiver_t* find_debug_msg_receiver(struct command_context_s *cmd_ctx, target_t *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) { @@ -192,7 +193,7 @@ debug_msg_receiver_t* find_debug_msg_receiver(struct command_context_s *cmd_ctx, target = all_targets; do_all_targets = 1; } - + do { while (*p) @@ -203,10 +204,10 @@ debug_msg_receiver_t* find_debug_msg_receiver(struct command_context_s *cmd_ctx, } p = &((*p)->next); } - + target = target->next; } while (target && do_all_targets); - + return NULL; } @@ -215,14 +216,14 @@ int delete_debug_msg_receiver(struct command_context_s *cmd_ctx, target_t *targe debug_msg_receiver_t **p; debug_msg_receiver_t *c; int do_all_targets = 0; - + /* if no target has been specified search all of them */ if (target == NULL) { /* if no targets haven been specified */ if (all_targets == NULL) return ERROR_OK; - + target = all_targets; do_all_targets = 1; } @@ -249,26 +250,26 @@ int delete_debug_msg_receiver(struct command_context_s *cmd_ctx, target_t *targe p = &(c->next); c = next; } - + target = target->next; } while (target && do_all_targets); - + return ERROR_OK; } -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); int receiving = 0; - + /* see if reciever is already registered */ if (find_debug_msg_receiver(cmd_ctx, target) != NULL) receiving = 1; if (argc > 0) { - if (!strcmp(args[0], "enable")) + if (!strcmp(args[0], "enable") || !strcmp(args[0], "charmsg")) { /* don't register if this command context is already receiving */ if (!receiving) @@ -276,6 +277,7 @@ int handle_target_request_debugmsgs_command(struct command_context_s *cmd_ctx, c receiving = 1; add_debug_msg_receiver(cmd_ctx, target); } + charmsg_mode = !strcmp(args[0], "charmsg"); } else if (!strcmp(args[0], "disable")) { @@ -288,13 +290,12 @@ int handle_target_request_debugmsgs_command(struct command_context_s *cmd_ctx, c } else { - command_print(cmd_ctx, "usage: target_request debugmsgs ['enable'|'disable']"); + command_print(cmd_ctx, "usage: target_request debugmsgs ['enable'|'disable'|'charmsg']"); } } - + command_print(cmd_ctx, "receiving debug messages from current target %s", - (receiving) ? "enabled" : "disabled"); - + (receiving) ? (charmsg_mode?"charmsg":"enabled") : "disabled"); return ERROR_OK; } @@ -302,9 +303,9 @@ int target_request_register_commands(struct command_context_s *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 messgages from target"); + COMMAND_EXEC, "enable/disable reception of debug messages from target"); return ERROR_OK; }