* avrftdi*.*: accept also old libftdi (0.20 still works with it), added powerup to initialize

git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1177 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Rene Liebscher 2013-05-15 20:05:02 +00:00
parent 0fc17a60a6
commit 8f9bc91d53
1 changed files with 7 additions and 1 deletions

View File

@ -43,10 +43,14 @@
#include "avrftdi_private.h" #include "avrftdi_private.h"
#ifdef HAVE_LIBUSB_1_0 #ifdef HAVE_LIBUSB_1_0
#ifdef HAVE_LIBFTDI1 #if defined(HAVE_LIBFTDI1) || defined(HAVE_LIBFTDI)
#include <libusb-1.0/libusb.h> #include <libusb-1.0/libusb.h>
#ifdef HAVE_LIBFTDI1
#include <libftdi1/ftdi.h> #include <libftdi1/ftdi.h>
#elif HAVE_LIBFTDI
#include <ftdi.h>
#endif
enum { FTDI_SCK = 0, FTDI_MOSI, FTDI_MISO, FTDI_RESET }; enum { FTDI_SCK = 0, FTDI_MOSI, FTDI_MISO, FTDI_RESET };
@ -698,6 +702,8 @@ static void avrftdi_close(PROGRAMMER * pgm)
static int avrftdi_initialize(PROGRAMMER * pgm, AVRPART * p) static int avrftdi_initialize(PROGRAMMER * pgm, AVRPART * p)
{ {
avrftdi_powerup(pgm);
if(p->flags & AVRPART_HAS_TPI) if(p->flags & AVRPART_HAS_TPI)
{ {
/* see avrftdi_tpi.c */ /* see avrftdi_tpi.c */