* buspirate.c: Replace GNU-only %as with %s in sscanf call.

* ser_win32.c(ser_set_dtr_rts): Fixed typo in parameter name.
	* NEWS: Announce BusPirate.



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@865 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
mludvig 2009-10-12 06:51:53 +00:00
parent 93245b144f
commit 2dbc1647ad
4 changed files with 11 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2009-10-12 Michal Ludvig <mludvig@logix.net.nz>
* buspirate.c: Replace GNU-only %as with %s in sscanf call.
* ser_win32.c(ser_set_dtr_rts): Fixed typo in parameter name.
* NEWS: Announce BusPirate.
2009-10-10 Michal Ludvig <mludvig@logix.net.nz> 2009-10-10 Michal Ludvig <mludvig@logix.net.nz>
Support for Arduino auto-reset: Support for Arduino auto-reset:

2
NEWS
View File

@ -11,6 +11,8 @@ Current:
* New programmers supported: * New programmers supported:
- BusPirate
* Bugfixes * Bugfixes
Version 5.8: Version 5.8:

View File

@ -174,12 +174,12 @@ static int buspirate_start_spi_mode(struct programmer_t *pgm)
{ {
int spi_cmd = -1; int spi_cmd = -1;
int cmd; int cmd;
char *rcvd, *mode, buf[5]; char *rcvd, mode[11], buf[5];
buspirate_send(pgm, "M\n"); buspirate_send(pgm, "M\n");
while(1) { while(1) {
rcvd = buspirate_readline(pgm, NULL, 0); rcvd = buspirate_readline(pgm, NULL, 0);
if (spi_cmd == -1 && sscanf(rcvd, "%d. %as", &cmd, &mode)) { if (spi_cmd == -1 && sscanf(rcvd, "%d. %10s", &cmd, mode)) {
if (strcmp(mode, "SPI") == 0) if (strcmp(mode, "SPI") == 0)
spi_cmd = cmd; spi_cmd = cmd;
} }

View File

@ -203,7 +203,7 @@ static void ser_close(union filedescriptor *fd)
hComPort = INVALID_HANDLE_VALUE; hComPort = INVALID_HANDLE_VALUE;
} }
static int ser_set_dtr_rts(union filedescriptor *fdp, int is_on) static int ser_set_dtr_rts(union filedescriptor *fd, int is_on)
{ {
HANDLE hComPort=(HANDLE)fd->pfd; HANDLE hComPort=(HANDLE)fd->pfd;