X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fbitq.c;h=74555d2bc497d2c1486c104784c37f91571289b9;hb=7c393679c0cd8f7609a0d6b2329a1877de0f3d31;hp=0d71c3018061ed9b033f7ddcf17745853b90e2ad;hpb=e77ae9096a40707d3b878b46969a60a06656dc06;p=openocd.git diff --git a/src/jtag/bitq.c b/src/jtag/bitq.c index 0d71c30180..74555d2bc4 100644 --- a/src/jtag/bitq.c +++ b/src/jtag/bitq.c @@ -22,24 +22,22 @@ #endif #include "bitq.h" +#include "interface.h" -/* project specific includes */ -#include "log.h" -#include "types.h" -#include "jtag.h" -#include "configuration.h" -/* system includes */ -#include -#include -#include +struct bitq_interface* bitq_interface; /* low level bit queue interface */ -bitq_interface_t* bitq_interface; /* low level bit queue interface */ +/* state of input queue */ +struct bitq_state { + struct jtag_command *cmd; /* command currently processed */ + int field_idx; /* index of field currently being processed */ + int bit_pos; /* position of bit curently being processed */ + int status; /* processing status */ +}; +static struct bitq_state bitq_in_state; -bitq_state_t bitq_in_state; /* state of input queue */ - -u8* bitq_in_buffer; /* buffer dynamically reallocated as needed */ -unsigned long bitq_in_bufsize = 32; /* min. buffer size */ +static uint8_t* bitq_in_buffer; /* buffer dynamically reallocated as needed */ +static int bitq_in_bufsize = 32; /* min. buffer size */ /* * input queue processing does not use jtag_read_buffer() to avoid unnecessary overhead @@ -49,26 +47,26 @@ unsigned long bitq_in_bufsize = 32; /* min. buffer size */ void bitq_in_proc(void) { /* static information preserved between calls to increase performance */ - static u8* in_buff; /* pointer to buffer for scanned data */ + static uint8_t* in_buff; /* pointer to buffer for scanned data */ static int in_idx; /* index of byte being scanned */ - static u8 in_mask; /* mask of next bit to be scanned */ + static uint8_t in_mask; /* mask of next bit to be scanned */ - scan_field_t* field; + struct scan_field* field; int tdo; /* loop through the queue */ while (bitq_in_state.cmd) { /* only JTAG_SCAN command may return data */ - if (bitq_in_state.cmd->type==JTAG_SCAN) + if (bitq_in_state.cmd->type == JTAG_SCAN) { /* loop through the fields */ - while (bitq_in_state.field_idxcmd.scan->num_fields) + while (bitq_in_state.field_idx < bitq_in_state.cmd->cmd.scan->num_fields) { field = &bitq_in_state.cmd->cmd.scan->fields[bitq_in_state.field_idx]; - if (field->in_value || field->in_handler) + if (field->in_value) { - if (bitq_in_state.bit_pos==0) + if (bitq_in_state.bit_pos == 0) { /* initialize field scanning */ in_mask = 0x01; @@ -78,21 +76,21 @@ void bitq_in_proc(void) else { /* buffer reallocation needed? */ - if (field->num_bits>bitq_in_bufsize * 8) + if (field->num_bits > bitq_in_bufsize * 8) { /* buffer previously allocated? */ - if (bitq_in_buffer!=NULL) + if (bitq_in_buffer != NULL) { /* free it */ free(bitq_in_buffer); bitq_in_buffer = NULL; } /* double the buffer size until it fits */ - while (field->num_bits>bitq_in_bufsize * 8) + while (field->num_bits > bitq_in_bufsize * 8) bitq_in_bufsize *= 2; } /* if necessary, allocate buffer and check for malloc error */ - if (bitq_in_buffer==NULL && ( bitq_in_buffer = malloc(bitq_in_bufsize) )==NULL) + if (bitq_in_buffer == NULL && (bitq_in_buffer = malloc(bitq_in_bufsize)) == NULL) { LOG_ERROR("malloc error"); exit(-1); @@ -102,20 +100,20 @@ void bitq_in_proc(void) } /* field scanning */ - while (bitq_in_state.bit_posnum_bits) + while (bitq_in_state.bit_pos < field->num_bits) { - if ( ( tdo = bitq_interface->in() )<0 ) + if ((tdo = bitq_interface->in()) < 0) { #ifdef _DEBUG_JTAG_IO_ LOG_DEBUG("bitq in EOF"); #endif return; } - if (in_mask==0x01) + if (in_mask == 0x01) in_buff[in_idx] = 0; if (tdo) in_buff[in_idx] |= in_mask; - if (in_mask==0x80) + if (in_mask == 0x80) { in_mask = 0x01; in_idx++; @@ -124,12 +122,6 @@ void bitq_in_proc(void) in_mask <<= 1; bitq_in_state.bit_pos++; } - - - if (field->in_handler && bitq_in_state.status==ERROR_OK) - { - bitq_in_state.status = (*field->in_handler)(in_buff, field->in_handler_priv, field); - } } bitq_in_state.field_idx++; /* advance to next field */ @@ -146,16 +138,13 @@ void bitq_io(int tms, int tdi, int tdo_req) { bitq_interface->out(tms, tdi, tdo_req); /* check and process the input queue */ - if ( bitq_interface->in_rdy() ) + if (bitq_interface->in_rdy()) bitq_in_proc(); } void bitq_end_state(tap_state_t state) { - if (state==-1) - return; - if (!tap_is_state_stable(state)) { LOG_ERROR("BUG: %i is not a valid end state", state); @@ -168,7 +157,7 @@ void bitq_end_state(tap_state_t state) void bitq_state_move(tap_state_t new_state) { int i = 0; - u8 tms_scan; + uint8_t tms_scan; if (!tap_is_state_stable(tap_get_state()) || !tap_is_state_stable(new_state)) { @@ -177,8 +166,9 @@ void bitq_state_move(tap_state_t new_state) } tms_scan = tap_get_tms_path(tap_get_state(), new_state); + int tms_count = tap_get_tms_path_len(tap_get_state(), tap_get_end_state()); - for (i = 0; i<7; i++) + for (i = 0; i < tms_count; i++) { bitq_io(tms_scan & 1, 0, 0); tms_scan >>= 1; @@ -188,11 +178,11 @@ void bitq_state_move(tap_state_t new_state) } -void bitq_path_move(pathmove_command_t* cmd) +void bitq_path_move(struct pathmove_command* cmd) { int i; - for (i = 0; i<=cmd->num_states; i++) + for (i = 0; i <= cmd->num_states; i++) { if (tap_state_transition(tap_get_state(), false) == cmd->path[i]) bitq_io(0, 0, 0); @@ -200,15 +190,15 @@ void bitq_path_move(pathmove_command_t* cmd) bitq_io(1, 0, 0); else { - LOG_ERROR( "BUG: %s -> %s isn't a valid TAP transition", tap_state_name( - tap_get_state() ), tap_state_name(cmd->path[i]) ); + LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_name( + tap_get_state()), tap_state_name(cmd->path[i])); exit(-1); } tap_set_state(cmd->path[i]); } - tap_set_end_state( tap_get_state() ); + tap_set_end_state(tap_get_state()); } @@ -225,28 +215,28 @@ void bitq_runtest(int num_cycles) bitq_io(0, 0, 0); /* finish in end_state */ - if ( tap_get_state() != tap_get_end_state() ) - bitq_state_move( tap_get_end_state() ); + if (tap_get_state() != tap_get_end_state()) + bitq_state_move(tap_get_end_state()); } -void bitq_scan_field(scan_field_t* field, int pause) +void bitq_scan_field(struct scan_field* field, int pause) { int bit_cnt; int tdo_req; - u8* out_ptr; - u8 out_mask; + uint8_t* out_ptr; + uint8_t out_mask; - if (field->in_value || field->in_handler) + if (field->in_value) tdo_req = 1; else tdo_req = 0; - if (field->out_value==NULL) + if (field->out_value == NULL) { /* just send zeros and request data from TDO */ - for (bit_cnt = field->num_bits; bit_cnt>1; bit_cnt--) + for (bit_cnt = field->num_bits; bit_cnt > 1; bit_cnt--) bitq_io(0, 0, tdo_req); bitq_io(pause, 0, tdo_req); @@ -256,10 +246,10 @@ void bitq_scan_field(scan_field_t* field, int pause) /* send data, and optionally request TDO */ out_mask = 0x01; out_ptr = field->out_value; - for (bit_cnt = field->num_bits; bit_cnt>1; bit_cnt--) + for (bit_cnt = field->num_bits; bit_cnt > 1; bit_cnt--) { - bitq_io(0, ( (*out_ptr) & out_mask )!=0, tdo_req); - if (out_mask==0x80) + bitq_io(0, ((*out_ptr) & out_mask) != 0, tdo_req); + if (out_mask == 0x80) { out_mask = 0x01; out_ptr++; @@ -268,21 +258,21 @@ void bitq_scan_field(scan_field_t* field, int pause) out_mask <<= 1; } - bitq_io(pause, ( (*out_ptr) & out_mask )!=0, tdo_req); + bitq_io(pause, ((*out_ptr) & out_mask) != 0, tdo_req); } if (pause) { bitq_io(0, 0, 0); - if (tap_get_state()==TAP_IRSHIFT) + if (tap_get_state() == TAP_IRSHIFT) tap_set_state(TAP_IRPAUSE); - else if (tap_get_state()==TAP_DRSHIFT) + else if (tap_get_state() == TAP_DRSHIFT) tap_set_state(TAP_DRPAUSE); } } -void bitq_scan(scan_command_t* cmd) +void bitq_scan(struct scan_command* cmd) { int i; @@ -300,7 +290,7 @@ void bitq_scan(scan_command_t* cmd) 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.field_idx = 0; @@ -311,23 +301,16 @@ int bitq_execute_queue(void) { switch (cmd->type) { - case JTAG_END_STATE: -#ifdef _DEBUG_JTAG_IO_ - LOG_DEBUG("end_state: %i", cmd->cmd.end_state->end_state); -#endif - bitq_end_state(cmd->cmd.end_state->end_state); - break; - case JTAG_RESET: #ifdef _DEBUG_JTAG_IO_ LOG_DEBUG("reset trst: %i srst %i", cmd->cmd.reset->trst, cmd->cmd.reset->srst); #endif - if ( (cmd->cmd.reset->trst == 1) || ( cmd->cmd.reset->srst && (jtag_reset_config & RESET_SRST_PULLS_TRST) ) ) + if ((cmd->cmd.reset->trst == 1) || (cmd->cmd.reset->srst && (jtag_get_reset_config() & RESET_SRST_PULLS_TRST))) { tap_set_state(TAP_RESET); } bitq_interface->reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst); - if ( bitq_interface->in_rdy() ) + if (bitq_interface->in_rdy()) bitq_in_proc(); break; @@ -344,7 +327,7 @@ int bitq_execute_queue(void) LOG_DEBUG("statemove end in %i", cmd->cmd.statemove->end_state); #endif bitq_end_state(cmd->cmd.statemove->end_state); - bitq_state_move( tap_get_end_state() ); /* uncoditional TAP move */ + bitq_state_move(tap_get_end_state()); /* uncoditional TAP move */ break; case JTAG_PATHMOVE: @@ -365,8 +348,8 @@ int bitq_execute_queue(void) #endif bitq_end_state(cmd->cmd.scan->end_state); bitq_scan(cmd->cmd.scan); - if ( tap_get_state() != tap_get_end_state() ) - bitq_state_move( tap_get_end_state() ); + if (tap_get_state() != tap_get_end_state()) + bitq_state_move(tap_get_end_state()); break; case JTAG_SLEEP: @@ -374,7 +357,7 @@ int bitq_execute_queue(void) LOG_DEBUG("sleep %i", cmd->cmd.sleep->us); #endif bitq_interface->sleep(cmd->cmd.sleep->us); - if ( bitq_interface->in_rdy() ) + if (bitq_interface->in_rdy()) bitq_in_proc(); break; @@ -394,7 +377,7 @@ int bitq_execute_queue(void) LOG_ERROR("missing data from bitq interface"); return ERROR_JTAG_QUEUE_FAILED; } - if (bitq_interface->in()>=0) + if (bitq_interface->in() >= 0) { LOG_ERROR("extra data from bitq interface"); return ERROR_JTAG_QUEUE_FAILED; @@ -406,7 +389,7 @@ int bitq_execute_queue(void) void bitq_cleanup(void) { - if (bitq_in_buffer!=NULL) + if (bitq_in_buffer != NULL) { free(bitq_in_buffer); bitq_in_buffer = NULL;