command_handler: change 'args' to CMD_ARGV

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

diff --git a/src/target/target_request.c b/src/target/target_request.c
index f1bb243deb69a26d300a7bc8c8074bc67e4ba033..1d618cc5bc174c7313193707582dab696a888e3e 100644 (file)
--- a/src/target/target_request.c
+++ b/src/target/target_request.c
@@ -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(struct target *target, uint32_t length)
 {
-       char *msg = malloc(CEIL(length + 1, 4) * 4);
+       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);
@@ -65,7 +66,7 @@ static int target_charmsg(struct target *target, uint8_t msg)
 
 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;
        struct debug_msg_receiver *c = target->dbgmsg;
@@ -73,7 +74,7 @@ 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, 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++)
@@ -150,7 +151,7 @@ int target_request(struct target *target, uint32_t request)
        return ERROR_OK;
 }
 
-static int add_debug_msg_receiver(struct command_context_s *cmd_ctx, struct target *target)
+static int add_debug_msg_receiver(struct command_context *cmd_ctx, struct target *target)
 {
        struct debug_msg_receiver **p = &target->dbgmsg;
 
@@ -178,7 +179,7 @@ static int add_debug_msg_receiver(struct command_context_s *cmd_ctx, struct targ
        return ERROR_OK;
 }
 
-static struct debug_msg_receiver* find_debug_msg_receiver(struct command_context_s *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;
        struct debug_msg_receiver **p = &target->dbgmsg;
@@ -211,7 +212,7 @@ static struct debug_msg_receiver* find_debug_msg_receiver(struct command_context
        return NULL;
 }
 
-int delete_debug_msg_receiver(struct command_context_s *cmd_ctx, struct target *target)
+int delete_debug_msg_receiver(struct command_context *cmd_ctx, struct target *target)
 {
        struct debug_msg_receiver **p;
        struct debug_msg_receiver *c;
@@ -267,9 +268,9 @@ COMMAND_HANDLER(handle_target_request_debugmsgs_command)
        if (find_debug_msg_receiver(cmd_ctx, target) != NULL)
                receiving = 1;
 
-       if (argc > 0)
+       if (CMD_ARGC > 0)
        {
-               if (!strcmp(args[0], "enable") || !strcmp(args[0], "charmsg"))
+               if (!strcmp(CMD_ARGV[0], "enable") || !strcmp(CMD_ARGV[0], "charmsg"))
                {
                        /* don't register if this command context is already receiving */
                        if (!receiving)
@@ -277,9 +278,9 @@ COMMAND_HANDLER(handle_target_request_debugmsgs_command)
                                receiving = 1;
                                add_debug_msg_receiver(cmd_ctx, target);
                        }
-                       charmsg_mode = !strcmp(args[0], "charmsg");
+                       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)
@@ -299,7 +300,7 @@ COMMAND_HANDLER(handle_target_request_debugmsgs_command)
        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");