command_t -> struct command

[openocd.git] / src / target / target_request.c

diff --git a/src/target/target_request.c b/src/target/target_request.c
index 3f3af5eaaab2dbb6cc1707100d24beb7926deae9..283ce55f3752fe3456e4d4b7ce9f33fd10e9120e 100644 (file)
--- 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                                  *
@@ -34,13 +34,13 @@
 #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;
+       struct debug_msg_receiver *c = target->dbgmsg;
 
        target->type->target_request_data(target, CEIL(length, 4), (uint8_t*)msg);
        msg[length] = 0;
@@ -56,22 +56,22 @@ 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);
        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", size, length);
+       LOG_DEBUG("size: %i, length: %i", (int)size, (int)length);
 
        target->type->target_request_data(target, CEIL(length * size, 4), (uint8_t*)data);
 
@@ -81,7 +81,7 @@ static int target_hexmsg(target_t *target, int size, uint32_t 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)));
@@ -113,12 +113,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 +150,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 +168,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 +178,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 +211,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 +234,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 +257,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 +295,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");