jtag: only change state if necessary14/1114/2
authorSpencer Oliver <spen@spen-soft.co.uk>
Wed, 16 Jan 2013 11:57:57 +0000 (16 11:57 +0000)
committerFreddie Chopin <freddie.chopin@gmail.com>
Sun, 27 Jan 2013 14:16:52 +0000 (27 14:16 +0000)
All the other drivers will only change the state if required.
This brings all the other drivers inline with this behaviour.

The original issue relates to problems on xscale commit 7989000e0969c1ccf69acbc3ce649a020bc1ee66

Change-Id: Ifc90ec2eef68a70a14f37c00931a07982bfa200c
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/1114
Tested-by: jenkins
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
src/jtag/drivers/amt_jtagaccel.c
src/jtag/drivers/arm-jtag-ew.c
src/jtag/drivers/buspirate.c

index d89e5ff..5005e76 100644 (file)
@@ -264,7 +264,10 @@ static void amt_jtagaccel_scan(bool ir_scan, enum scan_type type, uint8_t *buffe
        else
                amt_jtagaccel_end_state(TAP_DRSHIFT);
 
-       amt_jtagaccel_state_move();
+       /* Only move if we're not already there */
+       if (tap_get_state() != tap_get_end_state())
+               amt_jtagaccel_state_move();
+
        amt_jtagaccel_end_state(saved_end_state);
 
        /* handle unaligned bits at the beginning */
index 35b6b92..1624510 100644 (file)
@@ -355,7 +355,10 @@ static void armjtagew_scan(bool ir_scan,
        /* Move to appropriate scan state */
        armjtagew_end_state(ir_scan ? TAP_IRSHIFT : TAP_DRSHIFT);
 
-       armjtagew_state_move();
+       /* Only move if we're not already there */
+       if (tap_get_state() != tap_get_end_state())
+               armjtagew_state_move();
+
        armjtagew_end_state(saved_end_state);
 
        /* Scan */
index 86b9882..10b5e0f 100644 (file)
@@ -520,7 +520,10 @@ static void buspirate_scan(bool ir_scan, enum scan_type type,
        saved_end_state = tap_get_end_state();
 
        buspirate_end_state(ir_scan ? TAP_IRSHIFT : TAP_DRSHIFT);
-       buspirate_state_move();
+
+       /* Only move if we're not already there */
+       if (tap_get_state() != tap_get_end_state())
+               buspirate_state_move();
 
        buspirate_tap_append_scan(scan_size, buffer, command);