- fixed endianness handling in arm7_9_read_core_reg (thanks to Magnus Lundin for...

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

diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/amt_jtagaccel.c
index d788728b1e624a121022ca077860c4b9195039a3..dca5c334af60f1ff51c38940cab9213f5864f192 100644 (file)
--- a/src/jtag/amt_jtagaccel.c
+++ b/src/jtag/amt_jtagaccel.c
@@ -117,7 +117,7 @@ jtag_interface_t amt_jtagaccel_interface =
        
        .execute_queue = amt_jtagaccel_execute_queue,
 
-       .support_statemove = 0,
+       .support_pathmove = 0,
 
        .speed = amt_jtagaccel_speed,   
        .register_commands = amt_jtagaccel_register_commands,
@@ -181,7 +181,7 @@ void amt_wait_scan_busy()
        
        if (ar_status & 0x80)
        {
-               ERROR("amt_jtagaccel timed out while waiting for end of scan, rtck was %s", (rtck_enabled) ? "enabled" : "disabled");
+               ERROR("amt_jtagaccel timed out while waiting for end of scan, rtck was %s, last AR_STATUS: 0x%2.2x", (rtck_enabled) ? "enabled" : "disabled", ar_status);
                exit(-1);
        }
 }
@@ -434,7 +434,8 @@ int amt_jtagaccel_init(void)
 #else
        u8 status_port;
 #endif
-
+       u8 ar_status;
+       
 #if PARPORT_USE_PPDEV == 1
        if (device_handle > 0)
        {
@@ -498,6 +499,12 @@ int amt_jtagaccel_init(void)
        outb(0x04, amt_jtagaccel_port + 2);
 #endif
        
+       if (rtck_enabled)
+       {       
+               /* set RTCK enable bit */
+               aw_control_fsm |= 0x02;
+       }
+       
        /* enable JTAG port */
        aw_control_fsm |= 0x04;
        AMT_AW(aw_control_fsm);
@@ -516,6 +523,10 @@ int amt_jtagaccel_init(void)
        
        amt_jtagaccel_reset(0, 0);
        
+       /* read status register */
+       AMT_AR(ar_status);
+       DEBUG("AR_STATUS: 0x%2.2x", ar_status);
+       
        return ERROR_OK;
 }
 
@@ -549,10 +560,10 @@ int amt_jtagaccel_handle_rtck_command(struct command_context_s *cmd_ctx, char *c
                if (strcmp(args[0], "enabled") == 0)
                {
                        rtck_enabled = 1;
-                       
-                       /* set RTCK enable bit */
-                       aw_control_fsm |= 0x02;
-                       AMT_AW(aw_control_fsm);
+               }
+               else
+               {
+                       rtck_enabled = 0;
                }
        }