avr/avrdude
2
0
Fork 0
mirror of https://github.com/mariusgreuel/avrdude.git synced 2025-12-17 02:54:17 +00:00
Code Issues Projects Releases Wiki Activity

Exchange of fprintf(stderr, ...) with avrdude_message(...).

Browse Source 
This change was made for the shared library, since library functions
should not write to std-streams directly. Instead avrdude_message()
has to be implemented by the library user. For the avrdude application
this function is implemented in main.c.



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1305 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
awachtler
2014-05-18 08:41:46 +00:00
parent b9093f88dc
commit 7b43620402
45 changed files with 2380 additions and 2896 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
wiring.c
View File

@@ -85,9 +85,8 @@ static void wiring_setup(PROGRAMMER * pgm)
* Now prepare our data
*/
if ((mycookie = malloc(sizeof(struct wiringpdata))) == 0) {
fprintf(stderr,
"%s: wiring_setup(): Out of memory allocating private data\n",
progname);
avrdude_message("%s: wiring_setup(): Out of memory allocating private data\n",
progname);
exit(1);
}
memset(mycookie, 0, sizeof(struct wiringpdata));
@@ -124,25 +123,22 @@ static int wiring_parseextparms(PROGRAMMER * pgm, LISTID extparms)
int newsnooze;
if (sscanf(extended_param, "snooze=%i", &newsnooze) != 1 ||
newsnooze < 0) {
fprintf(stderr,
"%s: wiring_parseextparms(): invalid snooze time '%s'\n",
progname, extended_param);
avrdude_message("%s: wiring_parseextparms(): invalid snooze time '%s'\n",
progname, extended_param);
rv = -1;
continue;
}
if (verbose >= 2) {
fprintf(stderr,
"%s: wiring_parseextparms(): snooze time set to %d ms\n",
progname, newsnooze);
avrdude_message("%s: wiring_parseextparms(): snooze time set to %d ms\n",
progname, newsnooze);
}
WIRINGPDATA(mycookie)->snoozetime = newsnooze;
continue;
}
fprintf(stderr,
"%s: wiring_parseextparms(): invalid extended parameter '%s'\n",
progname, extended_param);
avrdude_message("%s: wiring_parseextparms(): invalid extended parameter '%s'\n",
progname, extended_param);
rv = -1;
}
@@ -165,16 +161,14 @@ static int wiring_open(PROGRAMMER * pgm, char * port)
timetosnooze = WIRINGPDATA(mycookie)->snoozetime;
if (verbose >= 2) {
fprintf(stderr,
"%s: wiring_open(): snoozing for %d ms\n",
progname, timetosnooze);
avrdude_message("%s: wiring_open(): snoozing for %d ms\n",
progname, timetosnooze);
}
while (timetosnooze--)
usleep(1000);
if (verbose >= 2) {
fprintf(stderr,
"%s: wiring_open(): done snoozing\n",
progname);
avrdude_message("%s: wiring_open(): done snoozing\n",
progname);
}
} else {
@@ -184,9 +178,8 @@ static int wiring_open(PROGRAMMER * pgm, char * port)
/* since they are active LOW signals. */
if (verbose >= 2) {
fprintf(stderr,
"%s: wiring_open(): releasing DTR/RTS\n",
progname);
avrdude_message("%s: wiring_open(): releasing DTR/RTS\n",
progname);
}
serial_set_dtr_rts(&pgm->fd, 0);
@@ -196,9 +189,8 @@ static int wiring_open(PROGRAMMER * pgm, char * port)
/* are asserted (i.e. logic LOW) again. */
if (verbose >= 2) {
fprintf(stderr,
"%s: wiring_open(): asserting DTR/RTS\n",
progname);
avrdude_message("%s: wiring_open(): asserting DTR/RTS\n",
progname);
}
serial_set_dtr_rts(&pgm->fd, 1);