Fix unused variables error in amt_jtagaccel

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

diff --git a/src/jtag/drivers/amt_jtagaccel.c b/src/jtag/drivers/amt_jtagaccel.c
index 121649bcb2cc6ffd369da292cb6417b26b53c190..34a4ae784d3a34d0aca47956eede1328d9db71f0 100644 (file)
--- a/src/jtag/drivers/amt_jtagaccel.c
+++ b/src/jtag/drivers/amt_jtagaccel.c
@@ -71,14 +71,18 @@ static const int addr_mode = IEEE1284_MODE_EPP | IEEE1284_ADDR;
                int __retval; \
                \
                __retval = ioctl(device_handle, PPSETMODE, &addr_mode); \
+               assert(__retval >= 0); \
                __retval = write(device_handle, &val, 1); \
+               assert(__retval >= 0); \
        } while (0)
 #define AMT_AR(val) \
        do { \
                int __retval; \
                \
                __retval = ioctl(device_handle, PPSETMODE, &addr_mode); \
+               assert(__retval >= 0); \
                __retval = read(device_handle, &val, 1); \
+               assert(__retval >= 0); \
        } while (0)
 
 static const int data_mode = IEEE1284_MODE_EPP | IEEE1284_DATA;
@@ -88,14 +92,18 @@ static const int data_mode = IEEE1284_MODE_EPP | IEEE1284_DATA;
                int __retval; \
                \
                __retval = ioctl(device_handle, PPSETMODE, &data_mode); \
+               assert(__retval >= 0); \
                __retval = write(device_handle, &val, 1); \
+               assert(__retval >= 0); \
        } while (0)
 #define AMT_DR(val) \
        do { \
                int __retval; \
                \
                __retval = ioctl(device_handle, PPSETMODE, &data_mode); \
+               assert(__retval >= 0); \
                __retval = read(device_handle, &val, 1); \
+               assert(__retval >= 0); \
        } while (0)
 
 #else
@@ -191,7 +199,9 @@ 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 = jtag_get_speed();
+        int jtag_speed=0;
+       int retval = jtag_get_speed(&jtag_speed);
+       assert(retval == ERROR_OK);
        if (jtag_speed > 3 || rtck_enabled)
                amt_wait_scan_busy();
 
@@ -249,7 +259,9 @@ static void amt_jtagaccel_scan(bool ir_scan, enum scan_type type, uint8_t *buffe
        uint8_t dr_tdo;
        uint8_t aw_tms_scan;
        uint8_t tms_scan[2];
-       int jtag_speed = jtag_get_speed();
+       int jtag_speed_var;
+       int retval = jtag_get_speed(&jtag_speed_var);
+       assert(retval == ERROR_OK);
 
        if (ir_scan)
                amt_jtagaccel_end_state(TAP_IRSHIFT);
@@ -267,7 +279,7 @@ static void amt_jtagaccel_scan(bool ir_scan, enum scan_type type, uint8_t *buffe
 
                dw_tdi_scan = buf_get_u32(buffer, bit_count, (scan_size - 1) % 8) & 0xff;
                AMT_DW(dw_tdi_scan);
-               if (jtag_speed > 3 || rtck_enabled)
+               if (jtag_speed_var > 3 || rtck_enabled)
                        amt_wait_scan_busy();
 
                if ((type == SCAN_IN) || (type == SCAN_IO))
@@ -285,7 +297,7 @@ static void amt_jtagaccel_scan(bool ir_scan, enum scan_type type, uint8_t *buffe
        {
                dw_tdi_scan = buf_get_u32(buffer, bit_count, 8) & 0xff;
                AMT_DW(dw_tdi_scan);
-               if (jtag_speed > 3 || rtck_enabled)
+               if (jtag_speed_var > 3 || rtck_enabled)
                        amt_wait_scan_busy();
 
                if ((type == SCAN_IN) || (type == SCAN_IO))
@@ -302,7 +314,7 @@ static void amt_jtagaccel_scan(bool ir_scan, enum scan_type type, uint8_t *buffe
        tms_scan[1] = amt_jtagaccel_tap_move[tap_move_ndx(tap_get_state())][tap_move_ndx(tap_get_end_state())][1];
        aw_tms_scan = 0x40 | (tms_scan[0] & 0x1f) | (buf_get_u32(buffer, bit_count, 1) << 5);
        AMT_AW(aw_tms_scan);
-       if (jtag_speed > 3 || rtck_enabled)
+       if (jtag_speed_var > 3 || rtck_enabled)
                amt_wait_scan_busy();
 
        if ((type == SCAN_IN) || (type == SCAN_IO))
@@ -316,7 +328,7 @@ static void amt_jtagaccel_scan(bool ir_scan, enum scan_type type, uint8_t *buffe
        {
                aw_tms_scan = 0x40 | (tms_scan[1] & 0x1f);
                AMT_AW(aw_tms_scan);
-               if (jtag_speed > 3 || rtck_enabled)
+               if (jtag_speed_var > 3 || rtck_enabled)
                        amt_wait_scan_busy();
        }
        tap_set_state(tap_get_end_state());
@@ -356,7 +368,7 @@ static int amt_jtagaccel_execute_queue(void)
                                amt_jtagaccel_end_state(cmd->cmd.runtest->end_state);
                                amt_jtagaccel_runtest(cmd->cmd.runtest->num_cycles);
                                break;
-                       case JTAG_STATEMOVE:
+                       case JTAG_TLR_RESET:
 #ifdef _DEBUG_JTAG_IO_
                                LOG_DEBUG("statemove end in %i", cmd->cmd.statemove->end_state);
 #endif
@@ -502,8 +514,6 @@ static int amt_jtagaccel_init(void)
        aw_control_fsm |= 0x04;
        AMT_AW(aw_control_fsm);
 
-       amt_jtagaccel_speed(jtag_get_speed());
-
        enum reset_types jtag_reset_config = jtag_get_reset_config();
        if (jtag_reset_config & RESET_TRST_OPEN_DRAIN)
                aw_control_rst &= ~0x8;