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

* linux_ppdev.h: added missing msg level for avrdude_message in ppi_claim/ppi_release macros 

* avrftdi.c: added break at end of default


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1325 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Rene Liebscher 2014-06-23 20:20:38 +00:00
parent eab60712a0
commit ec361815fa
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2014-06-23 Rene Liebscher <R.Liebscher@gmx.de>
* linux_ppdev.h: added missing msg level for avrdude_message
in ppi_claim/ppi_release macros
* avrftdi.c: added break at end of default
2014-06-21 Rene Liebscher <R.Liebscher@gmx.de> 2014-06-21 Rene Liebscher <R.Liebscher@gmx.de>
patch #8419 fix ftdi_syncbb hang with libftdi 1 patch #8419 fix ftdi_syncbb hang with libftdi 1

2
avrftdi.c
View File

@ -147,7 +147,7 @@ void avrftdi_log(int level, const char * func, int line,
case INFO: avrdude_message(MSG_INFO, "I "); break; case INFO: avrdude_message(MSG_INFO, "I "); break;
case DEBUG: avrdude_message(MSG_INFO, "D "); break; case DEBUG: avrdude_message(MSG_INFO, "D "); break;
case TRACE: avrdude_message(MSG_INFO, "T "); break; case TRACE: avrdude_message(MSG_INFO, "T "); break;
default: avrdude_message(MSG_INFO, " "); default: avrdude_message(MSG_INFO, " "); break;
} }
avrdude_message(MSG_INFO, "%s(%d): ", func, line); avrdude_message(MSG_INFO, "%s(%d): ", func, line);
} }

6
linux_ppdev.h
View File

@ -33,15 +33,15 @@
#define ppi_claim(fd) \ #define ppi_claim(fd) \
if (ioctl(fd, PPCLAIM)) { \ if (ioctl(fd, PPCLAIM)) { \
avrdude_message("%s: can't claim device \"%s\": %s\n\n", \ avrdude_message(MSG_INFO, "%s: can't claim device \"%s\": %s\n\n", \
progname, port, strerror(errno)); \ progname, port, strerror(errno)); \
close(fd); \ close(fd); \
return; \ return; \
} }
#define ppi_release(fd) \ #define ppi_release(fd) \
if (ioctl(fd, PPRELEASE)) { \ if (ioctl(fd, PPRELEASE)) { \
avrdude_message("%s: can't release device: %s\n\n", \ avrdude_message(MSG_INFO, "%s: can't release device: %s\n\n", \
progname, strerror(errno)); \ progname, strerror(errno)); \
} }