scan_command_t -> struct scan_command

Remove misleading typedef on struct scan_command.

8 files changed, 42 insertions, 43 deletions

diff --git a/src/jtag/arm-jtag-ew.c b/src/jtag/arm-jtag-ew.c
index 3863e431..9befe098 100644
--- a/src/jtag/arm-jtag-ew.c
+++ b/src/jtag/arm-jtag-ew.c
@@ -71,7 +71,7 @@ static void armjtagew_end_state(tap_state_t state);
 static void armjtagew_state_move(void);
 static void armjtagew_path_move(int num_states, tap_state_t *path);
 static void armjtagew_runtest(int num_cycles);
-static void armjtagew_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command);
+static void armjtagew_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command);
 static void armjtagew_reset(int trst, int srst);
 //static void armjtagew_simple_command(uint8_t command);
 static int armjtagew_get_status(void);
@@ -81,7 +81,7 @@ static void armjtagew_tap_init(void);
 static int armjtagew_tap_execute(void);
 static void armjtagew_tap_ensure_space(int scans, int bits);
 static void armjtagew_tap_append_step(int tms, int tdi);
-static void armjtagew_tap_append_scan(int length, uint8_t *buffer, scan_command_t *command);
+static void armjtagew_tap_append_scan(int length, uint8_t *buffer, struct scan_command *command);
 
 /* ARM-JTAG-EW lowlevel functions */
 struct armjtagew {
@@ -382,7 +382,7 @@ static void armjtagew_runtest(int num_cycles)
 	}
 }
 
-static void armjtagew_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command)
+static void armjtagew_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command)
 {
 	tap_state_t saved_end_state;
 
@@ -545,7 +545,7 @@ static uint8_t tdo_buffer[ARMJTAGEW_TAP_BUFFER_SIZE];
 struct pending_scan_result {
 	int first;	/* First bit position in tdo_buffer to read */
 	int length; /* Number of bits to read */
-	scan_command_t *command; /* Corresponding scan command */
+	struct scan_command *command; /* Corresponding scan command */
 	uint8_t *buffer;
 };
 
@@ -609,7 +609,7 @@ static void armjtagew_tap_append_step(int tms, int tdi)
 	}
 }
 
-void armjtagew_tap_append_scan(int length, uint8_t *buffer, scan_command_t *command)
+void armjtagew_tap_append_scan(int length, uint8_t *buffer, struct scan_command *command)
 {
 	struct pending_scan_result *pending_scan_result = &pending_scan_results_buffer[pending_scan_results_length];
 	int i;
@@ -686,7 +686,7 @@ static int armjtagew_tap_execute(void)
 				uint8_t *buffer = pending_scan_result->buffer;
 				int length = pending_scan_result->length;
 				int first = pending_scan_result->first;
-				scan_command_t *command = pending_scan_result->command;
+				struct scan_command *command = pending_scan_result->command;
 
 				/* Copy to buffer */
 				buf_set_buf(tdo_buffer, first, buffer, 0, length);
diff --git a/src/jtag/bitq.c b/src/jtag/bitq.c
index 145324c7..ee7a073a 100644
--- a/src/jtag/bitq.c
+++ b/src/jtag/bitq.c
@@ -272,7 +272,7 @@ void bitq_scan_field(struct scan_field* field, int pause)
 }
 
 
-void bitq_scan(scan_command_t* cmd)
+void bitq_scan(struct scan_command* cmd)
 {
 	int i;
 
diff --git a/src/jtag/commands.c b/src/jtag/commands.c
index 70e30ab5..64bb993f 100644
--- a/src/jtag/commands.c
+++ b/src/jtag/commands.c
@@ -144,7 +144,7 @@ void jtag_command_queue_reset(void)
 	next_command_pointer = &jtag_command_queue;
 }
 
-enum scan_type jtag_scan_type(const scan_command_t *cmd)
+enum scan_type jtag_scan_type(const struct scan_command *cmd)
 {
 	int i;
 	int type = 0;
@@ -160,7 +160,7 @@ enum scan_type jtag_scan_type(const scan_command_t *cmd)
 	return type;
 }
 
-int jtag_scan_size(const scan_command_t *cmd)
+int jtag_scan_size(const struct scan_command *cmd)
 {
 	int bit_count = 0;
 	int i;
@@ -174,7 +174,7 @@ int jtag_scan_size(const scan_command_t *cmd)
 	return bit_count;
 }
 
