X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftarget_request.c;h=c5de691ae9e107e422a0bc648355b5aeeaa49081;hp=721515552c9d0463c18b21d3052254caa85cc668;hb=7bf1a86e473a12882bf6f71cb4d0d416394b69d4;hpb=b695cb75220100cd9bbfaec5bd1740958454130d

diff --git a/src/target/target_request.c b/src/target/target_request.c
index 721515552c..c5de691ae9 100644
--- a/src/target/target_request.c
+++ b/src/target/target_request.c
@@ -40,10 +40,10 @@ 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);
@@ -66,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;
@@ -74,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++)
@@ -268,7 +268,7 @@ 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"))
 		{