jackcartersmith/xilinx-usb-driver
Archived
1
0
Fork 0
Code Releases Activity

some microoptimazation

Browse Source
This commit is contained in:
michael 2007-05-01 10:21:51 +00:00
parent 66c1fd53cb
commit 617583d072
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jtagkey.c
View File

@ -161,6 +161,7 @@ static void *jtagkey_reader(void *thread_arg) {
pthread_exit(NULL); pthread_exit(NULL);
} }
/* TODO: Interpret JTAG commands and transfer in MPSSE mode */
int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase, int ecpbase, int num) { int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase, int ecpbase, int num) {
int ret = 0; int ret = 0;
int i; int i;
@ -171,7 +172,7 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
static unsigned char last_write = 0x00; static unsigned char last_write = 0x00;
static unsigned char writebuf[USBBUFSIZE], *writepos = writebuf; static unsigned char writebuf[USBBUFSIZE], *writepos = writebuf;
static unsigned char readbuf[USBBUFSIZE], *readpos; static unsigned char readbuf[USBBUFSIZE], *readpos;
unsigned char data, prev_data; unsigned char data, prev_data, last_cyc_write;
struct jtagkey_reader_arg targ; struct jtagkey_reader_arg targ;
pthread_t reader_thread; pthread_t reader_thread;
@ -212,6 +213,8 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
writepos = writebuf; writepos = writebuf;
} }
last_cyc_write = last_write;
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
DPRINTF("dwPort: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n", DPRINTF("dwPort: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n",
(unsigned long)tr[i].dwPort, tr[i].cmdTrans, tr[i].dwBytes, (unsigned long)tr[i].dwPort, tr[i].cmdTrans, tr[i].dwBytes,
@ -283,7 +286,7 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
} }
} }
if (nread || (*writepos != prev_data) || (i == num-1)) if ((tr[i].cmdTrans == PP_READ) || (*writepos != prev_data) || (i == num-1))
writepos++; writepos++;
} }
@ -316,6 +319,7 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
} }
readpos = readbuf; readpos = readbuf;
last_write = last_cyc_write;
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
DPRINTF("dwPort: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n", DPRINTF("dwPort: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n",
@ -324,6 +328,10 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
port = (unsigned long)tr[i].dwPort; port = (unsigned long)tr[i].dwPort;
val = tr[i].Data.Byte; val = tr[i].Data.Byte;
if ((tr[i].cmdTrans != PP_READ) && (val == last_write) && (i != num-1))
continue;
readpos++; readpos++;
if (port == ppbase + PP_DATA) { if (port == ppbase + PP_DATA) {
@ -345,7 +353,7 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
if ((data & JTAGKEY_TDO) && (last_write & PP_PROG)) if ((data & JTAGKEY_TDO) && (last_write & PP_PROG))
val |= PP_TDO; val |= PP_TDO;
if (!(last_write & PP_PROG)) if (~last_write & PP_PROG)
val |= 0x08; val |= 0x08;
if (last_write & 0x40) if (last_write & 0x40)