luke
/
openFPGALoader
mirror of https://github.com/trabucayre/openFPGALoader.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cable: ch347: fix for CI (libusb_strerror with a cast in -> libusb_error, fix libusb callback signature)

This commit is contained in:
Gwenhael Goavec-Merou 2023-07-26 08:37:39 +02:00
parent 0fc8ba10a8
commit a89fc54f29
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ch347jtag.cpp
View File

@ -5,7 +5,7 @@
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include <libusb-1.0/libusb.h> #include <libusb.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
@ -43,7 +43,7 @@ enum CH347JtagSig {
SIG_TMS = 0b10, SIG_TMS = 0b10,
SIG_TDI = 0b10000, SIG_TDI = 0b10000,
}; };
static void sync_cb(libusb_transfer *transfer) { static void LIBUSB_CALL sync_cb(struct libusb_transfer *transfer) {
int *complete = (int *)transfer->user_data; int *complete = (int *)transfer->user_data;
*complete = true; *complete = true;
} }
@ -265,7 +265,8 @@ int CH347Jtag::writeTMS(uint8_t *tms, uint32_t len, bool flush_buffer)
obuf[2] = (wlen - 3) >> 8; obuf[2] = (wlen - 3) >> 8;
int ret = usb_xfer(wlen, 0, 0); int ret = usb_xfer(wlen, 0, 0);
if (ret < 0) { if (ret < 0) {
cerr << "writeTMS: usb bulk write failed: " << libusb_strerror(ret) << endl; cerr << "writeTMS: usb bulk write failed: " <<
libusb_strerror(static_cast<libusb_error>(ret)) << endl;
return -EXIT_FAILURE; return -EXIT_FAILURE;
} }
ptr = obuf; ptr = obuf;
@ -296,7 +297,8 @@ int CH347Jtag::toggleClk(uint8_t tms, uint8_t tdi, uint32_t len)
obuf[2] = (wlen - 3) >> 8; obuf[2] = (wlen - 3) >> 8;
int ret = usb_xfer(wlen, 0, 0); int ret = usb_xfer(wlen, 0, 0);
if (ret < 0) { if (ret < 0) {
cerr << "writeCLK: usb bulk write failed: " << libusb_strerror(ret) << endl; cerr << "writeCLK: usb bulk write failed: " <<
libusb_strerror(static_cast<libusb_error>(ret)) << endl;
return -EXIT_FAILURE; return -EXIT_FAILURE;
} }
ptr = obuf; ptr = obuf;
@ -327,7 +329,8 @@ int CH347Jtag::writeTDI(uint8_t *tx, uint8_t *rx, uint32_t len, bool end)
unsigned actual_length = 0; unsigned actual_length = 0;
int ret = usb_xfer(chunk + 3, (rx) ? chunk + 3 : 0, &actual_length); int ret = usb_xfer(chunk + 3, (rx) ? chunk + 3 : 0, &actual_length);
if (ret < 0) { if (ret < 0) {
cerr << "writeTDI: usb bulk read failed: " << libusb_strerror(ret) << endl; cerr << "writeTDI: usb bulk read failed: " <<
libusb_strerror(static_cast<libusb_error>(ret)) << endl;
return -EXIT_FAILURE; return -EXIT_FAILURE;
} }
if (!rx) if (!rx)
@ -365,7 +368,8 @@ int CH347Jtag::writeTDI(uint8_t *tx, uint8_t *rx, uint32_t len, bool end)
int ret = usb_xfer(wlen, (rx) ? (bits + 3) : 0, &actual_length); int ret = usb_xfer(wlen, (rx) ? (bits + 3) : 0, &actual_length);
if (ret < 0) { if (ret < 0) {
cerr << "writeTDI: usb bulk read failed: " << libusb_strerror(ret) << endl; cerr << "writeTDI: usb bulk read failed: " <<
libusb_strerror(static_cast<libusb_error>(ret)) << endl;
return -EXIT_FAILURE; return -EXIT_FAILURE;
} }
if (!rx) if (!rx)