-int jtag_build_buffer(const scan_command_t *cmd, uint8_t **buffer)
+int jtag_build_buffer(const struct scan_command *cmd, uint8_t **buffer)
 {
 	int bit_count = 0;
 	int i;
@@ -219,7 +219,7 @@ int jtag_build_buffer(const scan_command_t *cmd, uint8_t **buffer)
 	return bit_count;
 }
 
-int jtag_read_buffer(uint8_t *buffer, const scan_command_t *cmd)
+int jtag_read_buffer(uint8_t *buffer, const struct scan_command *cmd)
 {
 	int i;
 	int bit_count = 0;
diff --git a/src/jtag/commands.h b/src/jtag/commands.h
index ac440db6..d13a9ab4 100644
--- a/src/jtag/commands.h
+++ b/src/jtag/commands.h
@@ -46,8 +46,7 @@ enum scan_type {
  * The scan_command provide a means of encapsulating a set of scan_field_s
  * structures that should be scanned in/out to the device.
  */
-typedef struct scan_command_s
-{
+struct scan_command {
 	/// instruction/not data scan
 	bool ir_scan;
 	/// number of fields in *fields array
@@ -56,7 +55,7 @@ typedef struct scan_command_s
 	struct scan_field* fields;
 	/// state in which JTAG commands should finish
 	tap_state_t end_state;
-} scan_command_t;
+};
 
 typedef struct statemove_command_s
 {
@@ -114,7 +113,7 @@ typedef struct sleep_command_s
  */
 typedef union jtag_command_container_u
 {
-	scan_command_t*         scan;
+	struct scan_command*         scan;
 	statemove_command_t*    statemove;
 	pathmove_command_t*     pathmove;
 	runtest_command_t*      runtest;
@@ -154,9 +153,9 @@ void cmd_queue_free(void);
 void jtag_queue_command(jtag_command_t *cmd);
 void jtag_command_queue_reset(void);
 
-enum scan_type jtag_scan_type(const scan_command_t* cmd);
-int jtag_scan_size(const scan_command_t* cmd);
-int jtag_read_buffer(uint8_t* buffer, const scan_command_t* cmd);
-int jtag_build_buffer(const scan_command_t* cmd, uint8_t** buffer);
+enum scan_type jtag_scan_type(const struct scan_command* cmd);
+int jtag_scan_size(const struct scan_command* cmd);
+int jtag_read_buffer(uint8_t* buffer, const struct scan_command* cmd);
+int jtag_build_buffer(const struct scan_command* cmd, uint8_t** buffer);
 
 #endif // JTAG_COMMANDS_H
diff --git a/src/jtag/driver.c b/src/jtag/driver.c
index de7b789e..d50ae905 100644
--- a/src/jtag/driver.c
+++ b/src/jtag/driver.c
@@ -78,7 +78,7 @@ int interface_jtag_add_ir_scan(int in_num_fields, const struct scan_field *in_fi
 	size_t num_taps = jtag_tap_count_enabled();
 
 	jtag_command_t * cmd		= cmd_queue_alloc(sizeof(jtag_command_t));
-	scan_command_t * scan		= cmd_queue_alloc(sizeof(scan_command_t));
+	struct scan_command * scan		= cmd_queue_alloc(sizeof(struct scan_command));
 	struct scan_field * out_fields	= cmd_queue_alloc(num_taps  * sizeof(struct scan_field));
 
 	jtag_queue_command(cmd);
@@ -151,7 +151,7 @@ int interface_jtag_add_plain_ir_scan(int in_num_fields, const struct scan_field
 {
 
 	jtag_command_t * cmd		= cmd_queue_alloc(sizeof(jtag_command_t));
-	scan_command_t * scan		= cmd_queue_alloc(sizeof(scan_command_t));
+	struct scan_command * scan		= cmd_queue_alloc(sizeof(struct scan_command));
 	struct scan_field * out_fields	= cmd_queue_alloc(in_num_fields * sizeof(struct scan_field));
 
 	jtag_queue_command(cmd);
@@ -189,7 +189,7 @@ int interface_jtag_add_dr_scan(int in_num_fields, const struct scan_field *in_fi
 	}
 
 	jtag_command_t * cmd		= cmd_queue_alloc(sizeof(jtag_command_t));
-	scan_command_t * scan		= cmd_queue_alloc(sizeof(scan_command_t));
+	struct scan_command * scan		= cmd_queue_alloc(sizeof(struct scan_command));
 	struct scan_field * out_fields	= cmd_queue_alloc((in_num_fields + bypass_devices) * sizeof(struct scan_field));
 
 	jtag_queue_command(cmd);
@@ -279,7 +279,7 @@ void interface_jtag_add_dr_out(struct jtag_tap *target_tap,
 
 
 	jtag_command_t * cmd		= cmd_queue_alloc(sizeof(jtag_command_t));
-	scan_command_t * scan		= cmd_queue_alloc(sizeof(scan_command_t));
+	struct scan_command * scan		= cmd_queue_alloc(sizeof(struct scan_command));
 	struct scan_field * out_fields	= cmd_queue_alloc((in_num_fields + bypass_devices) * sizeof(struct scan_field));
 
 	jtag_queue_command(cmd);
@@ -347,7 +347,7 @@ void interface_jtag_add_dr_out(struct jtag_tap *target_tap,
 int interface_jtag_add_plain_dr_scan(int in_num_fields, const struct scan_field *in_fields, tap_state_t state)
 {
 	jtag_command_t * cmd		= cmd_queue_alloc(sizeof(jtag_command_t));
-	scan_command_t * scan		= cmd_queue_alloc(sizeof(scan_command_t));
+	struct scan_command * scan		= cmd_queue_alloc(sizeof(struct scan_command));
 	struct scan_field * out_fields	= cmd_queue_alloc(in_num_fields * sizeof(struct scan_field));
 
 	jtag_queue_command(cmd);
diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c
index e6498e93..18bb955b 100644
--- a/src/jtag/ft2232.c
+++ b/src/jtag/ft2232.c
@@ -956,7 +956,7 @@ static void ft2232_add_scan(bool ir_scan, enum scan_type type, uint8_t* buffer,
 	}
 }
 
-static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t* buffer, int scan_size)
+static int ft2232_large_scan(struct scan_command* cmd, enum scan_type type, uint8_t* buffer, int scan_size)
 {
 	int num_bytes = (scan_size + 7) / 8;
 	int bits_left = scan_size;
diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c
index 78efc5ef..140949a4 100644
--- a/src/jtag/jlink.c
+++ b/src/jtag/jlink.c
@@ -100,7 +100,7 @@ static void jlink_end_state(tap_state_t state);
 static void jlink_state_move(void);
 static void jlink_path_move(int num_states, tap_state_t *path);
 static void jlink_runtest(int num_cycles);
-static void jlink_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command);
+static void jlink_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command);
 static void jlink_reset(int trst, int srst);
 static void jlink_simple_command(uint8_t command);
 static int jlink_get_status(void);
@@ -110,7 +110,7 @@ static void jlink_tap_init(void);
 static int jlink_tap_execute(void);
 static void jlink_tap_ensure_space(int scans, int bits);
 static void jlink_tap_append_step(int tms, int tdi);
-static void jlink_tap_append_scan(int length, uint8_t *buffer, scan_command_t *command);
+static void jlink_tap_append_scan(int length, uint8_t *buffer, struct scan_command *command);
 
 /* Jlink lowlevel functions */
 struct jlink {
@@ -449,7 +449,7 @@ static void jlink_runtest(int num_cycles)
 	}
 }
 
-static void jlink_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command)
+static void jlink_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command)
 {
 	tap_state_t saved_end_state;
 
@@ -677,7 +677,7 @@ static uint8_t tdo_buffer[JLINK_TAP_BUFFER_SIZE];
 struct pending_scan_result {
 	int first;	/* First bit position in tdo_buffer to read */
 	int length; /* Number of bits to read */
-	scan_command_t *command; /* Corresponding scan command */
+	struct scan_command *command; /* Corresponding scan command */
 	uint8_t *buffer;
 };
 
@@ -736,7 +736,7 @@ static void jlink_tap_append_step(int tms, int tdi)
 	tap_length++;
 }
 
-static void jlink_tap_append_scan(int length, uint8_t *buffer, scan_command_t *command)
+static void jlink_tap_append_scan(int length, uint8_t *buffer, struct scan_command *command)
 {
 	struct pending_scan_result *pending_scan_result =
 		&pending_scan_results_buffer[pending_scan_results_length];
@@ -804,7 +804,7 @@ static int jlink_tap_execute(void)
 		uint8_t *buffer = pending_scan_result->buffer;
 		int length = pending_scan_result->length;
 		int first = pending_scan_result->first;
-		scan_command_t *command = pending_scan_result->command;
+		struct scan_command *command = pending_scan_result->command;
 
 		/* Copy to buffer */
 		buf_set_buf(tdo_buffer, first, buffer, 0, length);
diff --git a/src/jtag/vsllink.c b/src/jtag/vsllink.c
index 7baa1ac5..8ee62924 100644
--- a/src/jtag/vsllink.c
+++ b/src/jtag/vsllink.c
@@ -165,7 +165,7 @@ static uint8_t VSLLINK_BIT_MSK[8] =
 struct pending_scan_result {
 	int offset;
 	int length; /* Number of bits to read */
-	scan_command_t *command; /* Corresponding scan command */
+	struct scan_command *command; /* Corresponding scan command */
 	uint8_t *buffer;
 };
 
@@ -186,9 +186,9 @@ static void vsllink_runtest(int num_cycles);
 static void vsllink_stableclocks_dma(int num_cycles, int tms);
 static void vsllink_stableclocks_normal(int num_cycles, int tms);
 static void (*vsllink_stableclocks)(int num_cycles, int tms);
-static void vsllink_scan_dma(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command);
-static void vsllink_scan_normal(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command);
-static void (*vsllink_scan)(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command);
+static void vsllink_scan_dma(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command);
+static void vsllink_scan_normal(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command);
+static void (*vsllink_scan)(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command);
 static void vsllink_reset(int trst, int srst);
 static void vsllink_simple_command(uint8_t command);
 static int vsllink_connect(void);
@@ -205,8 +205,8 @@ static int (*vsllink_tap_execute)(void);
 static void vsllink_tap_ensure_space_dma(int scans, int length);
 static void vsllink_tap_ensure_space_normal(int scans, int length);
 static void (*vsllink_tap_ensure_space)(int scans, int length);
-static void vsllink_tap_append_scan_dma(int length, uint8_t *buffer, scan_command_t *command);
-static void vsllink_tap_append_scan_normal(int length, uint8_t *buffer, scan_command_t *command, int offset);
+static void vsllink_tap_append_scan_dma(int length, uint8_t *buffer, struct scan_command *command);
+static void vsllink_tap_append_scan_normal(int length, uint8_t *buffer, struct scan_command *command, int offset);
 
 /* VSLLink lowlevel functions */
 struct vsllink {
@@ -1137,7 +1137,7 @@ static void vsllink_runtest(int num_cycles)
 	}
 }
 
-static void vsllink_scan_normal(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command)
+static void vsllink_scan_normal(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command)
 {
 	tap_state_t saved_end_state;
 	uint8_t bits_left, tms_tmp, tdi_len;
@@ -1253,7 +1253,7 @@ static void vsllink_scan_normal(bool ir_scan, enum scan_type type, uint8_t *buff
 
 	tap_set_state(tap_get_end_state());
 }
-static void vsllink_scan_dma(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command)
+static void vsllink_scan_dma(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command)
 {
 	tap_state_t saved_end_state;
 
@@ -1483,7 +1483,7 @@ static void vsllink_tap_append_step(int tms, int tdi)
 	}
 }
 
-static void vsllink_tap_append_scan_normal(int length, uint8_t *buffer, scan_command_t *command, int offset)
+static void vsllink_tap_append_scan_normal(int length, uint8_t *buffer, struct scan_command *command, int offset)
 {
 	struct pending_scan_result *pending_scan_result = &pending_scan_results_buffer[pending_scan_results_length];
 	int i;
@@ -1508,7 +1508,7 @@ static void vsllink_tap_append_scan_normal(int length, uint8_t *buffer, scan_com
 
 	pending_scan_results_length++;
 }
-static void vsllink_tap_append_scan_dma(int length, uint8_t *buffer, scan_command_t *command)
+static void vsllink_tap_append_scan_dma(int length, uint8_t *buffer, struct scan_command *command)
 {
 	struct pending_scan_result *pending_scan_result;
 	int len_tmp, len_all, i;
@@ -1592,7 +1592,7 @@ static int vsllink_tap_execute_normal(void)
 				uint8_t *buffer = pending_scan_result->buffer;
 				int length = pending_scan_result->length;
 				int offset = pending_scan_result->offset;
-				scan_command_t *command = pending_scan_result->command;
+				struct scan_command *command = pending_scan_result->command;
 
 				if (buffer != NULL)
 				{
@@ -1666,7 +1666,7 @@ static int vsllink_tap_execute_dma(void)
 				int length = pending_scan_result->length;
 				int first = pending_scan_result->offset;
 
-				scan_command_t *command = pending_scan_result->command;
+				struct scan_command *command = pending_scan_result->command;
 				buf_set_buf(vsllink_usb_in_buffer, first, buffer, 0, length);
 
 				DEBUG_JTAG_IO("JTAG scan read(%d bits, from %d bits):", length, first);