From 18fa1ca9e307116a672da9a9cb99b4d6e9faa556 Mon Sep 17 00:00:00 2001 From: rliebscher Date: Mon, 23 Jun 2014 20:20:38 +0000 Subject: [PATCH] * 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 --- ChangeLog | 6 ++++++ avrftdi.c | 2 +- linux_ppdev.h | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d9aaadb..b755c32c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-06-23 Rene Liebscher + + * 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 patch #8419 fix ftdi_syncbb hang with libftdi 1 diff --git a/avrftdi.c b/avrftdi.c index 44475a29..d42e2567 100644 --- a/avrftdi.c +++ b/avrftdi.c @@ -147,7 +147,7 @@ void avrftdi_log(int level, const char * func, int line, case INFO: avrdude_message(MSG_INFO, "I "); break; case DEBUG: avrdude_message(MSG_INFO, "D "); 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); } diff --git a/linux_ppdev.h b/linux_ppdev.h index 64085901..1d2e6e2e 100644 --- a/linux_ppdev.h +++ b/linux_ppdev.h @@ -33,15 +33,15 @@ #define ppi_claim(fd) \ 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)); \ close(fd); \ - return; \ + return; \ } #define ppi_release(fd) \ 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)); \ }