mirror of
https://github.com/mariusgreuel/avrdude.git
synced 2025-12-13 17:34:56 +00:00
bug #34302: Feature request : device configuration with parent classes
* config_gram.y: if memory section is overwritten old entry is removed
(not in original patch)
* config_gram.y: if programmer or part is defined twice, a warning is
output and the first instance is removed
General cleanup and free functions, so valgrind does not report any lost
blocks at program end.
* avrpart.[hc]: added avr_free_(opcode|mem|part) functions
* pgm.[hc]: added pgm_free function
* update.[hc]: added free_update functions
* config.[hc]: added cleanup_config function, use yylex_destroy to reset
the lexer after usage. (So it can be reused.)
* main.c: add cleanup_main function which is called by atexit() (This
frees all lists so that at program exit only really lost memory is
reported by valgrind.)
* usbasp.c: added libusb_free_device_list() and libusb_exit() calls to
avoid lost memory
* buspirate.c: moved memory allocation from initpgm to setup and added
free in teardown
* configure.ac: add definition of HAVE_YYLEX_DESTROY if $LEX is flex.
* Makefile.am: added . in front of SUBDIRS to build avrdude before trying
to use it for creating the part list for the docs.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1041 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
12
usbasp.c
12
usbasp.c
@@ -305,6 +305,7 @@ static int usbOpenDevice(libusb_device_handle **device, int vendor,
|
||||
handle = NULL;
|
||||
}
|
||||
}
|
||||
libusb_free_device_list(dev_list,1);
|
||||
if (handle != NULL){
|
||||
errorCode = 0;
|
||||
*device = handle;
|
||||
@@ -401,11 +402,7 @@ static int didUsbInit = 0;
|
||||
/* Interface - prog. */
|
||||
static int usbasp_open(PROGRAMMER * pgm, char * port)
|
||||
{
|
||||
#ifdef USE_LIBUSB_1_0
|
||||
libusb_init(&ctx);
|
||||
#else
|
||||
usb_init();
|
||||
#endif
|
||||
/* usb_init will be done in usbOpenDevice */
|
||||
if (usbOpenDevice(&PDATA(pgm)->usbhandle, pgm->usbvid, pgm->usbvendor,
|
||||
pgm->usbpid, pgm->usbproduct) != 0) {
|
||||
/* try alternatives */
|
||||
@@ -474,6 +471,11 @@ static void usbasp_close(PROGRAMMER * pgm)
|
||||
usb_close(PDATA(pgm)->usbhandle);
|
||||
#endif
|
||||
}
|
||||
#ifdef USE_LIBUSB_1_0
|
||||
libusb_exit(ctx);
|
||||
#else
|
||||
/* nothing for usb 0.1 ? */
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user