X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftarget_request.c;h=721515552c9d0463c18b21d3052254caa85cc668;hp=e23a0f7d161706434f19210e90387a8e04703558;hb=b695cb75220100cd9bbfaec5bd1740958454130d;hpb=68b97e4b5c40a70b42dc2a970f1b90b9a3e9f13d diff --git a/src/target/target_request.c b/src/target/target_request.c index e23a0f7d16..721515552c 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,49 +27,54 @@ #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 struct command *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); + struct debug_msg_receiver *c = target->dbgmsg; + + target->type->target_request_data(target, CEIL(length, 4), (uint8_t*)msg); msg[length] = 0; - - DEBUG("%s", msg); - + + LOG_DEBUG("%s", msg); + while (c) { command_print(c->cmd_ctx, "%s", msg); c = c->next; } - + + return ERROR_OK; +} + +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(CEIL(length * size, 4) * 4); char line[128]; int line_len; - debug_msg_receiver_t *c = target->dbgmsg; - int i; - - 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, CEIL(length * size, 4), (uint8_t*)data); line_len = 0; for (i = 0; i < length; i++) @@ -71,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))); @@ -80,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)) { - DEBUG("%s", line); - + LOG_DEBUG("%s", line); + while (c) { command_print(c->cmd_ctx, "%s", line); @@ -94,7 +105,7 @@ int target_hexmsg(target_t *target, int size, u32 length) line_len = 0; } } - + free(data); return ERROR_OK; @@ -103,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: @@ -122,21 +137,24 @@ int target_request(target_t *target, u32 request) target_hexmsg(target, (request & 0xff00) >> 8, (request & 0xffff0000) >> 16); } break; + case TARGET_REQ_DEBUGCHAR: + target_charmsg(target, (request & 0x00ff0000) >> 16); + break; /* case TARGET_REQ_SEMIHOSTING: * break; */ default: - ERROR("unknown target request: %2.2x", target_req_cmd); + 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; @@ -151,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) @@ -187,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 @@ -217,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; @@ -233,26 +251,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 && 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) 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) @@ -260,6 +278,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")) { @@ -272,23 +291,22 @@ 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; } -int target_request_register_commands(struct command_context_s *cmd_ctx) +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 messgages from target"); + COMMAND_EXEC, "enable/disable reception of debug messages from target"); return ERROR_OK; }