Commit Graph

1255 Commits

Author SHA1 Message Date
Joerg Wunsch 9d8f653f66 Add the "m4" directory to the list of files ignored by SVN.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1315 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-05-19 13:07:58 +00:00
Joerg Wunsch d3149cee79 bug #41854: avrdude 6.1 does not compile on systems without libUSB
Submitted by Didrik Madheden:
* flip1.c: Provide dummy functions for the #ifndef HAVE_LIBUSB case
* flip2.c: (Dito.)



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1314 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-05-19 12:32:33 +00:00
Joerg Wunsch 8b3a4aab56 Yet another slip from previous commits.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1313 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-05-19 12:06:20 +00:00
Joerg Wunsch 94eed0dffe Remove obsolete file (forgotten in previous commit).
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1312 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-05-19 12:04:04 +00:00
Joerg Wunsch d09bc2e1fb Join the former "public" header files (avr.h avrpart.h pindefs.h
serial.h fileio.h safemode.h update.h pgm_type.h config.h confwin.h
lists.h) into a single header that can be included by anyone wanting
to link against the library.

Adapt everything to cope with this situation.


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1311 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-05-19 10:01:59 +00:00
Joerg Wunsch d8089139d2 Cleanup unused include files.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1310 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-05-19 08:52:00 +00:00
Joerg Wunsch 491876339b ppi_open() does not return a value
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1309 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-05-19 08:48:30 +00:00
Joerg Wunsch 8a6f8b04bd * linux_ppdev.h: Caught two more instances of exit()
* configure.ac: Add AC_CONFIG_MACRO_DIR as suggested by libtoolize
* Makefile.am: add -I m4 to ACLOCAL_AMFLAGS as suggested by libtoolize



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1308 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-05-19 08:46:52 +00:00
Axel Wachtler 15a08ee93f added Changelog entry for rev 1305/1306
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1307 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-05-18 11:34:36 +00:00
Joerg Wunsch 3d4445ae87 Submitted by Georg von Zengen:
patch #8463: typo in rev 1305



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1306 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-05-18 10:58:40 +00:00
Axel Wachtler eb5fcb581f Exchange of fprintf(stderr, ...) with avrdude_message(...).
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
2014-05-18 08:41:46 +00:00
Joerg Wunsch 52dd5cc7ac Make a first attempt to build a shared library (not to be installed by
now).



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1304 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-05-16 17:50:40 +00:00
Joerg Wunsch 96647f1486 * dfu.c (dfu_open, dfu_init): Fix signature of the dummy functions
(in the !HAVE_LIBUSB case) to match prototypes.



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1303 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-05-16 16:02:29 +00:00
Joerg Wunsch a13d8b1ecf Fix syntax error (forgotten closing paren).
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1302 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-05-16 16:01:08 +00:00
Joerg Wunsch 57903bdeb8 Replace all occurences of exit() in potential library code
by appropriate return values.


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1301 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-05-16 15:52:25 +00:00
Rene Liebscher 2eec999cdb bug #42310: New part description for AT90PWM216
* avrdude.conf.in: added pwm216 entry



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1300 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-05-07 21:19:12 +00:00
Rene Liebscher 868416dbba bug #42158 Linux GPIO - Source Typo
* pindefs.h: fixed typo


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1299 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-05-07 20:53:34 +00:00
Rene Liebscher 487584b784 bug #42056: double free or corruption triggered at exit
* pgm.c: copy usbpid list in pgm_dup


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1298 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-04-14 21:41:43 +00:00
Joerg Wunsch 408184c43d Add a warning to not modify the file manually.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1297 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-04-05 08:01:08 +00:00
Joerg Wunsch 584654b70e Remove the note that users might edit the system-wide config file.
This file will be overwritten by the next installation, so it's not a
good idea to manually modify it.  Using the -C +file option is a much
better way for user modifications.



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1296 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-04-05 07:58:58 +00:00
Joerg Wunsch d69b85c974 Bump everything for post-6.1-release.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1295 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-03-12 23:15:46 +00:00
Joerg Wunsch 3e0b544560 Bump version to 6.1; prepare for release.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1291 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-03-12 22:34:08 +00:00
Joerg Wunsch a341da1fec * pgm.c (pgm_free): Cleanup police: destroy the p->usbpid
list when freeing the programmer struct.




git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1290 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-03-12 21:20:32 +00:00
Joerg Wunsch b9420a9831 bug #40782: Verify errors for object size > 16 k on x32e5 due
to typo in avrdude.conf
* avrdude.conf.in (ATmega8E5, ATmega32E5): fix boot location




