Commit Graph

1304 Commits

Author SHA1 Message Date
joerg_wunsch 5bc8bfa2f7 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 34afe5c3b2 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 d8a6460700 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 5c2c6eaa88 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 10b017bc77 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 f545728ce2 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 66783c88a0 * 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
awachtler 575e71a6bf 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 cf6a0ae974 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
awachtler 7b43620402 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 b9093f88dc 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 fa5af4dda8 * 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 8df394ce07 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 8113ad8a87 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
rliebscher a74dbff9a4 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
rliebscher ecdcb85222 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
rliebscher ba380bd67a 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 41607055a6 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 38e6a4061f 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 ee1948b53f 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 03c8160964 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 50bdae2938 * 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 1a2cb8370c 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 becc8e9eea 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 5c30babbdc 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 8dcc336e04 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 0fe50d77de 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 c28f96597a 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 7999eaa25a 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 52c59fade2 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 adfea4623d 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 d58a2d96f0 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 d46b1ba752 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 b1c64fbe92 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 9b9af4bc68 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 66e2a16c9c 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 f7cc3ff662 #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 0dbb1ab2f0 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 e7fadbee3c [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 2c3e0e3596 * 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 a71bcc8a2c 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 404ded3db6 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 b6fd404109 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 774c46b860 * 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 b46a86284d * 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 3dc4496761 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 bd260fe2a4 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 2424db9b17 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 06fea06d57 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
joerg_wunsch 0e259ebe3a * flip2.c: Rename from flip.c
* flip2.h: Rename from flip.h
* Makefile.am: Reflect the renaming.
* dfu.c: Update information how to get GPL.
* dfu.h: (Dito.)



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1262 81a1dc3b-b13d-400b-aceb-764788c761c2
2014-01-16 07:34:40 +00:00