X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Ftarget_request.c;h=ec3d48e2603f2f2fe4eaa36eeafaeaef726e79fa;hb=7cd2617384f4ac620c468343c1f2009fbfa2fc79;hp=3487f160285a0e16d11ab8e3563940fd272a5e11;hpb=d47e1b8f362379d8a2307f49e2b42115a3f40524;p=openocd.git diff --git a/src/target/target_request.c b/src/target/target_request.c index 3487f16028..ec3d48e260 100644 --- a/src/target/target_request.c +++ b/src/target/target_request.c @@ -2,6 +2,12 @@ * Copyright (C) 2007 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * Copyright (C) 2007,2008 Øyvind Harboe * + * oyvind.harboe@zylin.com * + * * + * Copyright (C) 2008 by Spencer Oliver * + * spen@spen-soft.co.uk * + * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * @@ -21,56 +27,54 @@ #include "config.h" #endif -#include "replacements.h" -#include "log.h" +#include +#include + #include "target.h" #include "target_request.h" -#include "binarybuffer.h" -#include "command.h" +#include "target_type.h" #include "trace.h" -#include -#include -command_t *target_request_cmd = NULL; +static int charmsg_mode = 0; -int target_asciimsg(target_t *target, u32 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; - - target->type->target_request_data(target, CEIL(length, 4), (u8*)msg); + char *msg = malloc(DIV_ROUND_UP(length + 1, 4) * 4); + struct debug_msg_receiver *c = target->dbgmsg; + + target->type->target_request_data(target, DIV_ROUND_UP(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(struct target *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(struct target *target, int size, uint32_t length) { - u8 *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; - int i; - - LOG_DEBUG("size: %i, length: %i", size, length); + struct debug_msg_receiver *c = target->dbgmsg; + uint32_t i; + + LOG_DEBUG("size: %i, length: %i", (int)size, (int)length); - target->type->target_request_data(target, CEIL(length * size, 4), (u8*)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++) @@ -78,7 +82,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))); @@ -87,11 +91,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); @@ -101,7 +105,7 @@ int target_hexmsg(target_t *target, int size, u32 length) line_len = 0; } } - + free(data); return ERROR_OK; @@ -110,10 +114,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(struct target *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: @@ -139,14 +147,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 *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; @@ -161,32 +169,32 @@ int add_debug_msg_receiver(struct command_context_s *cmd_ctx, target_t *target) } /* 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; - + /* 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 struct debug_msg_receiver* find_debug_msg_receiver(struct command_context *cmd_ctx, struct target *target) { - int all_targets = 0; - debug_msg_receiver_t **p = &target->dbgmsg; - + 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 no targets haven been specified */ - if (targets == NULL) + if (all_targets == NULL) return NULL; - target = targets; - all_targets = 1; + target = all_targets; + do_all_targets = 1; } - + do { while (*p) @@ -197,28 +205,28 @@ debug_msg_receiver_t* find_debug_msg_receiver(struct command_context_s *cmd_ctx, } p = &((*p)->next); } - + target = target->next; - } while (target && all_targets); - + } while (target && do_all_targets); + 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; - int all_targets = 0; - + 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 */ if (target == NULL) { /* if no targets haven been specified */ - if (targets == NULL) + if (all_targets == NULL) return ERROR_OK; - - target = targets; - all_targets = 1; + + target = all_targets; + do_all_targets = 1; } do @@ -227,7 +235,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; @@ -243,62 +251,76 @@ int delete_debug_msg_receiver(struct command_context_s *cmd_ctx, target_t *targe p = &(c->next); c = next; } - + target = target->next; - } while (target && all_targets); - + } 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); + 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")) + 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(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']"); + 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"); - + + 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) -{ - 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"); +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", + .chain = target_req_exec_command_handlers, + }, + COMMAND_REGISTRATION_DONE +}; - return ERROR_OK; +int target_request_register_commands(struct command_context *cmd_ctx) +{ + return register_commands(cmd_ctx, NULL, target_req_command_handlers); }