interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

jtag_command_t -> struct jtag_command 

Remove useless typedef from struct jtag_command.
This commit is contained in:
Zachary T Welch 2009-11-13 06:15:31 -08:00
parent 1053c32d9e
commit 246068fd89
12 changed files with 50 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jtag/amt_jtagaccel.c
View File

@ -289,7 +289,7 @@ static void amt_jtagaccel_scan(bool ir_scan, enum scan_type type, uint8_t *buffe
static int amt_jtagaccel_execute_queue(void) static int amt_jtagaccel_execute_queue(void)
{ {
jtag_command_t *cmd = jtag_command_queue; /* currently processed command */ struct jtag_command *cmd = jtag_command_queue; /* currently processed command */
int scan_size; int scan_size;
enum scan_type type; enum scan_type type;
uint8_t *buffer; uint8_t *buffer;

2
src/jtag/arm-jtag-ew.c
View File

@ -122,7 +122,7 @@ struct jtag_interface armjtagew_interface =
static int armjtagew_execute_queue(void) static int armjtagew_execute_queue(void)
{ {
jtag_command_t *cmd = jtag_command_queue; struct jtag_command *cmd = jtag_command_queue;
int scan_size; int scan_size;
enum scan_type type; enum scan_type type;
uint8_t *buffer; uint8_t *buffer;

2
src/jtag/bitbang.c
View File

@ -230,7 +230,7 @@ static void bitbang_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int
int bitbang_execute_queue(void) int bitbang_execute_queue(void)
{ {
jtag_command_t *cmd = jtag_command_queue; /* currently processed command */ struct jtag_command *cmd = jtag_command_queue; /* currently processed command */
int scan_size; int scan_size;
enum scan_type type; enum scan_type type;
uint8_t *buffer; uint8_t *buffer;

4
src/jtag/bitq.c
View File

@ -29,7 +29,7 @@ struct bitq_interface* bitq_interface; /* low level bit queue interface */
/* state of input queue */ /* state of input queue */
struct bitq_state { struct bitq_state {
jtag_command_t *cmd; /* command currently processed */ struct jtag_command *cmd; /* command currently processed */
int field_idx; /* index of field currently being processed */ int field_idx; /* index of field currently being processed */
int bit_pos; /* position of bit curently being processed */ int bit_pos; /* position of bit curently being processed */
int status; /* processing status */ int status; /* processing status */
@ -290,7 +290,7 @@ void bitq_scan(struct scan_command* cmd)
int bitq_execute_queue(void) int bitq_execute_queue(void)
{ {
jtag_command_t* cmd = jtag_command_queue; /* currently processed command */ struct jtag_command* cmd = jtag_command_queue; /* currently processed command */
bitq_in_state.cmd = jtag_command_queue; bitq_in_state.cmd = jtag_command_queue;
bitq_in_state.field_idx = 0; bitq_in_state.field_idx = 0;

8
src/jtag/commands.c
View File

@ -42,15 +42,15 @@ struct cmd_queue_page {
#define CMD_QUEUE_PAGE_SIZE (1024 * 1024) #define CMD_QUEUE_PAGE_SIZE (1024 * 1024)
static struct cmd_queue_page *cmd_queue_pages = NULL; static struct cmd_queue_page *cmd_queue_pages = NULL;
jtag_command_t *jtag_command_queue = NULL; struct jtag_command *jtag_command_queue = NULL;
static jtag_command_t **next_command_pointer = &jtag_command_queue; 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 // this command goes on the end, so ensure the queue terminates
cmd->next = NULL; 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);
assert(NULL == *last_cmd); assert(NULL == *last_cmd);
*last_cmd = cmd; *last_cmd = cmd;

11
src/jtag/commands.h
View File

@ -129,20 +129,19 @@ enum jtag_command_type {
JTAG_STABLECLOCKS = 8 JTAG_STABLECLOCKS = 8
}; };
typedef struct jtag_command_s struct jtag_command {
{
union jtag_command_container cmd; union jtag_command_container cmd;
enum jtag_command_type type; enum jtag_command_type type;
struct jtag_command_s* next; struct jtag_command *next;
} jtag_command_t; };
/// The current queue of jtag_command_s structures. /// The current queue of jtag_command_s structures.
extern jtag_command_t* jtag_command_queue; extern struct jtag_command* jtag_command_queue;
void* cmd_queue_alloc(size_t size); void* cmd_queue_alloc(size_t size);
void cmd_queue_free(void); void cmd_queue_free(void);
void jtag_queue_command(jtag_command_t *cmd); void jtag_queue_command(struct jtag_command *cmd);
void jtag_command_queue_reset(void); void jtag_command_queue_reset(void);
enum scan_type jtag_scan_type(const struct scan_command* cmd); enum scan_type jtag_scan_type(const struct scan_command* cmd);

22
src/jtag/driver.c
View File

@ -77,7 +77,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(); size_t num_taps = jtag_tap_count_enabled();
jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t)); struct jtag_command * cmd = cmd_queue_alloc(sizeof(struct jtag_command));
struct scan_command * scan = cmd_queue_alloc(sizeof(struct scan_command)); 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)); struct scan_field * out_fields = cmd_queue_alloc(num_taps * sizeof(struct scan_field));
@ -150,7 +150,7 @@ int interface_jtag_add_ir_scan(int in_num_fields, const struct scan_field *in_fi
int interface_jtag_add_plain_ir_scan(int in_num_fields, const struct scan_field *in_fields, tap_state_t state) int interface_jtag_add_plain_ir_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)); struct jtag_command * cmd = cmd_queue_alloc(sizeof(struct jtag_command));
struct scan_command * scan = cmd_queue_alloc(sizeof(struct scan_command)); 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)); struct scan_field * out_fields = cmd_queue_alloc(in_num_fields * sizeof(struct scan_field));
@ -188,7 +188,7 @@ int interface_jtag_add_dr_scan(int in_num_fields, const struct scan_field *in_fi
bypass_devices++; bypass_devices++;
} }
jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t)); struct jtag_command * cmd = cmd_queue_alloc(sizeof(struct jtag_command));
struct scan_command * scan = cmd_queue_alloc(sizeof(struct scan_command)); 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)); struct scan_field * out_fields = cmd_queue_alloc((in_num_fields + bypass_devices) * sizeof(struct scan_field));
@ -278,7 +278,7 @@ void interface_jtag_add_dr_out(struct jtag_tap *target_tap,
} }
jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t)); struct jtag_command * cmd = cmd_queue_alloc(sizeof(struct jtag_command));
struct scan_command * scan = cmd_queue_alloc(sizeof(struct scan_command)); 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)); struct scan_field * out_fields = cmd_queue_alloc((in_num_fields + bypass_devices) * sizeof(struct scan_field));
@ -346,7 +346,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) 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)); struct jtag_command * cmd = cmd_queue_alloc(sizeof(struct jtag_command));
struct scan_command * scan = cmd_queue_alloc(sizeof(struct scan_command)); 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)); struct scan_field * out_fields = cmd_queue_alloc(in_num_fields * sizeof(struct scan_field));
@ -371,7 +371,7 @@ int interface_jtag_add_tlr(void)
tap_state_t state = TAP_RESET; tap_state_t state = TAP_RESET;
/* allocate memory for a new list member */ /* allocate memory for a new list member */
jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t)); struct jtag_command * cmd = cmd_queue_alloc(sizeof(struct jtag_command));
jtag_queue_command(cmd); jtag_queue_command(cmd);
@ -386,7 +386,7 @@ int interface_jtag_add_tlr(void)
int interface_jtag_add_pathmove(int num_states, const tap_state_t *path) int interface_jtag_add_pathmove(int num_states, const tap_state_t *path)
{ {
/* allocate memory for a new list member */ /* allocate memory for a new list member */
jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t)); struct jtag_command * cmd = cmd_queue_alloc(sizeof(struct jtag_command));
jtag_queue_command(cmd); jtag_queue_command(cmd);
@ -405,7 +405,7 @@ int interface_jtag_add_pathmove(int num_states, const tap_state_t *path)
int interface_jtag_add_runtest(int num_cycles, tap_state_t state) int interface_jtag_add_runtest(int num_cycles, tap_state_t state)
{ {
/* allocate memory for a new list member */ /* allocate memory for a new list member */
jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t)); struct jtag_command * cmd = cmd_queue_alloc(sizeof(struct jtag_command));
jtag_queue_command(cmd); jtag_queue_command(cmd);
@ -421,7 +421,7 @@ int interface_jtag_add_runtest(int num_cycles, tap_state_t state)
int interface_jtag_add_clocks(int num_cycles) int interface_jtag_add_clocks(int num_cycles)
{ {
/* allocate memory for a new list member */ /* allocate memory for a new list member */
jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t)); struct jtag_command * cmd = cmd_queue_alloc(sizeof(struct jtag_command));
jtag_queue_command(cmd); jtag_queue_command(cmd);
@ -436,7 +436,7 @@ int interface_jtag_add_clocks(int num_cycles)
int interface_jtag_add_reset(int req_trst, int req_srst) int interface_jtag_add_reset(int req_trst, int req_srst)
{ {
/* allocate memory for a new list member */ /* allocate memory for a new list member */
jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t)); struct jtag_command * cmd = cmd_queue_alloc(sizeof(struct jtag_command));
jtag_queue_command(cmd); jtag_queue_command(cmd);
@ -452,7 +452,7 @@ int interface_jtag_add_reset(int req_trst, int req_srst)
int interface_jtag_add_sleep(uint32_t us) int interface_jtag_add_sleep(uint32_t us)
{ {
/* allocate memory for a new list member */ /* allocate memory for a new list member */
jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t)); struct jtag_command * cmd = cmd_queue_alloc(sizeof(struct jtag_command));
jtag_queue_command(cmd); jtag_queue_command(cmd);

