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

updata CH347 

Added CH347F, which is a new package version of CH347T.
BUG fix: Sometimes writing bit files may fail.
Added functions: Added VID, PID and other settings, the default selected model is CH347T.
This commit is contained in:
ZhiYuanNJ 2024-02-01 17:22:00 +08:00
parent f9c1aa4eed
commit 635d29ebba
3 changed files with 89 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

177
src/ch347jtag.cpp
View File

@ -22,14 +22,20 @@
using namespace std; using namespace std;
#define CH347JTAG_VID 0x1a86 #define CH347JTAG_VID 0x1a86
#define CH347JTAG_PID 0x55dd #define CH347JTAG_PID 0x55dd //ch347T
//#define CH347JTAG_PID 0x55de //ch347F
#define KHZ(n) (uint32_t)((n)*UINT32_C(1000))
#define MHZ(n) (uint32_t)((n)*UINT32_C(1000000))
#define GHZ(n) (uint32_t)((n)*UINT32_C(1000000000))
#define CH347JTAG_INTF 2 #define CH347JTAG_INTF 2
#define CH347JTAG_WRITE_EP 0x06 #define CH347JTAG_WRITE_EP 0x06
#define CH347JTAG_READ_EP 0x86 #define CH347JTAG_READ_EP 0x86
#define CH347JTAG_TIMEOUT 200 #define CH347JTAG_TIMEOUT 200
unsigned short CH347_VID = CH347JTAG_VID;
unsigned short CH347_PID = CH347JTAG_PID;
enum CH347JtagCmd { enum CH347JtagCmd {
CMD_BYTES_WO = 0xd3, CMD_BYTES_WO = 0xd3,
CMD_BYTES_WR = 0xd4, CMD_BYTES_WR = 0xd4,
@ -51,17 +57,17 @@ static void LIBUSB_CALL sync_cb(struct libusb_transfer *transfer) {
// defer should only be used with rlen == 0 // defer should only be used with rlen == 0
int CH347Jtag::usb_xfer(unsigned wlen, unsigned rlen, unsigned *ract, bool defer) { int CH347Jtag::usb_xfer(unsigned wlen, unsigned rlen, unsigned *ract, bool defer)
{
int actual_length = 0;
if (_verbose) { if (_verbose) {
fprintf(stderr, "usb_xfer: deferred: %ld\n", obuf - _obuf); fprintf(stderr, "usb_xfer: deferred: %ld\n", obuf - _obuf);
} }
if (defer && !rlen && obuf - _obuf + wlen < MAX_BUFFER - 12) { if (defer && !rlen && obuf - _obuf > (wlen + 12)) {
obuf += wlen; obuf += wlen;
return 0; return 0;
} }
// write out whole buffer
if (obuf - _obuf > MAX_BUFFER) { if (obuf - _obuf > MAX_BUFFER) {
throw runtime_error("buffer overflow"); throw runtime_error("buffer overflow");
} }
@ -84,66 +90,39 @@ int CH347Jtag::usb_xfer(unsigned wlen, unsigned rlen, unsigned *ract, bool defer
fprintf(stderr, "}\n\n"); fprintf(stderr, "}\n\n");
} }
int wcomplete = 0, rcomplete = 0; int r = 0;
libusb_fill_bulk_transfer(wtrans, dev_handle, CH347JTAG_WRITE_EP, obuf, if (wlen) {
wlen, sync_cb, &wcomplete, CH347JTAG_TIMEOUT); if ((r = libusb_bulk_transfer(dev_handle, CH347JTAG_WRITE_EP, obuf, wlen, &actual_length, CH347JTAG_TIMEOUT)) < 0 ) {
int r = libusb_submit_transfer(wtrans);
if (r < 0)
return r;
if (rlen) {
rcomplete = 0;
libusb_fill_bulk_transfer(rtrans, dev_handle, CH347JTAG_READ_EP, ibuf,
rlen, sync_cb, &rcomplete, CH347JTAG_TIMEOUT);
r = libusb_submit_transfer(rtrans);
if (r < 0)
return r; return r;
} else { }
rcomplete = 1;
} }
while (!wcomplete) { if (_verbose) {
r = libusb_handle_events_completed(usb_ctx, &wcomplete); fprintf(stderr, "obuf[%d] = {", wlen);
if (r < 0) { for (unsigned i = 0; i < wlen; ++i) {
if (r != LIBUSB_ERROR_INTERRUPTED) { fprintf(stderr, "%02x ", obuf[i]);
libusb_cancel_transfer(wtrans); }
if (rlen) libusb_cancel_transfer(rtrans); fprintf(stderr, "}\n\n");
}
obuf = _obuf;
int rlen_total = 0;
uint8_t *pibuf = ibuf;
if (rlen){
while (rlen) {
if ((r = libusb_bulk_transfer(dev_handle, CH347JTAG_READ_EP, pibuf, rlen, &actual_length, CH347JTAG_TIMEOUT)) < 0 ) {
return r;
} }
continue; if (_verbose) {
} fprintf(stderr, "ibuf[%d] = {", actual_length);
if (!wtrans->dev_handle) { for (int i = rlen_total; i < rlen_total + actual_length; ++i) {
wtrans->status = LIBUSB_TRANSFER_NO_DEVICE; fprintf(stderr, "%02x ", ibuf[i]);
wcomplete = 1; }
} fprintf(stderr, "}\n\n");
}
while (!rcomplete) {
r = libusb_handle_events_completed(usb_ctx, &rcomplete);
if (r < 0) {
if (r != LIBUSB_ERROR_INTERRUPTED)
libusb_cancel_transfer(rtrans);
continue;
}
if (!rtrans->dev_handle) {
rtrans->status = LIBUSB_TRANSFER_NO_DEVICE;
rcomplete = 1;
}
}
if (wtrans->status != LIBUSB_TRANSFER_COMPLETED) {
return LIBUSB_ERROR_IO;
}
if (rlen) {
if (rtrans->status != LIBUSB_TRANSFER_COMPLETED) {
return LIBUSB_ERROR_IO;
}
if ((int)rlen > rtrans->actual_length) {
throw runtime_error("input buffer underflow");
}
if (ract) *ract = rtrans->actual_length;
if (_verbose) {
fprintf(stderr, "ibuf[%d] = {", rtrans->actual_length);
for (int i = 0; i < rtrans->actual_length; ++i) {
fprintf(stderr, "%02x ", ibuf[i]);
} }
fprintf(stderr, "}\n\n"); rlen -= actual_length;
pibuf += actual_length;
rlen_total += actual_length;
} }
*ract = rlen_total;
} }
return 0; return 0;
} }
@ -164,19 +143,41 @@ int CH347Jtag::setClk(const uint8_t &factor) {
return 0; return 0;
} }
CH347Jtag::CH347Jtag(uint32_t clkHZ, int8_t verbose): CH347Jtag::CH347Jtag(uint32_t clkHZ, int8_t verbose, int vid, int pid, uint8_t bus_addr, uint8_t dev_addr):
_verbose(verbose>1), dev_handle(NULL), usb_ctx(NULL), obuf(_obuf) _verbose(verbose>1), dev_handle(NULL), usb_ctx(NULL), obuf(_obuf)
{ {
libusb_device** devs;
int actual_length = 0; int actual_length = 0;
int i = 0;
ssize_t cnt;
struct libusb_device_descriptor desc; struct libusb_device_descriptor desc;
struct libusb_device *dev; struct libusb_device *dev;
int rv; int rv;
CH347_VID = vid;
CH347_PID = pid;
if (libusb_init(&usb_ctx) < 0) { if (libusb_init(&usb_ctx) < 0) {
printError("libusb init failed"); printError("libusb init failed");
goto err_exit; goto err_exit;
} }
dev_handle = libusb_open_device_with_vid_pid(usb_ctx, CH347JTAG_VID, if (bus_addr != 0 && dev_addr != 0) {
CH347JTAG_PID); cnt = libusb_get_device_list(NULL, &devs);
if (cnt < 0) goto err_exit;
while ((dev = devs[i++]) != NULL) {
if (libusb_get_device_descriptor(dev, &desc) < 0){
continue;
}
if (desc.idVendor == CH347_VID && desc.idProduct == CH347_PID && libusb_get_bus_number(dev) == bus_addr && \
libusb_get_device_address(dev) == dev_addr){
if (libusb_open(dev, &dev_handle) < 0){
printError("libusb init failed");
goto err_exit;
}
}
}
}else {
dev_handle = libusb_open_device_with_vid_pid(usb_ctx, CH347_VID,
CH347_PID);
}
if (!dev_handle) { if (!dev_handle) {
printError("fails to open device"); printError("fails to open device");
goto usb_exit; goto usb_exit;
@ -243,27 +244,22 @@ CH347Jtag::~CH347Jtag()
int CH347Jtag::_setClkFreq(uint32_t clkHZ) int CH347Jtag::_setClkFreq(uint32_t clkHZ)
{ {
#if 1 int setClk_index = 0;
unsigned i = 0, sl = 60000000 >> 5; uint32_t speed_clock[8] = {
for (; i < 6; ++i, sl <<= 1) { KHZ(468.75), KHZ(937.5), MHZ(1.875), MHZ(3.75),
if (clkHZ < sl) MHZ(7.5), MHZ(15), MHZ(30), MHZ(60)
break; };
for (int i = 0; i < sizeof(speed_clock) / sizeof(uint32_t); ++i) {
if (clkHZ > speed_clock[i] && clkHZ <= speed_clock[i+1]){
setClk_index = i + 1;
}
} }
#else if (setClk(setClk_index)) {
int i = 6;
unsigned sl = 60000000;
for (; i > 1; --i, sl >>= 1) {
if (clkHZ > sl)
break;
}
#endif
_clkHZ = sl;
if (setClk(i)) {
printError("failed to set clock rate"); printError("failed to set clock rate");
return 0; return 0;
} }
char mess[256]; char mess[256];
snprintf(mess, 256, "JTAG TCK frequency set to %.3f MHz\n\n", _clkHZ/1e6); snprintf(mess, 256, "JTAG TCK frequency set to %.3f MHz\n\n", (double)speed_clock[setClk_index] / MHZ(1));
printInfo(mess); printInfo(mess);
return _clkHZ; return _clkHZ;
} }
@ -271,9 +267,10 @@ int CH347Jtag::_setClkFreq(uint32_t clkHZ)
int CH347Jtag::writeTMS(const uint8_t *tms, uint32_t len, bool flush_buffer, int CH347Jtag::writeTMS(const uint8_t *tms, uint32_t len, bool flush_buffer,
__attribute__((unused)) const uint8_t tdi) __attribute__((unused)) const uint8_t tdi)
{ {
if (get_obuf_length() < (int)(len * 2 + 4)) { // check if there is enough room left // if (get_obuf_length() < (int)(len * 2 + 4)) { // check if there is enough room left
flush(); // flush();
} // }
flush();
uint8_t *ptr = obuf; uint8_t *ptr = obuf;
for (uint32_t i = 0; i < len; ++i) { for (uint32_t i = 0; i < len; ++i) {
if (ptr == obuf) { if (ptr == obuf) {
@ -424,12 +421,12 @@ int CH347Jtag::writeTDI(const uint8_t *tx, uint8_t *rx, uint32_t len, bool end)
cerr << "writeTDI: invalid read data: " << endl; cerr << "writeTDI: invalid read data: " << endl;
return -EXIT_FAILURE; return -EXIT_FAILURE;
} }
for (unsigned i = 0; i < size / 8; ++i) { for (unsigned i = 0; i < size; ++i) {
uint8_t b = 0; if (ibuf[3 + i] == 0x01) {
uint8_t *xb = &ibuf[3 + i * 8]; *rptr |= (0x01 << i);
for (unsigned j = 0; j < 8; ++j) }else{
b |= (xb[j] & 1) << j; *rptr &= ~(0x01 << i);
*rptr++ = b; }
} }
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

2
src/ch347jtag.hpp
View File

@ -12,7 +12,7 @@ constexpr unsigned MAX_BUFFER = 512;
class CH347Jtag : public JtagInterface { class CH347Jtag : public JtagInterface {
public: public:
CH347Jtag(uint32_t clkHZ, int8_t verbose); CH347Jtag(uint32_t clkHZ, int8_t verbose, int vid, int pid, uint8_t bus_addr, uint8_t dev_addr);
virtual ~CH347Jtag(); virtual ~CH347Jtag();
int setClkFreq(uint32_t clkHZ) override { return _setClkFreq(clkHZ); }; int setClkFreq(uint32_t clkHZ) override { return _setClkFreq(clkHZ); };

2
src/jtag.cpp
View File

@ -103,7 +103,7 @@ Jtag::Jtag(const cable_t &cable, const jtag_pins_conf_t *pin_conf,
_jtag = new CH552_jtag(cable, dev, serial, clkHZ, verbose); _jtag = new CH552_jtag(cable, dev, serial, clkHZ, verbose);
break; break;
case MODE_CH347: case MODE_CH347:
_jtag = new CH347Jtag(clkHZ, verbose); _jtag = new CH347Jtag(clkHZ, verbose, cable.vid, cable.pid, cable.bus_addr, cable.device_addr);
break; break;
case MODE_DIRTYJTAG: case MODE_DIRTYJTAG:
_jtag = new DirtyJtag(clkHZ, verbose); _jtag = new DirtyJtag(clkHZ, verbose);