]> git.sur5r.net Git - openocd/commitdiff
Fix for compilation failure amt_jtagaccel.c
authorJohn Devereux <john@devereux.me.uk>
Tue, 14 Dec 2010 12:17:01 +0000 (12:17 +0000)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Thu, 16 Dec 2010 07:32:30 +0000 (08:32 +0100)
Hi,

I think there are errors in amt_jtagaccel.c

I attach a small patch that I needed to make it compile.

src/jtag/drivers/amt_jtagaccel.c

index 552d04d20ef82002c0b396b485353880d5623acc..ee44a2b69a73865a3c61976d9a9abf9d5e1dc7a7 100644 (file)
@@ -191,6 +191,7 @@ static void amt_jtagaccel_state_move(void)
 
        aw_scan_tms_5 = 0x40 | (tms_scan[0] & 0x1f);
        AMT_AW(aw_scan_tms_5);
+        int jtag_speed=0;
        int retval = jtag_get_speed(&jtag_speed);
        assert(retval == ERROR_OK);
        if (jtag_speed > 3 || rtck_enabled)
@@ -507,6 +508,8 @@ static int amt_jtagaccel_init(void)
 
        int jtag_speed_var;
        int retval = jtag_get_speed(&jtag_speed_var);
+       if (retval != ERROR_OK)
+          return retval;
        amt_jtagaccel_speed(jtag_speed_var);
 
        enum reset_types jtag_reset_config = jtag_get_reset_config();