X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fft2232.c;h=7acdf1a04802c97f6c2ffcb535d2eae67103d796;hb=0a9daddc2e20d9ff5053a9faf3e1ec11fd600c73;hp=18bb955b1766515776915f34cd60ce1eb1dff20b;hpb=2ddeec9db5a8771c948294b7194778a95295b7a0;p=openocd.git

diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c
index 18bb955b17..7acdf1a048 100644
--- a/src/jtag/ft2232.c
+++ b/src/jtag/ft2232.c
@@ -100,7 +100,7 @@
  *
  * @returns ERROR_OK on success, or ERROR_JTAG_QUEUE_FAILED on failure.
  */
-static int ft2232_stableclocks(int num_cycles, jtag_command_t* cmd);
+static int ft2232_stableclocks(int num_cycles, struct jtag_command* cmd);
 
 static char *       ft2232_device_desc_A = NULL;
 static char*        ft2232_device_desc = NULL;
@@ -196,7 +196,7 @@ static struct ftdi_context ftdic;
 static enum ftdi_chip_type ftdi_device;
 #endif
 
-static jtag_command_t* first_unsent;        /* next command that has to be sent */
+static struct jtag_command* first_unsent;        /* next command that has to be sent */
 static int             require_send;
 
 /*	http://urjtag.wiki.sourceforge.net/Cable + FT2232 says:
@@ -617,9 +617,9 @@ static void ft2232_debug_dump_buffer(void)
 		LOG_DEBUG("%s", line);
 }
 
-static int ft2232_send_and_recv(jtag_command_t* first, jtag_command_t* last)
+static int ft2232_send_and_recv(struct jtag_command* first, struct jtag_command* last)
 {
-	jtag_command_t* cmd;
+	struct jtag_command* cmd;
 	uint8_t* buffer;
 	int scan_size;
 	enum scan_type  type;
@@ -721,7 +721,7 @@ static int ft2232_send_and_recv(jtag_command_t* first, jtag_command_t* last)
 			if (type != SCAN_OUT)
 			{
 				scan_size = jtag_scan_size(cmd->cmd.scan);
-				buffer    = calloc(CEIL(scan_size, 8), 1);
+				buffer    = calloc(DIV_ROUND_UP(scan_size, 8), 1);
 				ft2232_read_scan(type, buffer, scan_size);
 				if (jtag_read_buffer(buffer, cmd->cmd.scan) != ERROR_OK)
 					retval = ERROR_JTAG_QUEUE_FAILED;
@@ -962,7 +962,7 @@ static int ft2232_large_scan(struct scan_command* cmd, enum scan_type type, uint
 	int bits_left = scan_size;
 	int cur_byte  = 0;
 	int last_bit;
-	uint8_t* receive_buffer  = malloc(CEIL(scan_size, 8));
+	uint8_t* receive_buffer  = malloc(DIV_ROUND_UP(scan_size, 8));
 	uint8_t* receive_pointer = receive_buffer;
 	uint32_t bytes_written;
 	uint32_t bytes_read;
@@ -1182,7 +1182,7 @@ static int ft2232_predict_scan_out(int scan_size, enum scan_type type)
 	if (type == SCAN_IN)	/* only from device to host */
 	{
 		/* complete bytes */
-		predicted_size += CEIL(num_bytes, 65536) * 3;
+		predicted_size += DIV_ROUND_UP(num_bytes, 65536) * 3;
 
 		/* remaining bits - 1 (up to 7) */
 		predicted_size += ((scan_size - 1) % 8) ? 2 : 0;
@@ -1190,7 +1190,7 @@ static int ft2232_predict_scan_out(int scan_size, enum scan_type type)
 	else	/* host to device, or bidirectional */
 	{
 		/* complete bytes */
-		predicted_size += num_bytes + CEIL(num_bytes, 65536) * 3;
+		predicted_size += num_bytes + DIV_ROUND_UP(num_bytes, 65536) * 3;
 
 		/* remaining bits -1 (up to 7) */
 		predicted_size += ((scan_size - 1) % 8) ? 3 : 0;
@@ -1206,7 +1206,7 @@ static int ft2232_predict_scan_in(int scan_size, enum scan_type type)
 	if (type != SCAN_OUT)
 	{
 		/* complete bytes */
-		predicted_size += (CEIL(scan_size, 8) > 1) ? (CEIL(scan_size, 8) - 1) : 0;
+		predicted_size += (DIV_ROUND_UP(scan_size, 8) > 1) ? (DIV_ROUND_UP(scan_size, 8) - 1) : 0;
 
 		/* remaining bits - 1 */
 		predicted_size += ((scan_size - 1) % 8) ? 1 : 0;
@@ -1491,7 +1491,7 @@ static void sheevaplug_reset(int trst, int srst)
 	LOG_DEBUG("trst: %i, srst: %i, high_output: 0x%2.2x, high_direction: 0x%2.2x", trst, srst, high_output, high_direction);
 }
 
-static int ft2232_execute_runtest(jtag_command_t *cmd)
+static int ft2232_execute_runtest(struct jtag_command *cmd)
 {
 	int retval;
 	int i;
@@ -1506,7 +1506,7 @@ static int ft2232_execute_runtest(jtag_command_t *cmd)
 	predicted_size = 0;
 	if (tap_get_state() != TAP_IDLE)
 		predicted_size += 3;
-	predicted_size += 3 * CEIL(cmd->cmd.runtest->num_cycles, 7);
+	predicted_size += 3 * DIV_ROUND_UP(cmd->cmd.runtest->num_cycles, 7);
 	if (cmd->cmd.runtest->end_state != TAP_IDLE)
 		predicted_size += 3;
 	if (tap_get_end_state() != TAP_IDLE)
@@ -1555,7 +1555,7 @@ static int ft2232_execute_runtest(jtag_command_t *cmd)
 	return retval;
 }
 
-static int ft2232_execute_statemove(jtag_command_t *cmd)
+static int ft2232_execute_statemove(struct jtag_command *cmd)
 {
 	int	predicted_size = 0;
 	int	retval = ERROR_OK;
@@ -1592,7 +1592,7 @@ static int ft2232_execute_statemove(jtag_command_t *cmd)
 	return retval;
 }
 
-static int ft2232_execute_pathmove(jtag_command_t *cmd)
+static int ft2232_execute_pathmove(struct jtag_command *cmd)
 {
 	int	predicted_size = 0;
 	int	retval = ERROR_OK;
@@ -1605,7 +1605,7 @@ static int ft2232_execute_pathmove(jtag_command_t *cmd)
 			tap_state_name(path[num_states-1]));
 
 	/* only send the maximum buffer size that FT2232C can handle */
-	predicted_size = 3 * CEIL(num_states, 7);
+	predicted_size = 3 * DIV_ROUND_UP(num_states, 7);
 	if (ft2232_buffer_size + predicted_size + 1 > FT2232_BUFFER_SIZE)
 	{
 		if (ft2232_send_and_recv(first_unsent, cmd) != ERROR_OK)
@@ -1621,7 +1621,7 @@ static int ft2232_execute_pathmove(jtag_command_t *cmd)
 	return retval;
 }
 
-static int ft2232_execute_scan(jtag_command_t *cmd)
+static int ft2232_execute_scan(struct jtag_command *cmd)
 {
 	uint8_t* buffer;
 	int scan_size;				/* size of IR or DR scan */
@@ -1676,7 +1676,7 @@ static int ft2232_execute_scan(jtag_command_t *cmd)
 
 }
 
-static int ft2232_execute_reset(jtag_command_t *cmd)
+static int ft2232_execute_reset(struct jtag_command *cmd)
 {
 	int retval;
 	int predicted_size = 0;
@@ -1708,24 +1708,24 @@ static int ft2232_execute_reset(jtag_command_t *cmd)
 	return retval;
 }
 
-static int ft2232_execute_sleep(jtag_command_t *cmd)
+static int ft2232_execute_sleep(struct jtag_command *cmd)
 {
 	int retval;
 	retval = ERROR_OK;
 
-	DEBUG_JTAG_IO("sleep %i", cmd->cmd.sleep->us);
+	DEBUG_JTAG_IO("sleep %" PRIi32, cmd->cmd.sleep->us);
 
 	if (ft2232_send_and_recv(first_unsent, cmd) != ERROR_OK)
 				retval = ERROR_JTAG_QUEUE_FAILED;
 	first_unsent = cmd->next;
 	jtag_sleep(cmd->cmd.sleep->us);
-	DEBUG_JTAG_IO("sleep %i usec while in %s",
+	DEBUG_JTAG_IO("sleep %" PRIi32 " usec while in %s",
 			cmd->cmd.sleep->us,
 			tap_state_name(tap_get_state()));
 	return retval;
 }
 
-static int ft2232_execute_stableclocks(jtag_command_t *cmd)
+static int ft2232_execute_stableclocks(struct jtag_command *cmd)
 {
 	int retval;
 	retval = ERROR_OK;
@@ -1741,7 +1741,7 @@ static int ft2232_execute_stableclocks(jtag_command_t *cmd)
 	return retval;
 }
 
-static int ft2232_execute_command(jtag_command_t *cmd)
+static int ft2232_execute_command(struct jtag_command *cmd)
 {
 	int retval;
 	retval = ERROR_OK;
@@ -1764,7 +1764,7 @@ static int ft2232_execute_command(jtag_command_t *cmd)
 
 static int ft2232_execute_queue(void)
 {
-	jtag_command_t* cmd = jtag_command_queue;	/* currently processed command */
+	struct jtag_command* cmd = jtag_command_queue;	/* currently processed command */
 	int retval;
 
 	first_unsent = cmd;		/* next command that has to be sent */
@@ -2903,7 +2903,7 @@ COMMAND_HANDLER(ft2232_handle_latency_command)
 	return ERROR_OK;
 }
 
-static int ft2232_stableclocks(int num_cycles, jtag_command_t* cmd)
+static int ft2232_stableclocks(int num_cycles, struct jtag_command* cmd)
 {
 	int retval = 0;
 
@@ -3969,7 +3969,7 @@ static void ktlink_blink(void)
 	buffer_write(high_direction);
 }
 
-static int ft2232_register_commands(struct command_context_s* cmd_ctx)
+static int ft2232_register_commands(struct command_context* cmd_ctx)
 {
 	register_command(cmd_ctx, NULL, "ft2232_device_desc",
 			ft2232_handle_device_desc_command, COMMAND_CONFIG,