auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused code, TAP_INVALID is never passed to drivers.

Browse Source 
git-svn-id: svn://svn.berlios.de/openocd/trunk@1997 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe
2009-06-02 07:21:44 +00:00
parent a372074d21
commit 8dab0ecf23
8 changed files with 27 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/jtag/ft2232.c
View File

@@ -1428,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)
{
@@ -1463,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() )
{
@@ -1496,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() )
@@ -1563,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;
@@ -1584,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)