Remove unused code, TAP_INVALID is never passed to drivers.

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

diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c
index 319760a890aa263f7136954556aebe695a414b23..5a8a44e387cee3c9eeb40988ee491e4cf33410af 100644 (file)
--- a/src/jtag/ft2232.c
+++ b/src/jtag/ft2232.c
@@ -40,6 +40,7 @@
 #endif
 
 /* project specific includes */
+#define INCLUDE_JTAG_INTERFACE_H
 #include "jtag.h"
 #include "time_support.h"
 
@@ -512,7 +513,6 @@ void ft2232_end_state(tap_state_t state)
        }
 }
 
-
 static void ft2232_read_scan(enum scan_type type, u8* buffer, int scan_size)
 {
        int num_bytes = (scan_size + 7) / 8;
@@ -1412,20 +1412,6 @@ static void sheevaplug_reset(int trst, int srst)
        LOG_DEBUG("trst: %i, srst: %i, high_output: 0x%2.2x, high_direction: 0x%2.2x", trst, srst, high_output, high_direction);
 }
 
-static int ft2232_execute_end_state(jtag_command_t *cmd)
-{
-       int  retval;
-       retval = ERROR_OK;
-
-       DEBUG_JTAG_IO("execute_end_state: %s", tap_state_name(cmd->cmd.end_state->end_state) );
-
-       if (cmd->cmd.end_state->end_state != TAP_INVALID)
-               ft2232_end_state(cmd->cmd.end_state->end_state);
-
-       return retval;
-}
-
-
 static int ft2232_execute_runtest(jtag_command_t *cmd)
 {
        int  retval;
@@ -1442,9 +1428,9 @@ static int ft2232_execute_runtest(jtag_command_t *cmd)
        if (tap_get_state() != TAP_IDLE)
                predicted_size += 3;
        predicted_size += 3 * CEIL(cmd->cmd.runtest->num_cycles, 7);
-       if ( (cmd->cmd.runtest->end_state != TAP_INVALID) && (cmd->cmd.runtest->end_state != TAP_IDLE) )
+       if ( cmd->cmd.runtest->end_state != TAP_IDLE)
                predicted_size += 3;
-       if ( (cmd->cmd.runtest->end_state == TAP_INVALID) && (tap_get_end_state() != TAP_IDLE) )
+       if ( tap_get_end_state() != TAP_IDLE)
                predicted_size += 3;
        if (ft2232_buffer_size + predicted_size + 1 > FT2232_BUFFER_SIZE)
        {
@@ -1477,8 +1463,7 @@ static int ft2232_execute_runtest(jtag_command_t *cmd)
                /* LOG_DEBUG("added TMS scan (no read)"); */
        }
 
-       if (cmd->cmd.runtest->end_state != TAP_INVALID)
-               ft2232_end_state(cmd->cmd.runtest->end_state);
+       ft2232_end_state(cmd->cmd.runtest->end_state);
 
        if ( tap_get_state() != tap_get_end_state() )
        {
@@ -1510,8 +1495,7 @@ static int ft2232_execute_statemove(jtag_command_t *cmd)
                require_send = 0;
                first_unsent = cmd;
        }
-       if (cmd->cmd.statemove->end_state != TAP_INVALID)
-               ft2232_end_state(cmd->cmd.statemove->end_state);
+       ft2232_end_state(cmd->cmd.statemove->end_state);
 
        /* move to end state */
        if ( tap_get_state() != tap_get_end_state() )
@@ -1577,8 +1561,7 @@ static int ft2232_execute_scan(jtag_command_t *cmd)
                                retval = ERROR_JTAG_QUEUE_FAILED;
 
                /* current command */
-               if (cmd->cmd.scan->end_state != TAP_INVALID)
-                       ft2232_end_state(cmd->cmd.scan->end_state);
+               ft2232_end_state(cmd->cmd.scan->end_state);
                ft2232_large_scan(cmd->cmd.scan, type, buffer, scan_size);
                require_send = 0;
                first_unsent = cmd->next;
@@ -1598,8 +1581,7 @@ static int ft2232_execute_scan(jtag_command_t *cmd)
        }
        ft2232_expect_read += ft2232_predict_scan_in(scan_size, type);
        /* LOG_DEBUG("new read size: %i", ft2232_expect_read); */
-       if (cmd->cmd.scan->end_state != TAP_INVALID)
-               ft2232_end_state(cmd->cmd.scan->end_state);
+       ft2232_end_state(cmd->cmd.scan->end_state);
        ft2232_add_scan(cmd->cmd.scan->ir_scan, type, buffer, scan_size);
        require_send = 1;
        if (buffer)
@@ -1682,7 +1664,6 @@ static int ft2232_execute_command(jtag_command_t *cmd)
 
        switch (cmd->type)
        {
-       case JTAG_END_STATE:    retval = ft2232_execute_end_state(cmd); break;
        case JTAG_RESET:                        retval = ft2232_execute_reset(cmd); break;
        case JTAG_RUNTEST:      retval = ft2232_execute_runtest(cmd); break;
        case JTAG_STATEMOVE:    retval = ft2232_execute_statemove(cmd); break;