X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fbitbang.c;h=69c17298849007592828bd3d4d58529b0b84fd93;hb=445da543d8db868466dcef7e23f75b3c2b54bc72;hp=92ba6cc0aa755f5f1b87971e5403dbaf371de2fe;hpb=e77ae9096a40707d3b878b46969a60a06656dc06;p=openocd.git diff --git a/src/jtag/bitbang.c b/src/jtag/bitbang.c index 92ba6cc0aa..69c1729884 100644 --- a/src/jtag/bitbang.c +++ b/src/jtag/bitbang.c @@ -2,7 +2,7 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * - * Copyright (C) 2007,2008 Øyvind Harboe * + * Copyright (C) 2007,2008 Øyvind Harboe * * oyvind.harboe@zylin.com * * * * This program is free software; you can redistribute it and/or modify * @@ -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 @@ -49,19 +39,19 @@ static void bitbang_stableclocks(int num_cycles); -bitbang_interface_t *bitbang_interface; +struct bitbang_interface *bitbang_interface; /* DANGER!!!! clock absolutely *MUST* be 0 in idle or reset won't work! * * Set this to 1 and str912 reset halt will fail. * * 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! + * 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! * 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 - * happens *while* in the TAP_IDLE state. "#&¤"#¤&"#&"#& + * happens *while* in the TAP_IDLE state. "#&¤"#¤&"#&"#& * * For "reset halt" the last thing that happens before srst is asserted * is that the breakpoint is set up. If DCLK is not wiggled one last @@ -71,12 +61,9 @@ bitbang_interface_t *bitbang_interface; */ #define CLOCK_IDLE() 0 -int bitbang_execute_queue(void); - /* The bitbang driver leaves the TCK 0 when in idle */ - -void bitbang_end_state(tap_state_t state) +static void bitbang_end_state(tap_state_t state) { if (tap_is_state_stable(state)) tap_set_end_state(state); @@ -87,12 +74,13 @@ void bitbang_end_state(tap_state_t state) } } -void bitbang_state_move(void) +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 = 0; i < 7; i++) + for (i = skip; i < tms_count; i++) { tms = (tms_scan >> i) & 1; bitbang_interface->write(0, tms, 0); @@ -103,7 +91,7 @@ void bitbang_state_move(void) tap_set_state(tap_get_end_state()); } -void bitbang_path_move(pathmove_command_t *cmd) +static void bitbang_path_move(struct pathmove_command *cmd) { int num_states = cmd->num_states; int state_count; @@ -139,7 +127,7 @@ void bitbang_path_move(pathmove_command_t *cmd) tap_set_end_state(tap_get_state()); } -void bitbang_runtest(int num_cycles) +static void bitbang_runtest(int num_cycles) { int i; @@ -149,7 +137,7 @@ void bitbang_runtest(int num_cycles) if (tap_get_state() != TAP_IDLE) { bitbang_end_state(TAP_IDLE); - bitbang_state_move(); + bitbang_state_move(0); } /* execute num_cycles */ @@ -163,7 +151,7 @@ void bitbang_runtest(int num_cycles) /* finish in end_state */ bitbang_end_state(saved_end_state); if (tap_get_state() != tap_get_end_state()) - bitbang_state_move(); + bitbang_state_move(0); } @@ -182,7 +170,7 @@ static void bitbang_stableclocks(int num_cycles) -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; @@ -194,30 +182,30 @@ void bitbang_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) else bitbang_end_state(TAP_DRSHIFT); - bitbang_state_move(); + bitbang_state_move(0); bitbang_end_state(saved_end_state); } 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); @@ -230,30 +218,22 @@ void bitbang_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) } } - /* TAP_DRSHIFT & TAP_IRSHIFT are illegal end states, so we always transition to the pause - * state which is a legal stable state from which statemove will work. - * - * Exit1 -> Pause - */ - bitbang_interface->write(0, 0, 0); - bitbang_interface->write(1, 0, 0); - bitbang_interface->write(CLOCK_IDLE(), 0, 0); - - if (ir_scan) - tap_set_state(TAP_IRPAUSE); - else - tap_set_state(TAP_DRPAUSE); - if (tap_get_state() != tap_get_end_state()) - bitbang_state_move(); + { + /* we *KNOW* the above loop transitioned out of + * the shift state, so we skip the first state + * and move directly to the end state. + */ + bitbang_state_move(1); + } } 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; enum scan_type type; - u8 *buffer; + uint8_t *buffer; int retval; if (!bitbang_interface) @@ -267,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 != -1) - 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); } @@ -293,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 != -1) - bitbang_end_state(cmd->cmd.runtest->end_state); + bitbang_end_state(cmd->cmd.runtest->end_state); bitbang_runtest(cmd->cmd.runtest->num_cycles); break; @@ -311,9 +283,8 @@ 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 != -1) - bitbang_end_state(cmd->cmd.statemove->end_state); - bitbang_state_move(); + bitbang_end_state(cmd->cmd.statemove->end_state); + bitbang_state_move(0); break; case JTAG_PATHMOVE: #ifdef _DEBUG_JTAG_IO_ @@ -324,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 != -1) - 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); @@ -338,7 +308,7 @@ int bitbang_execute_queue(void) break; case JTAG_SLEEP: #ifdef _DEBUG_JTAG_IO_ - LOG_DEBUG("sleep %i", cmd->cmd.sleep->us); + LOG_DEBUG("sleep %" PRIi32, cmd->cmd.sleep->us); #endif jtag_sleep(cmd->cmd.sleep->us); break; @@ -348,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;