Author: Thomas Kindler <mail@t-kindler.de>

[openocd.git] / src / jtag / rlink / rlink.c

diff --git a/src/jtag/rlink/rlink.c b/src/jtag/rlink/rlink.c
index 683a1545d08d1a48df403ee77b69116df2a95325..1dbd450b15041b2ebb63f10ed6442b19374b5255 100644 (file)
--- a/src/jtag/rlink/rlink.c
+++ b/src/jtag/rlink/rlink.c
@@ -517,7 +517,7 @@ dtc_run_download(
 
 
        /* Wait for DTC to finish running command buffer */
-       for(i = 5;;) {
+       for(i = 10;;) {
                usb_err = ep1_generic_commandl(
                        pHDev, 4,
 
@@ -916,8 +916,9 @@ void rlink_state_move(void) {
 
        int i=0, tms=0;
        u8 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 = 0; i < tms_count; i++)
        {
                tms = (tms_scan >> i) & 1;
                tap_state_queue_append(tms);
@@ -1094,7 +1095,7 @@ rlink_scan(
        u8                      *buffer,
        int                     scan_size
 ) {
-       int                     ir_scan;
+       bool            ir_scan;
        tap_state_t     saved_end_state;
        int                     byte_bits;
        int                     extra_bits;