X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fbitbang.c;h=41ef061a74632bb51e2d1e3be779ba0356aac368;hp=ea1f016cacc3f4d4cdbf2606839cb7912c3510b6;hb=dc575dc5bf8cb597a0e9a47794744ae6b1928087;hpb=a2a71fe7053d46a3dc0989119ae0a8fab9a62ea7 diff --git a/src/jtag/bitbang.c b/src/jtag/bitbang.c index ea1f016cac..41ef061a74 100644 --- a/src/jtag/bitbang.c +++ b/src/jtag/bitbang.c @@ -25,18 +25,8 @@ #endif #include "bitbang.h" - -/* project specific includes */ -#include "log.h" -#include "types.h" -#include "jtag.h" -#include "configuration.h" - -/* system includes */ -#include -#include -#include - +#include "interface.h" +#include "commands.h" /** * Function bitbang_stableclocks @@ -57,7 +47,7 @@ bitbang_interface_t *bitbang_interface; * * If someone can submit a patch with an explanation it will be greatly * appreciated, but as far as I can tell (ØH) DCLK is generated upon - * clk=0 in TAP_IDLE. Good luck deducing that from the ARM documentation! + * clk = 0 in TAP_IDLE. Good luck deducing that from the ARM documentation! * The ARM documentation uses the term "DCLK is asserted while in the TAP_IDLE * state". With hardware there is no such thing as *while* in a state. There * are only edges. So clk => 0 is in fact a very subtle state transition that @@ -86,10 +76,11 @@ static void bitbang_end_state(tap_state_t state) static void bitbang_state_move(int skip) { - int i=0, tms=0; - u8 tms_scan = tap_get_tms_path(tap_get_state(), tap_get_end_state()); + int i = 0, tms = 0; + uint8_t tms_scan = tap_get_tms_path(tap_get_state(), tap_get_end_state()); + int tms_count = tap_get_tms_path_len(tap_get_state(), tap_get_end_state()); - for (i = skip; i < 7; i++) + for (i = skip; i < tms_count; i++) { tms = (tms_scan >> i) & 1; bitbang_interface->write(0, tms, 0); @@ -179,7 +170,7 @@ static void bitbang_stableclocks(int num_cycles) -static void bitbang_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) +static void bitbang_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size) { tap_state_t saved_end_state = tap_get_end_state(); int bit_cnt; @@ -197,24 +188,24 @@ static void bitbang_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_ for (bit_cnt = 0; bit_cnt < scan_size; bit_cnt++) { - int val=0; - int tms=(bit_cnt==scan_size-1) ? 1 : 0; + int val = 0; + int tms = (bit_cnt == scan_size-1) ? 1 : 0; int tdi; - int bytec=bit_cnt/8; - int bcval=1<<(bit_cnt % 8); + int bytec = bit_cnt/8; + int bcval = 1 << (bit_cnt % 8); /* if we're just reading the scan, but don't care about the output * default to outputting 'low', this also makes valgrind traces more readable, * as it removes the dependency on an uninitialised value */ - tdi=0; + tdi = 0; if ((type != SCAN_IN) && (buffer[bytec] & bcval)) - tdi=1; + tdi = 1; bitbang_interface->write(0, tms, tdi); - if (type!=SCAN_OUT) - val=bitbang_interface->read(); + if (type != SCAN_OUT) + val = bitbang_interface->read(); bitbang_interface->write(1, tms, tdi); @@ -242,7 +233,7 @@ int bitbang_execute_queue(void) jtag_command_t *cmd = jtag_command_queue; /* currently processed command */ int scan_size; enum scan_type type; - u8 *buffer; + uint8_t *buffer; int retval; if (!bitbang_interface) @@ -256,25 +247,18 @@ int bitbang_execute_queue(void) */ retval = ERROR_OK; - if(bitbang_interface->blink) + if (bitbang_interface->blink) bitbang_interface->blink(1); while (cmd) { switch (cmd->type) { - case JTAG_END_STATE: -#ifdef _DEBUG_JTAG_IO_ - LOG_DEBUG("end_state: %s", tap_state_name(cmd->cmd.end_state->end_state) ); -#endif - if (cmd->cmd.end_state->end_state != TAP_INVALID) - bitbang_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); } @@ -282,10 +266,9 @@ int bitbang_execute_queue(void) break; case JTAG_RUNTEST: #ifdef _DEBUG_JTAG_IO_ - LOG_DEBUG("runtest %i cycles, end in %s", cmd->cmd.runtest->num_cycles, tap_state_name(cmd->cmd.runtest->end_state) ); + LOG_DEBUG("runtest %i cycles, end in %s", cmd->cmd.runtest->num_cycles, tap_state_name(cmd->cmd.runtest->end_state)); #endif - if (cmd->cmd.runtest->end_state != TAP_INVALID) - bitbang_end_state(cmd->cmd.runtest->end_state); + bitbang_end_state(cmd->cmd.runtest->end_state); bitbang_runtest(cmd->cmd.runtest->num_cycles); break; @@ -300,8 +283,7 @@ int bitbang_execute_queue(void) #ifdef _DEBUG_JTAG_IO_ LOG_DEBUG("statemove end in %s", tap_state_name(cmd->cmd.statemove->end_state)); #endif - if (cmd->cmd.statemove->end_state != TAP_INVALID) - bitbang_end_state(cmd->cmd.statemove->end_state); + bitbang_end_state(cmd->cmd.statemove->end_state); bitbang_state_move(0); break; case JTAG_PATHMOVE: @@ -313,10 +295,9 @@ int bitbang_execute_queue(void) break; case JTAG_SCAN: #ifdef _DEBUG_JTAG_IO_ - LOG_DEBUG("%s scan end in %s", (cmd->cmd.scan->ir_scan) ? "IR" : "DR", tap_state_name(cmd->cmd.scan->end_state) ); + LOG_DEBUG("%s scan end in %s", (cmd->cmd.scan->ir_scan) ? "IR" : "DR", tap_state_name(cmd->cmd.scan->end_state)); #endif - if (cmd->cmd.scan->end_state != TAP_INVALID) - bitbang_end_state(cmd->cmd.scan->end_state); + bitbang_end_state(cmd->cmd.scan->end_state); scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer); type = jtag_scan_type(cmd->cmd.scan); bitbang_scan(cmd->cmd.scan->ir_scan, type, buffer, scan_size); @@ -337,7 +318,7 @@ int bitbang_execute_queue(void) } cmd = cmd->next; } - if(bitbang_interface->blink) + if (bitbang_interface->blink) bitbang_interface->blink(0); return retval;