X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fcommands.c;h=4e8ce40f141f87a0e0d66a250456257f074e9953;hp=c092eec5325cd56872a2912eb00636f0d0c67eb7;hb=a93b404161dc42f8dee805c8f95bc4974aded9cb;hpb=e11c5a3b42a2a39c5b24c9a19ba03f7b16caf3d7

diff --git a/src/jtag/commands.c b/src/jtag/commands.c
index c092eec532..4e8ce40f14 100644
--- a/src/jtag/commands.c
+++ b/src/jtag/commands.c
@@ -42,15 +42,15 @@ struct cmd_queue_page {
 #define CMD_QUEUE_PAGE_SIZE (1024 * 1024)
 static struct cmd_queue_page *cmd_queue_pages = NULL;
 
-jtag_command_t *jtag_command_queue = NULL;
-static jtag_command_t **next_command_pointer = &jtag_command_queue;
+struct jtag_command *jtag_command_queue = NULL;
+static struct jtag_command **next_command_pointer = &jtag_command_queue;
 
-void jtag_queue_command(jtag_command_t * cmd)
+void jtag_queue_command(struct jtag_command * cmd)
 {
 	// this command goes on the end, so ensure the queue terminates
 	cmd->next = NULL;
 
-	jtag_command_t **last_cmd = next_command_pointer;
+	struct jtag_command **last_cmd = next_command_pointer;
 	assert(NULL != last_cmd);
 	assert(NULL == *last_cmd);
 	*last_cmd = cmd;
@@ -179,7 +179,7 @@ int jtag_build_buffer(const struct scan_command *cmd, uint8_t **buffer)
 	int i;
 
 	bit_count = jtag_scan_size(cmd);
-	*buffer = calloc(1,CEIL(bit_count, 8));
+	*buffer = calloc(1,DIV_ROUND_UP(bit_count, 8));
 
 	bit_count = 0;
 
@@ -235,7 +235,7 @@ int jtag_read_buffer(uint8_t *buffer, const struct scan_command *cmd)
 		if (cmd->fields[i].in_value)
 		{
 			int num_bits = cmd->fields[i].num_bits;
-			uint8_t *captured = buf_set_buf(buffer, bit_count, malloc(CEIL(num_bits, 8)), 0, num_bits);
+			uint8_t *captured = buf_set_buf(buffer, bit_count, malloc(DIV_ROUND_UP(num_bits, 8)), 0, num_bits);
 
 #ifdef _DEBUG_JTAG_IO_
 			char *char_buf = buf_to_str(captured,