X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftarget_request.c;h=be176ca3e4b22516fabb5760226ef7e533efb3d8;hp=54d8df684249372db8c0f04fa1144991a3500872;hb=1d4a09c2ef22dc10ec8a40183b8dd1b1102af20d;hpb=99e8c9fccb8b220b1879f44848f253fc6816d9a4 diff --git a/src/target/target_request.c b/src/target/target_request.c index 54d8df6842..be176ca3e4 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,6 +27,7 @@ #include "config.h" #endif +#include "target.h" #include "target_request.h" #include "target_type.h" #include "binarybuffer.h" @@ -34,15 +35,15 @@ #include "log.h" -static command_t *target_request_cmd = NULL; +static struct command *target_request_cmd = NULL; 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 +57,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", (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++) @@ -113,12 +114,12 @@ 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 ); + if (charmsg_mode) { + target_charmsg(target, target_req_cmd); return ERROR_OK; } switch (target_req_cmd) @@ -150,9 +151,9 @@ 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; @@ -168,7 +169,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,10 +179,10 @@ 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; + struct debug_msg_receiver **p = &target->dbgmsg; /* if no target has been specified search all of them */ if (target == NULL) @@ -211,10 +212,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 +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; @@ -257,9 +258,9 @@ 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; @@ -295,11 +296,11 @@ static int handle_target_request_debugmsgs_command(struct command_context_s *cmd } command_print(cmd_ctx, "receiving debug messages from current target %s", - (receiving) ? (charmsg_mode?"charmsg":"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");