28
src/jtag/ft2232.c
View File

@ -100,7 +100,7 @@
* *
* @returns ERROR_OK on success, or ERROR_JTAG_QUEUE_FAILED on failure. * @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_A = NULL;
static char* ft2232_device_desc = NULL; static char* ft2232_device_desc = NULL;
@ -196,7 +196,7 @@ static struct ftdi_context ftdic;
static enum ftdi_chip_type ftdi_device; static enum ftdi_chip_type ftdi_device;
#endif #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; static int require_send;
/* http://urjtag.wiki.sourceforge.net/Cable + FT2232 says: /* http://urjtag.wiki.sourceforge.net/Cable + FT2232 says:
@ -617,9 +617,9 @@ static void ft2232_debug_dump_buffer(void)
LOG_DEBUG("%s", line); 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; uint8_t* buffer;
int scan_size; int scan_size;
enum scan_type type; enum scan_type type;
@ -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); 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 retval;
int i; int i;
@ -1555,7 +1555,7 @@ static int ft2232_execute_runtest(jtag_command_t *cmd)
return retval; 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 predicted_size = 0;
int retval = ERROR_OK; int retval = ERROR_OK;
@ -1592,7 +1592,7 @@ static int ft2232_execute_statemove(jtag_command_t *cmd)
return retval; 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 predicted_size = 0;
int retval = ERROR_OK; int retval = ERROR_OK;
@ -1621,7 +1621,7 @@ static int ft2232_execute_pathmove(jtag_command_t *cmd)
return retval; return retval;
} }
static int ft2232_execute_scan(jtag_command_t *cmd) static int ft2232_execute_scan(struct jtag_command *cmd)
{ {
uint8_t* buffer; uint8_t* buffer;
int scan_size; /* size of IR or DR scan */ 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 retval;
int predicted_size = 0; int predicted_size = 0;
@ -1708,7 +1708,7 @@ static int ft2232_execute_reset(jtag_command_t *cmd)
return retval; return retval;
} }
static int ft2232_execute_sleep(jtag_command_t *cmd) static int ft2232_execute_sleep(struct jtag_command *cmd)
{ {
int retval; int retval;
retval = ERROR_OK; retval = ERROR_OK;
@ -1725,7 +1725,7 @@ static int ft2232_execute_sleep(jtag_command_t *cmd)
return retval; return retval;
} }
static int ft2232_execute_stableclocks(jtag_command_t *cmd) static int ft2232_execute_stableclocks(struct jtag_command *cmd)
{ {
int retval; int retval;
retval = ERROR_OK; retval = ERROR_OK;
@ -1741,7 +1741,7 @@ static int ft2232_execute_stableclocks(jtag_command_t *cmd)
return retval; return retval;
} }
static int ft2232_execute_command(jtag_command_t *cmd) static int ft2232_execute_command(struct jtag_command *cmd)
{ {
int retval; int retval;
retval = ERROR_OK; retval = ERROR_OK;
@ -1764,7 +1764,7 @@ static int ft2232_execute_command(jtag_command_t *cmd)
static int ft2232_execute_queue(void) 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; int retval;
first_unsent = cmd; /* next command that has to be sent */ first_unsent = cmd; /* next command that has to be sent */
@ -2903,7 +2903,7 @@ COMMAND_HANDLER(ft2232_handle_latency_command)
return ERROR_OK; 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; int retval = 0;

2
src/jtag/gw16012.c
View File

@ -312,7 +312,7 @@ static void gw16012_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int
static int gw16012_execute_queue(void) static int gw16012_execute_queue(void)
{ {
jtag_command_t *cmd = jtag_command_queue; /* currently processed command */ struct jtag_command *cmd = jtag_command_queue; /* currently processed command */
int scan_size; int scan_size;
enum scan_type type; enum scan_type type;
uint8_t *buffer; uint8_t *buffer;

16
src/jtag/jlink.c
View File

@ -150,7 +150,7 @@ struct jtag_interface jlink_interface =
.quit = jlink_quit .quit = jlink_quit
}; };
static void jlink_execute_runtest(jtag_command_t *cmd) static void jlink_execute_runtest(struct jtag_command *cmd)
{ {
DEBUG_JTAG_IO("runtest %i cycles, end in %i", DEBUG_JTAG_IO("runtest %i cycles, end in %i",
cmd->cmd.runtest->num_cycles, cmd->cmd.runtest->num_cycles,
@ -161,7 +161,7 @@ static void jlink_execute_runtest(jtag_command_t *cmd)
jlink_runtest(cmd->cmd.runtest->num_cycles); jlink_runtest(cmd->cmd.runtest->num_cycles);
} }
static void jlink_execute_statemove(jtag_command_t *cmd) static void jlink_execute_statemove(struct jtag_command *cmd)
{ {
DEBUG_JTAG_IO("statemove end in %i", cmd->cmd.statemove->end_state); DEBUG_JTAG_IO("statemove end in %i", cmd->cmd.statemove->end_state);
@ -169,7 +169,7 @@ static void jlink_execute_statemove(jtag_command_t *cmd)
jlink_state_move(); jlink_state_move();
} }
static void jlink_execute_pathmove(jtag_command_t *cmd) static void jlink_execute_pathmove(struct jtag_command *cmd)
{ {
DEBUG_JTAG_IO("pathmove: %i states, end in %i", DEBUG_JTAG_IO("pathmove: %i states, end in %i",
cmd->cmd.pathmove->num_states, cmd->cmd.pathmove->num_states,
@ -179,7 +179,7 @@ static void jlink_execute_pathmove(jtag_command_t *cmd)
cmd->cmd.pathmove->path); cmd->cmd.pathmove->path);
} }
static void jlink_execute_scan(jtag_command_t *cmd) static void jlink_execute_scan(struct jtag_command *cmd)
{ {
int scan_size; int scan_size;
enum scan_type type; enum scan_type type;
@ -200,7 +200,7 @@ static void jlink_execute_scan(jtag_command_t *cmd)
type, buffer, scan_size, cmd->cmd.scan); type, buffer, scan_size, cmd->cmd.scan);
} }
static void jlink_execute_reset(jtag_command_t *cmd) static void jlink_execute_reset(struct jtag_command *cmd)
{ {
DEBUG_JTAG_IO("reset trst: %i srst %i", DEBUG_JTAG_IO("reset trst: %i srst %i",
cmd->cmd.reset->trst, cmd->cmd.reset->srst); cmd->cmd.reset->trst, cmd->cmd.reset->srst);
@ -210,14 +210,14 @@ static void jlink_execute_reset(jtag_command_t *cmd)
jlink_tap_execute(); jlink_tap_execute();
} }
static void jlink_execute_sleep(jtag_command_t *cmd) static void jlink_execute_sleep(struct jtag_command *cmd)
{ {
DEBUG_JTAG_IO("sleep %i", cmd->cmd.sleep->us); DEBUG_JTAG_IO("sleep %i", cmd->cmd.sleep->us);
jlink_tap_execute(); jlink_tap_execute();
jtag_sleep(cmd->cmd.sleep->us); jtag_sleep(cmd->cmd.sleep->us);
} }
static void jlink_execute_command(jtag_command_t *cmd) static void jlink_execute_command(struct jtag_command *cmd)
{ {
switch (cmd->type) switch (cmd->type)
{ {
@ -235,7 +235,7 @@ static void jlink_execute_command(jtag_command_t *cmd)
static int jlink_execute_queue(void) static int jlink_execute_queue(void)
{ {
jtag_command_t *cmd = jtag_command_queue; struct jtag_command *cmd = jtag_command_queue;
while (cmd != NULL) while (cmd != NULL)
{ {

2
src/jtag/usbprog.c
View File

@ -127,7 +127,7 @@ static int usbprog_register_commands(struct command_context_s *cmd_ctx)
static int usbprog_execute_queue(void) static int usbprog_execute_queue(void)
{ {
jtag_command_t *cmd = jtag_command_queue; /* currently processed command */ struct jtag_command *cmd = jtag_command_queue; /* currently processed command */
int scan_size; int scan_size;
enum scan_type type; enum scan_type type;
uint8_t *buffer; uint8_t *buffer;

2
src/jtag/vsllink.c
View File

@ -250,7 +250,7 @@ static void reset_command_pointer(void)
static int vsllink_execute_queue(void) static int vsllink_execute_queue(void)
{ {
jtag_command_t *cmd = jtag_command_queue; struct jtag_command *cmd = jtag_command_queue;
int scan_size; int scan_size;
enum scan_type type; enum scan_type type;
uint8_t *buffer; uint8_t *buffer;