X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fdriver.c;h=de7b789e28cc7a63a49f58064811b3d02cf44292;hb=d0809ac060b35a04e7f0bceb96e1868663bd18df;hp=9f53f2767d5ad11e94c9ac1d1f03a50c49985003;hpb=c18947b947064e7eceed8047c42d4c8dfd8ae964;p=openocd.git diff --git a/src/jtag/driver.c b/src/jtag/driver.c index 9f53f2767d..de7b789e28 100644 --- a/src/jtag/driver.c +++ b/src/jtag/driver.c @@ -40,7 +40,7 @@ struct jtag_callback_entry struct jtag_callback_entry *next; jtag_callback_t callback; - uint8_t *in; + jtag_callback_data_t data0; jtag_callback_data_t data1; jtag_callback_data_t data2; jtag_callback_data_t data3; @@ -56,11 +56,11 @@ static void jtag_callback_queue_reset(void) } /** - * Copy a scan_field_t for insertion into the queue. + * Copy a struct scan_field for insertion into the queue. * * This allocates a new copy of out_value using cmd_queue_alloc. */ -static void cmd_queue_scan_field_clone(scan_field_t * dst, const scan_field_t * src) +static void cmd_queue_scan_field_clone(struct scan_field * dst, const struct scan_field * src) { dst->tap = src->tap; dst->num_bits = src->num_bits; @@ -73,13 +73,13 @@ static void cmd_queue_scan_field_clone(scan_field_t * dst, const scan_field_t * * see jtag_add_ir_scan() * */ -int interface_jtag_add_ir_scan(int in_num_fields, const scan_field_t *in_fields, tap_state_t state) +int interface_jtag_add_ir_scan(int in_num_fields, const struct scan_field *in_fields, tap_state_t state) { 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)); - scan_field_t * out_fields = cmd_queue_alloc(num_taps * sizeof(scan_field_t)); + struct scan_field * out_fields = cmd_queue_alloc(num_taps * sizeof(struct scan_field)); jtag_queue_command(cmd); @@ -92,11 +92,11 @@ int interface_jtag_add_ir_scan(int in_num_fields, const scan_field_t *in_fields, scan->end_state = state; - scan_field_t * field = out_fields; /* keep track where we insert data */ + struct scan_field * field = out_fields; /* keep track where we insert data */ /* loop over all enabled TAPs */ - for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap)) + for (struct jtag_tap * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap)) { /* search the input field list for fields for the current TAP */ @@ -147,12 +147,12 @@ int interface_jtag_add_ir_scan(int in_num_fields, const scan_field_t *in_fields, * see jtag_add_plain_ir_scan() * */ -int interface_jtag_add_plain_ir_scan(int in_num_fields, const scan_field_t *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)); scan_command_t * scan = cmd_queue_alloc(sizeof(scan_command_t)); - scan_field_t * out_fields = cmd_queue_alloc(in_num_fields * sizeof(scan_field_t)); + struct scan_field * out_fields = cmd_queue_alloc(in_num_fields * sizeof(struct scan_field)); jtag_queue_command(cmd); @@ -176,13 +176,13 @@ int interface_jtag_add_plain_ir_scan(int in_num_fields, const scan_field_t *in_f * see jtag_add_dr_scan() * */ -int interface_jtag_add_dr_scan(int in_num_fields, const scan_field_t *in_fields, tap_state_t state) +int interface_jtag_add_dr_scan(int in_num_fields, const struct scan_field *in_fields, tap_state_t state) { /* count devices in bypass */ size_t bypass_devices = 0; - for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap)) + for (struct jtag_tap * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap)) { if (tap->bypass) bypass_devices++; @@ -190,7 +190,7 @@ int interface_jtag_add_dr_scan(int in_num_fields, const scan_field_t *in_fields, jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t)); scan_command_t * scan = cmd_queue_alloc(sizeof(scan_command_t)); - scan_field_t * out_fields = cmd_queue_alloc((in_num_fields + bypass_devices) * sizeof(scan_field_t)); + struct scan_field * out_fields = cmd_queue_alloc((in_num_fields + bypass_devices) * sizeof(struct scan_field)); jtag_queue_command(cmd); @@ -203,17 +203,17 @@ int interface_jtag_add_dr_scan(int in_num_fields, const scan_field_t *in_fields, scan->end_state = state; - scan_field_t * field = out_fields; /* keep track where we insert data */ + struct scan_field * field = out_fields; /* keep track where we insert data */ /* loop over all enabled TAPs */ - for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap)) + for (struct jtag_tap * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap)) { /* if TAP is not bypassed insert matching input fields */ if (!tap->bypass) { - scan_field_t * start_field = field; /* keep initial position for assert() */ + struct scan_field * start_field = field; /* keep initial position for assert() */ for (int j = 0; j < in_num_fields; j++) { @@ -261,17 +261,17 @@ int interface_jtag_add_dr_scan(int in_num_fields, const scan_field_t *in_fields, * The bypass status of TAPs is set by jtag_add_ir_scan(). * */ -void interface_jtag_add_dr_out(jtag_tap_t *target_tap, +void interface_jtag_add_dr_out(struct jtag_tap *target_tap, int in_num_fields, const int *num_bits, - const u32 *value, + const uint32_t *value, tap_state_t end_state) { /* count devices in bypass */ size_t bypass_devices = 0; - for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap)) + for (struct jtag_tap * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap)) { if (tap->bypass) bypass_devices++; @@ -280,7 +280,7 @@ void interface_jtag_add_dr_out(jtag_tap_t *target_tap, jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t)); scan_command_t * scan = cmd_queue_alloc(sizeof(scan_command_t)); - scan_field_t * out_fields = cmd_queue_alloc((in_num_fields + bypass_devices) * sizeof(scan_field_t)); + struct scan_field * out_fields = cmd_queue_alloc((in_num_fields + bypass_devices) * sizeof(struct scan_field)); jtag_queue_command(cmd); @@ -295,11 +295,11 @@ void interface_jtag_add_dr_out(jtag_tap_t *target_tap, bool target_tap_match = false; - scan_field_t * field = out_fields; /* keep track where we insert data */ + struct scan_field * field = out_fields; /* keep track where we insert data */ /* loop over all enabled TAPs */ - for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap)) + for (struct jtag_tap * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap)) { /* if TAP is not bypassed insert matching input fields */ @@ -344,11 +344,11 @@ void interface_jtag_add_dr_out(jtag_tap_t *target_tap, * see jtag_add_plain_dr_scan() * */ -int interface_jtag_add_plain_dr_scan(int in_num_fields, const scan_field_t *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)); scan_command_t * scan = cmd_queue_alloc(sizeof(scan_command_t)); - scan_field_t * out_fields = cmd_queue_alloc(in_num_fields * sizeof(scan_field_t)); + struct scan_field * out_fields = cmd_queue_alloc(in_num_fields * sizeof(struct scan_field)); jtag_queue_command(cmd); @@ -418,7 +418,7 @@ int interface_jtag_add_runtest(int num_cycles, tap_state_t state) return ERROR_OK; } -int interface_jtag_add_clocks( int num_cycles ) +int interface_jtag_add_clocks(int num_cycles) { /* allocate memory for a new list member */ jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t)); @@ -449,7 +449,7 @@ int interface_jtag_add_reset(int req_trst, int req_srst) return ERROR_OK; } -int interface_jtag_add_sleep(u32 us) +int interface_jtag_add_sleep(uint32_t us) { /* allocate memory for a new list member */ jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t)); @@ -465,38 +465,43 @@ int interface_jtag_add_sleep(u32 us) } /* add callback to end of queue */ -void interface_jtag_add_callback4(jtag_callback_t callback, uint8_t *in, jtag_callback_data_t data1, jtag_callback_data_t data2, jtag_callback_data_t data3) +void interface_jtag_add_callback4(jtag_callback_t callback, jtag_callback_data_t data0, jtag_callback_data_t data1, jtag_callback_data_t data2, jtag_callback_data_t data3) { - struct jtag_callback_entry *entry=cmd_queue_alloc(sizeof(struct jtag_callback_entry)); + struct jtag_callback_entry *entry = cmd_queue_alloc(sizeof(struct jtag_callback_entry)); - entry->next=NULL; - entry->callback=callback; - entry->in=in; - entry->data1=data1; - entry->data2=data2; - entry->data3=data3; + entry->next = NULL; + entry->callback = callback; + entry->data0 = data0; + entry->data1 = data1; + entry->data2 = data2; + entry->data3 = data3; - if (jtag_callback_queue_head==NULL) + if (jtag_callback_queue_head == NULL) { - jtag_callback_queue_head=entry; - jtag_callback_queue_tail=entry; + jtag_callback_queue_head = entry; + jtag_callback_queue_tail = entry; } else { - jtag_callback_queue_tail->next=entry; - jtag_callback_queue_tail=entry; + jtag_callback_queue_tail->next = entry; + jtag_callback_queue_tail = entry; } } int interface_jtag_execute_queue(void) { + static int reentry = 0; + + assert(reentry==0); + reentry++; + int retval = default_interface_jtag_execute_queue(); if (retval == ERROR_OK) { struct jtag_callback_entry *entry; - for (entry=jtag_callback_queue_head; entry!=NULL; entry=entry->next) + for (entry = jtag_callback_queue_head; entry != NULL; entry = entry->next) { - retval=entry->callback(entry->in, entry->data1, entry->data2, entry->data3); - if (retval!=ERROR_OK) + retval = entry->callback(entry->data0, entry->data1, entry->data2, entry->data3); + if (retval != ERROR_OK) break; } } @@ -504,17 +509,19 @@ int interface_jtag_execute_queue(void) jtag_command_queue_reset(); jtag_callback_queue_reset(); + reentry--; + return retval; } -static int jtag_convert_to_callback4(uint8_t *in, jtag_callback_data_t data1, jtag_callback_data_t data2, jtag_callback_data_t data3) +static int jtag_convert_to_callback4(jtag_callback_data_t data0, jtag_callback_data_t data1, jtag_callback_data_t data2, jtag_callback_data_t data3) { - ((jtag_callback1_t)data1)(in); + ((jtag_callback1_t)data1)(data0); return ERROR_OK; } -void interface_jtag_add_callback(jtag_callback1_t callback, uint8_t *in) +void interface_jtag_add_callback(jtag_callback1_t callback, jtag_callback_data_t data0) { - jtag_add_callback4(jtag_convert_to_callback4, in, (jtag_callback_data_t)callback, 0, 0); + jtag_add_callback4(jtag_convert_to_callback4, data0, (jtag_callback_data_t)callback, 0, 0); }