Contributed by Klaus Leidinger <klaus@mikrocontroller-projekte.de>:
* main.c: Realign verbose messages. * avrpart.c: (Ditto.) * avr910.c: Print the device code selected in verbose mode. * butterfly.c: (Ditto.) git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@772 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
parent
95200e0522
commit
95cdd4dcb4
|
@ -1,3 +1,11 @@
|
|||
2008-06-07 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
|
||||
|
||||
Contributed by Klaus Leidinger <klaus@mikrocontroller-projekte.de>:
|
||||
* main.c: Realign verbose messages.
|
||||
* avrpart.c: (Ditto.)
|
||||
* avr910.c: Print the device code selected in verbose mode.
|
||||
* butterfly.c: (Ditto.)
|
||||
|
||||
2008-06-07 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
|
||||
|
||||
Contributed by Klaus Leidinger <klaus@mikrocontroller-projekte.de>:
|
||||
|
|
5
avr910.c
5
avr910.c
|
@ -268,6 +268,11 @@ static int avr910_initialize(PROGRAMMER * pgm, AVRPART * p)
|
|||
avr910_send(pgm, buf, 2);
|
||||
avr910_vfy_cmd_sent(pgm, "select device");
|
||||
|
||||
if (verbose)
|
||||
fprintf(stderr,
|
||||
"%s: avr910_devcode selected: 0x%02x\n",
|
||||
progname, (unsigned)buf[1]);
|
||||
|
||||
avr910_enter_prog_mode(pgm);
|
||||
|
||||
return 0;
|
||||
|
|
32
avrpart.c
32
avrpart.c
|
@ -488,22 +488,22 @@ void avr_display(FILE * f, AVRPART * p, const char * prefix, int verbose)
|
|||
AVRMEM * m;
|
||||
|
||||
fprintf(f,
|
||||
"%sAVR Part : %s\n"
|
||||
"%sChip Erase delay : %d us\n"
|
||||
"%sPAGEL : P%02X\n"
|
||||
"%sBS2 : P%02X\n"
|
||||
"%sRESET disposition : %s\n"
|
||||
"%sRETRY pulse : %s\n"
|
||||
"%sserial program mode : %s\n"
|
||||
"%sparallel program mode : %s\n"
|
||||
"%sTimeout : %d\n"
|
||||
"%sStabDelay : %d\n"
|
||||
"%sCmdexeDelay : %d\n"
|
||||
"%sSyncLoops : %d\n"
|
||||
"%sByteDelay : %d\n"
|
||||
"%sPollIndex : %d\n"
|
||||
"%sPollValue : 0x%02x\n"
|
||||
"%sMemory Detail :\n\n",
|
||||
"%sAVR Part : %s\n"
|
||||
"%sChip Erase delay : %d us\n"
|
||||
"%sPAGEL : P%02X\n"
|
||||
"%sBS2 : P%02X\n"
|
||||
"%sRESET disposition : %s\n"
|
||||
"%sRETRY pulse : %s\n"
|
||||
"%sserial program mode : %s\n"
|
||||
"%sparallel program mode : %s\n"
|
||||
"%sTimeout : %d\n"
|
||||
"%sStabDelay : %d\n"
|
||||
"%sCmdexeDelay : %d\n"
|
||||
"%sSyncLoops : %d\n"
|
||||
"%sByteDelay : %d\n"
|
||||
"%sPollIndex : %d\n"
|
||||
"%sPollValue : 0x%02x\n"
|
||||
"%sMemory Detail :\n\n",
|
||||
prefix, p->desc,
|
||||
prefix, p->chip_erase_delay,
|
||||
prefix, p->pagel,
|
||||
|
|
|
@ -321,6 +321,11 @@ static int butterfly_initialize(PROGRAMMER * pgm, AVRPART * p)
|
|||
butterfly_send(pgm, buf, 2);
|
||||
butterfly_vfy_cmd_sent(pgm, "select device");
|
||||
|
||||
if (verbose)
|
||||
fprintf(stderr,
|
||||
"%s: devcode selected: 0x%02x\n",
|
||||
progname, (unsigned)buf[1]);
|
||||
|
||||
butterfly_enter_prog_mode(pgm);
|
||||
|
||||
return 0;
|
||||
|
|
16
main.c
16
main.c
|
@ -741,20 +741,26 @@ int main(int argc, char * argv [])
|
|||
}
|
||||
|
||||
if (verbose) {
|
||||
fprintf(stderr, "%sUsing Port : %s\n", progbuf, port);
|
||||
fprintf(stderr, "%sUsing Programmer : %s\n", progbuf, programmer);
|
||||
fprintf(stderr, "%sUsing Port : %s\n", progbuf, port);
|
||||
fprintf(stderr, "%sUsing Programmer : %s\n", progbuf, programmer);
|
||||
if ((strcmp(pgm->type, "avr910") == 0)) {
|
||||
fprintf(stderr, "%savr910_devcode (avrdude.conf) : ", progbuf);
|
||||
if(p->avr910_devcode)fprintf(stderr, "0x%x\n", p->avr910_devcode);
|
||||
else fprintf(stderr, "none\n");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (baudrate != 0) {
|
||||
if (verbose) {
|
||||
fprintf(stderr, "%sOverriding Baud Rate : %d\n", progbuf, baudrate);
|
||||
fprintf(stderr, "%sOverriding Baud Rate : %d\n", progbuf, baudrate);
|
||||
}
|
||||
pgm->baudrate = baudrate;
|
||||
}
|
||||
|
||||
if (bitclock != 0.0) {
|
||||
if (verbose) {
|
||||
fprintf(stderr, "%sSetting bit clk period: %.1f\n", progbuf, bitclock);
|
||||
fprintf(stderr, "%sSetting bit clk period : %.1f\n", progbuf, bitclock);
|
||||
}
|
||||
|
||||
pgm->bitclock = bitclock * 1e-6;
|
||||
|
@ -762,7 +768,7 @@ int main(int argc, char * argv [])
|
|||
|
||||
if (ispdelay != 0) {
|
||||
if (verbose) {
|
||||
fprintf(stderr, "%sSetting isp clock delay: %3i\n", progbuf, ispdelay);
|
||||
fprintf(stderr, "%sSetting isp clock delay : %3i\n", progbuf, ispdelay);
|
||||
}
|
||||
pgm->ispdelay = ispdelay;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue