imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ft2232: revert ft2232_read_scan changes 

Revert change made in commit dd88b461da.
Caused segfaults when using ftdi driver under win32.

Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>
This commit is contained in:
Spencer Oliver 2010-07-02 17:00:57 +01:00
parent f97b6b59ab
commit deb176d335
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/jtag/drivers/ft2232.c
View File

@ -714,24 +714,23 @@ static void ft2232_end_state(tap_state_t state)
static void ft2232_read_scan(enum scan_type type, uint8_t* buffer, int scan_size)
{
int num_bytes = scan_size / 8;
int bits_left = scan_size % 8;
int cur_byte;
int num_bytes = (scan_size + 7) / 8;
int bits_left = scan_size;
int cur_byte = 0;
for (cur_byte = 0; cur_byte < num_bytes; cur_byte++)
while (num_bytes-- > 1)
{
buffer[cur_byte] = buffer_read();
buffer[cur_byte++] = buffer_read();
bits_left -= 8;
}
/* Manage partial byte left from the clock data in/out instructions, if any */
buffer[cur_byte] = 0x0;
/* There is one more partial byte left from the clock data in/out instructions */
if (bits_left > 1)
{
buffer[cur_byte] = buffer_read() >> 1;
}
else
{
buffer[cur_byte] = 0x0;
}
/* This shift depends on the length of the clock data to tms instruction, insterted at end of the scan, now fixed to a two step transition in ft2232_add_scan */
buffer[cur_byte] = (buffer[cur_byte] | (((buffer_read()) << 1) & 0x80)) >> (8 - bits_left);
}