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

Add -vvvv trace output to usbasp_transmit(). 

git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1189 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Joerg Wunsch 2013-08-31 07:32:18 +00:00
parent 056b5f6e77
commit ab68c47c7f
2 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2013-08-31 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
* usbasp.c (usbasp_transmit): Add -vvvv trace output.
2013-08-30 Joerg Wunsch <j.gnu@uriah.heep.sax.de> 2013-08-30 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
bug #39893: Verification failure with AVRISPmkII and Xmega bug #39893: Verification failure with AVRISPmkII and Xmega

49
usbasp.c
View File

@ -191,6 +191,31 @@ static void usbasp_teardown(PROGRAMMER * pgm)
} }
/* Internal functions */ /* Internal functions */
static const char *usbasp_get_funcname(unsigned char functionid)
{
switch (functionid) {
case USBASP_FUNC_CONNECT: return "USBASP_FUNC_CONNECT"; break;
case USBASP_FUNC_DISCONNECT: return "USBASP_FUNC_DISCONNECT"; break;
case USBASP_FUNC_TRANSMIT: return "USBASP_FUNC_TRANSMIT"; break;
case USBASP_FUNC_READFLASH: return "USBASP_FUNC_READFLASH"; break;
case USBASP_FUNC_ENABLEPROG: return "USBASP_FUNC_ENABLEPROG"; break;
case USBASP_FUNC_WRITEFLASH: return "USBASP_FUNC_WRITEFLASH"; break;
case USBASP_FUNC_READEEPROM: return "USBASP_FUNC_READEEPROM"; break;
case USBASP_FUNC_WRITEEEPROM: return "USBASP_FUNC_WRITEEEPROM"; break;
case USBASP_FUNC_SETLONGADDRESS: return "USBASP_FUNC_SETLONGADDRESS"; break;
case USBASP_FUNC_SETISPSCK: return "USBASP_FUNC_SETISPSCK"; break;
case USBASP_FUNC_TPI_CONNECT: return "USBASP_FUNC_TPI_CONNECT"; break;
case USBASP_FUNC_TPI_DISCONNECT: return "USBASP_FUNC_TPI_DISCONNECT"; break;
case USBASP_FUNC_TPI_RAWREAD: return "USBASP_FUNC_TPI_RAWREAD"; break;
case USBASP_FUNC_TPI_RAWWRITE: return "USBASP_FUNC_TPI_RAWWRITE"; break;
case USBASP_FUNC_TPI_READBLOCK: return "USBASP_FUNC_TPI_READBLOCK"; break;
case USBASP_FUNC_TPI_WRITEBLOCK: return "USBASP_FUNC_TPI_WRITEBLOCK"; break;
case USBASP_FUNC_GETCAPABILITIES: return "USBASP_FUNC_GETCAPABILITIES"; break;
default: return "Unknown USBASP function"; break;
}
}
/* /*
* wrapper for usb_control_msg call * wrapper for usb_control_msg call
*/ */
@ -199,6 +224,21 @@ static int usbasp_transmit(PROGRAMMER * pgm,
unsigned char send[4], unsigned char * buffer, int buffersize) unsigned char send[4], unsigned char * buffer, int buffersize)
{ {
int nbytes; int nbytes;
if (verbose > 3) {
fprintf(stderr,
"%s: usbasp_transmit(\"%s\", 0x%02x, 0x%02x, 0x%02x, 0x%02x)\n",
progname,
usbasp_get_funcname(functionid), send[0], send[1], send[2], send[3]);
if (!receive && buffersize > 0) {
int i;
fprintf(stderr, "%s => ", progbuf);
for (i = 0; i < buffersize; i++)
fprintf(stderr, "[%02x] ", buffer[i]);
fprintf(stderr, "\n");
}
}
#ifdef USE_LIBUSB_1_0 #ifdef USE_LIBUSB_1_0
nbytes = libusb_control_transfer(PDATA(pgm)->usbhandle, nbytes = libusb_control_transfer(PDATA(pgm)->usbhandle,
(LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE | (receive << 7)) & 0xff, (LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE | (receive << 7)) & 0xff,
@ -225,6 +265,15 @@ static int usbasp_transmit(PROGRAMMER * pgm,
return -1; return -1;
} }
#endif #endif
if (verbose > 3 && receive && nbytes > 0) {
int i;
fprintf(stderr, "%s<= ", progbuf);
for (i = 0; i < nbytes; i++)
fprintf(stderr, "[%02x] ", buffer[i]);
fprintf(stderr, "\n");
}
return nbytes; return nbytes;
} }