X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/8121bc50c29cae60e7ea5b5be5cbafffb8ba3563..e81047b8157f32990ff39fa08f4b58ae614ccd06:/jtagkey.c diff --git a/jtagkey.c b/jtagkey.c index 0078e47..9891f4b 100644 --- a/jtagkey.c +++ b/jtagkey.c @@ -3,10 +3,13 @@ #include "usb-driver.h" #include "jtagkey.h" +#define USBBUFSIZE 384 + static struct ftdi_context ftdic; int jtagkey_init(unsigned short vid, unsigned short pid) { int ret = 0; + unsigned char c; if ((ret = ftdi_init(&ftdic)) != 0) { fprintf(stderr, "unable to initialise libftdi: %d (%s)\n", ret, ftdi_get_error_string(&ftdic)); @@ -28,22 +31,27 @@ int jtagkey_init(unsigned short vid, unsigned short pid) { return ret; } +#if 0 if ((ret = ftdi_write_data_set_chunksize(&ftdic, 1)) != 0) { fprintf(stderr, "unable to set write chunksize: %d (%s)\n", ret, ftdi_get_error_string(&ftdic)); return ret; } +#endif if ((ret = ftdi_set_latency_timer(&ftdic, 1)) != 0) { fprintf(stderr, "unable to set latency timer: %d (%s)\n", ret, ftdi_get_error_string(&ftdic)); return ret; } - if ((ret = ftdi_set_baudrate(&ftdic, 230400)) != 0) { + if ((ret = ftdi_set_baudrate(&ftdic, 500000)) != 0) { fprintf(stderr, "unable to set baudrate: %d (%s)\n", ret, ftdi_get_error_string(&ftdic)); return ret; } - if ((ret = ftdi_set_bitmode(&ftdic, JTAGKEY_TCK|JTAGKEY_TDI|JTAGKEY_TMS|JTAGKEY_OEn, 1)) != 0) { + c = 0x00; + ftdi_write_data(&ftdic, &c, 1); + + if ((ret = ftdi_set_bitmode(&ftdic, JTAGKEY_TCK|JTAGKEY_TDI|JTAGKEY_TMS|JTAGKEY_OEn, BITMODE_SYNCBB)) != 0) { fprintf(stderr, "unable to enable bitbang mode: %d (%s)\n", ret, ftdi_get_error_string(&ftdic)); return ret; } @@ -86,10 +94,33 @@ void jtagkey_state(unsigned char data) { int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase, int ecpbase, int num) { int ret = 0; int i; + int nread = 0; unsigned long port; unsigned char val; - static unsigned char last_write = 0; - unsigned char data; + static unsigned char last_data = 0; + static unsigned char last_write = 0x00; + static unsigned char writebuf[USBBUFSIZE], *writepos = writebuf; + static unsigned char readbuf[USBBUFSIZE], *readpos; + unsigned char data, prev_data; + + /* Count reads */ + for (i = 0; i < num; i++) + if (tr[i].cmdTrans == PP_READ) + nread++; + + /* Write combining */ + if ((writepos-writebuf > sizeof(writebuf)-num) || (nread && writepos-writebuf)) { + DPRINTF("writing %d bytes due to %d following reads in %d chunks or full buffer\n", writepos-writebuf, nread, num); + + ftdi_write_data(&ftdic, writebuf, writepos-writebuf); + + i = 0; + while (i < writepos-writebuf) { + i += ftdi_read_data(&ftdic, readbuf, sizeof(readbuf)); + } + DPRINTF("read %d/%d bytes\n", i, writepos-writebuf); + writepos = writebuf; + } for (i = 0; i < num; i++) { DPRINTF("dwPort: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n", @@ -104,6 +135,10 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase, DPRINTF("write byte: %d\n", val); #endif + /* Pad writebuf for read-commands in stream */ + *writepos = last_data; + prev_data = last_data; + if (port == ppbase + PP_DATA) { DPRINTF("data port\n"); @@ -133,19 +168,21 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase, DPRINTF("!TMS\n"); } if (val & PP_CTRL) { - data |= JTAGKEY_OEn; + data = JTAGKEY_OEn; DPRINTF("CTRL\n"); } else { DPRINTF("!CTRL\n"); } - ftdi_write_data(&ftdic, &data, 1); -#if 0 - do { - ftdi_read_pins(&ftdic, &tmp); - } while ((tmp & (JTAGKEY_TDI|JTAGKEY_TMS|JTAGKEY_TCK|JTAGKEY_TDI)) != data); -#endif + if (val & PP_PROG) { + DPRINTF("PROG\n"); + } else { + DPRINTF("!PROG\n"); + } + + *writepos = data; + last_data = data; last_write = val; break; @@ -154,20 +191,69 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase, ret = -1; break; } + } + + if (nread || (*writepos != prev_data)) + writepos++; + } + + if (nread) + { + DPRINTF("writing %d bytes\n", writepos-writebuf); + ftdi_write_data(&ftdic, writebuf, writepos-writebuf); + DPRINTF("reading %d bytes\n", writepos-writebuf); + + i = 0; + while (i < writepos-writebuf) { + i += ftdi_read_data(&ftdic, readbuf, sizeof(readbuf)); + } + DPRINTF("read %d bytes\n", i); + +#ifdef DEBUG + DPRINTF("write: "); + hexdump(writebuf, writepos-writebuf); + DPRINTF("read: "); + hexdump(readbuf, i); +#endif + + writepos = writebuf; + } else { + return ret; + } + + readpos = readbuf; + readpos += 0; + + for (i = 0; i < num; i++) { + DPRINTF("dwPort: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n", + (unsigned long)tr[i].dwPort, tr[i].cmdTrans, tr[i].dwBytes, + tr[i].fAutoinc, tr[i].dwOptions); + + port = (unsigned long)tr[i].dwPort; + val = tr[i].Data.Byte; + readpos++; + + if (port == ppbase + PP_DATA) { + if (tr[i].cmdTrans == PP_WRITE) { + last_write = val; + } } else if (port == ppbase + PP_STATUS) { - DPRINTF("status port (last write: %d)\n", last_write); + DPRINTF("status port (last write: 0x%x)\n", last_write); switch(tr[i].cmdTrans) { case PP_READ: - ftdi_read_pins(&ftdic, &data); + data = *readpos; #ifdef DEBUG DPRINTF("READ: 0x%x\n", data); jtagkey_state(data); #endif val = 0x00; - if (data & JTAGKEY_TDO) + if ((data & JTAGKEY_TDO) && (last_write & PP_PROG)) val |= PP_TDO; + if (!(last_write & PP_PROG)) + val |= 0x08; + if (last_write & 0x40) val |= 0x20; else @@ -183,16 +269,7 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase, ret = -1; break; } - } else if (port == ppbase + PP_CONTROL) { - DPRINTF("control port\n"); - } else if ((port == ecpbase + PP_ECP_CFGA) && ecpbase) { - DPRINTF("ECP_CFGA port\n"); - } else if ((port == ecpbase + PP_ECP_CFGB) && ecpbase) { - DPRINTF("ECP_CFGB port\n"); - } else if ((port == ecpbase + PP_ECP_ECR) && ecpbase) { - DPRINTF("ECP_ECR port\n"); } else { - DPRINTF("access to unsupported address range!\n"); ret = 0; }