X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Ftarget_request.c;h=f3bcd2e1d2b1c050c1c7c6921c75ef815047caea;hb=c893a26a008a3a260bb40dc3f14ee7bdcc353981;hp=1fedfb222dd27e35eafb19db345f2645a432e0fd;hpb=9b9092b7faa5859dd1a14489a312465782e2bef1;p=fw%2Fopenocd diff --git a/src/target/target_request.c b/src/target/target_request.c index 1fedfb222..f3bcd2e1d 100644 --- a/src/target/target_request.c +++ b/src/target/target_request.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + /*************************************************************************** * Copyright (C) 2007 by Dominic Rath * * Dominic.Rath@gmx.de * @@ -7,22 +9,8 @@ * * * 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 * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -35,8 +23,7 @@ #include "target_type.h" #include "trace.h" - -static bool got_message = false; +static bool got_message; bool target_got_message(void) { @@ -45,21 +32,20 @@ bool target_got_message(void) return t; } -static int charmsg_mode = 0; +static int charmsg_mode; static int target_asciimsg(struct target *target, uint32_t length) { 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); + 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); + while (c) { + command_output_text(c->cmd_ctx, msg); c = c->next; } @@ -83,13 +69,11 @@ static int target_hexmsg(struct target *target, int size, uint32_t length) LOG_DEBUG("size: %i, length: %i", (int)size, (int)length); - target->type->target_request_data(target, DIV_ROUND_UP(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++) - { - switch (size) - { + for (i = 0; i < length; i++) { + switch (size) { case 4: line_len += snprintf(line + line_len, 128 - line_len, "%8.8" PRIx32 " ", le_to_h_u32(data + (4*i))); break; @@ -101,13 +85,11 @@ static int target_hexmsg(struct target *target, int size, uint32_t length) break; } - if ((i%8 == 7) || (i == length - 1)) - { + if ((i%8 == 7) || (i == length - 1)) { LOG_DEBUG("%s", line); - while (c) - { - command_print(c->cmd_ctx, "%s", line); + while (c) { + command_output_text(c->cmd_ctx, line); c = c->next; } c = target->dbgmsg; @@ -127,6 +109,8 @@ int target_request(struct target *target, uint32_t request) { target_req_cmd_t target_req_cmd = request & 0xff; + assert(target->type->target_request_data); + /* Record that we got a target message for back-off algorithm */ got_message = true; @@ -134,20 +118,16 @@ int target_request(struct target *target, uint32_t request) target_charmsg(target, target_req_cmd); return ERROR_OK; } - switch (target_req_cmd) - { + + switch (target_req_cmd) { case TARGET_REQ_TRACEMSG: trace_point(target, (request & 0xffffff00) >> 8); break; case TARGET_REQ_DEBUGMSG: if (((request & 0xff00) >> 8) == 0) - { target_asciimsg(target, (request & 0xffff0000) >> 16); - } else - { target_hexmsg(target, (request & 0xff00) >> 8, (request & 0xffff0000) >> 16); - } break; case TARGET_REQ_DEBUGCHAR: target_charmsg(target, (request & 0x00ff0000) >> 16); @@ -155,9 +135,9 @@ int target_request(struct target *target, uint32_t request) /* case TARGET_REQ_SEMIHOSTING: * break; */ - default: - LOG_ERROR("unknown target request: %2.2x", target_req_cmd); - break; + default: + LOG_ERROR("unknown target request: %2.2x", target_req_cmd); + break; } return ERROR_OK; @@ -167,14 +147,12 @@ 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; + if (!target) + return ERROR_COMMAND_SYNTAX_ERROR; /* see if there's already a list */ - if (*p) - { + if (*p) { /* find end of linked list */ - p = &target->dbgmsg; while ((*p)->next) p = &((*p)->next); p = &((*p)->next); @@ -191,14 +169,15 @@ static int add_debug_msg_receiver(struct command_context *cmd_ctx, struct target return ERROR_OK; } -static struct debug_msg_receiver* find_debug_msg_receiver(struct command_context *cmd_ctx, struct target *target) +static struct debug_msg_receiver *find_debug_msg_receiver(struct command_context *cmd_ctx, + struct target *target) { int do_all_targets = 0; /* if no target has been specified search all of them */ - if (target == NULL) { + if (!target) { /* if no targets haven been specified */ - if (all_targets == NULL) + if (!all_targets) return NULL; target = all_targets; @@ -208,12 +187,9 @@ static struct debug_msg_receiver* find_debug_msg_receiver(struct command_context /* so we target != null */ struct debug_msg_receiver **p = &target->dbgmsg; do { - while (*p) - { + while (*p) { if ((*p)->cmd_ctx == cmd_ctx) - { return *p; - } p = &((*p)->next); } @@ -230,35 +206,29 @@ int delete_debug_msg_receiver(struct command_context *cmd_ctx, struct target *ta int do_all_targets = 0; /* if no target has been specified search all of them */ - if (target == NULL) - { + if (!target) { /* if no targets haven been specified */ - if (all_targets == NULL) + if (!all_targets) return ERROR_OK; target = all_targets; do_all_targets = 1; } - do - { + do { p = &target->dbgmsg; c = *p; - while (c) - { + while (c) { struct debug_msg_receiver *next = c->next; - if (c->cmd_ctx == cmd_ctx) - { + if (c->cmd_ctx == cmd_ctx) { *p = next; free(c); - if (*p == NULL) - { + if (!*p) { /* disable callback */ target->dbg_msg_enabled = 0; } return ERROR_OK; - } - else + } else p = &(c->next); c = next; } @@ -275,39 +245,35 @@ COMMAND_HANDLER(handle_target_request_debugmsgs_command) int receiving = 0; - /* see if reciever is already registered */ - if (find_debug_msg_receiver(CMD_CTX, target) != NULL) + if (!target->type->target_request_data) { + LOG_ERROR("Target %s does not support target requests", target_name(target)); + return ERROR_OK; + } + + /* see if receiver is already registered */ + if (find_debug_msg_receiver(CMD_CTX, target)) receiving = 1; - if (CMD_ARGC > 0) - { - if (!strcmp(CMD_ARGV[0], "enable") || !strcmp(CMD_ARGV[0], "charmsg")) - { + if (CMD_ARGC > 0) { + if (!strcmp(CMD_ARGV[0], "enable") || !strcmp(CMD_ARGV[0], "charmsg")) { /* don't register if this command context is already receiving */ - if (!receiving) - { + if (!receiving) { receiving = 1; add_debug_msg_receiver(CMD_CTX, target); } charmsg_mode = !strcmp(CMD_ARGV[0], "charmsg"); - } - else if (!strcmp(CMD_ARGV[0], "disable")) - { + } else if (!strcmp(CMD_ARGV[0], "disable")) { /* no need to delete a receiver if none is registered */ - if (receiving) - { + if (receiving) { receiving = 0; delete_debug_msg_receiver(CMD_CTX, target); } - } - else - { - command_print(CMD_CTX, "usage: target_request debugmsgs ['enable'|'disable'|'charmsg']"); - } + } else + 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, "receiving debug messages from current target %s", + (receiving) ? (charmsg_mode ? "charmsg" : "enabled") : "disabled"); return ERROR_OK; } @@ -326,6 +292,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