git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1289 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-03-12 21:08:05 +00:00
Joerg Wunsch e4abb62ddb Add the new Atmel-ICE, in all of JTAG, PDI, dW, and ISP modes.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1288 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-02-28 14:36:38 +00:00
Joerg Wunsch e6410fc5db Bump copyright year.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1287 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-02-28 14:26:24 +00:00
Joerg Wunsch a1933951b4 In jtag3_recv, avoid memmov'ing more data than available
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1286 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-02-28 14:24:48 +00:00
Joerg Wunsch f7bb8a1c2a Documentation updates for EDBG.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1285 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-02-27 13:32:58 +00:00
Joerg Wunsch 98febe591a For EDBG protocol, always use 512-byte block I/O. The lower layers
will split this according to the EP's maxsize.  This makes it work
over USB 1.1 connections (albeit very slowly, due to the interrupt
transfers used).


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1284 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-02-27 13:26:15 +00:00
Joerg Wunsch 343330fddd Turn the usbpid parameter of the programmer into a list of PIDs. Make
the JTAGICE3 programmer handle a list of PIDs, by trying each of them
in sequence.  Use a single, central jtag3_open_common() function to
handle the common code of all jtag3_open_* functions.  Centralize all
USB VID/PID definitions in usbdevs.h.



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1283 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-02-27 13:06:03 +00:00
Joerg Wunsch 0ca7d30267 If the device is not open, don't try closing it.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1282 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-02-27 07:35:15 +00:00
Joerg Wunsch 2de8e9c8ca usbdev_close() returns nothing.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1281 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-02-27 07:34:33 +00:00
Joerg Wunsch 3977713be0 If there's no USB handle, bail out from all functions immediately.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1280 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-02-27 07:31:55 +00:00
Joerg Wunsch b363c7b710 In usbdev_open(), replace all calls to exit(1) by return -1.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1279 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-02-27 07:20:32 +00:00
Joerg Wunsch e59df50eeb Implement the Atmel EDBG/CMSIS-DAP driver protocol for JTAGICE3
(running firmware 3.x) and XplainedPro boards.


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1278 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-02-26 17:54:32 +00:00
Joerg Wunsch 7f2079731b In usbdev_recv_frame(), fix a bug where a new recv request was issued
even though all desired data had aldready been received.



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1277 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-02-22 20:30:16 +00:00
Joerg Wunsch f80f51f6a9 Change the second parameter of the ser_open method from "baud" into a
"union pinfo", so the USB parameters can be passed without hacks.



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1276 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-02-21 13:44:11 +00:00
Joerg Wunsch 2dab4109fe #include <stdint.h> so uint16_t is correctly defined.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1275 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-01-30 12:53:27 +00:00
Joerg Wunsch eed99eb1a9 Fix EEPROM size of ATmega256RFR2 et al.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1274 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-01-28 22:01:47 +00:00
Joerg Wunsch 9ec6cf8e32 [bug #41357] OS X: Avrdude messes with the usb stack?
* usb_libusb.c (usbdev_close): Only issue the usb_reset() for
Linux systems, as these are the only ones that seem to require
it under some circumstances.



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1273 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-01-27 21:15:28 +00:00
Joerg Wunsch 8437de71d1 * configure.ac (libelf): check against elf_getshdrstrndx() rather
than just elf_begin() only, so it is clear we found a sufficiently
recent libelf to work with.



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1272 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-01-22 10:44:18 +00:00
Joerg Wunsch 78133fdfba Update bug ID for STK500v1 patch for devices > 128 KiB.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1271 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-01-22 07:51:33 +00:00
Joerg Wunsch 83ec8ba013 Contributed by Alan Horstmann:
Fix handling of devices > 128 KiB in stk500v1 protocol
* stk500.c: Implement extended address byte handling.
* avrdude.conf.in (ATmega2560): enable stk500_devcode so
STK500v1 protocol actually starts at all.



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1270 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-01-22 07:42:18 +00:00
Joerg Wunsch 4c645d7945 Implement the meat of FLIP version 1 protocol, and document it.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1269 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-01-17 16:54:33 +00:00
Joerg Wunsch fcb5db7152 * flip2.c (flip2_page_erase): Remove unimplemented function.
* dfu.h: Correctly conditionalize <usb.h> vs. <lusb0_usb.h>;
add adjustable timeout (struct dfu_dev); add dfu_abort()
* dfu.c (dfu_abort): New function; implement adjustable timeout.



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1268 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-01-17 14:00:01 +00:00
Joerg Wunsch 74e1b66a67 * configure.ac (libhid): Turn from AC_TRY_RUN into
AC_TRY_COMPILE, so it also works for cross-compilation
setups.




git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1267 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-01-17 08:27:48 +00:00
Joerg Wunsch 88ea96e5e5 Move the descriptor checks up from dfu_init() into the
FLIP protocol implementation.



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1266 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-01-16 08:11:19 +00:00
Joerg Wunsch c782e1979e Clone a FLIPv1 protocol implementation from FLIPv2.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1265 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-01-16 07:57:36 +00:00
Joerg Wunsch d90c344377 Change name of flip2.h include file.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1264 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-01-16 07:42:53 +00:00
Joerg Wunsch 3994114df8 Also change the idempotency #ifdef to reflect the name change.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1263 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-01-16 07:36:44 +00:00