avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

patch #8419 fix ftdi_syncbb hang with libftdi 1 

* ft245r.c: set pthread cancel type to asynchronous, reorder ftdi_usb_close/deinit


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1324 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
rliebscher 2014-06-21 21:29:18 +00:00
parent 36fba15f84
commit 788fa8fd91
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2014-06-21 Rene Liebscher <R.Liebscher@gmx.de>
patch #8419 fix ftdi_syncbb hang with libftdi 1
* ft245r.c: set pthread cancel type to asynchronous, reorder ftdi_usb_close/deinit
2014-06-17 Rene Liebscher <R.Liebscher@gmx.de> 2014-06-17 Rene Liebscher <R.Liebscher@gmx.de>
* avrftdi_private.h: added missing msg level for avrdude_message * avrftdi_private.h: added missing msg level for avrdude_message

5
ft245r.c
View File

@ -173,6 +173,7 @@ static void add_to_buf (unsigned char c) {
} }
static void *reader (void *arg) { static void *reader (void *arg) {
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS,NULL);
struct ftdi_context *handle = (struct ftdi_context *)(arg); struct ftdi_context *handle = (struct ftdi_context *)(arg);
unsigned char buf[0x1000]; unsigned char buf[0x1000];
int br, i; int br, i;
@ -642,10 +643,10 @@ static void ft245r_close(PROGRAMMER * pgm) {
// I think the switch to BB mode and back flushes the buffer. // I think the switch to BB mode and back flushes the buffer.
ftdi_set_bitmode(handle, 0, BITMODE_SYNCBB); // set Synchronous BitBang, all in puts ftdi_set_bitmode(handle, 0, BITMODE_SYNCBB); // set Synchronous BitBang, all in puts
ftdi_set_bitmode(handle, 0, BITMODE_RESET); // disable Synchronous BitBang ftdi_set_bitmode(handle, 0, BITMODE_RESET); // disable Synchronous BitBang
ftdi_usb_close(handle);
ftdi_deinit (handle);
pthread_cancel(readerthread); pthread_cancel(readerthread);
pthread_join(readerthread, NULL); pthread_join(readerthread, NULL);
ftdi_usb_close(handle);
ftdi_deinit (handle); // TODO this works with libftdi 0.20, but hangs with 1.0
free(handle); free(handle);
handle = NULL; handle = NULL;
} }