From f11db218a73d94a39e22342393b9ab0fe462834a Mon Sep 17 00:00:00 2001
From: Rene Liebscher <r.liebscher@gmx.de>
Date: Wed, 15 May 2013 20:05:02 +0000
Subject: [PATCH] * 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@1177 81a1dc3b-b13d-400b-aceb-764788c761c2
---
avrdude/avrftdi.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/avrdude/avrftdi.c b/avrdude/avrftdi.c
index ddb7b11e..27639292 100644
--- a/avrdude/avrftdi.c
+++ b/avrdude/avrftdi.c
@@ -43,10 +43,14 @@
#include "avrftdi_private.h"
#ifdef HAVE_LIBUSB_1_0
-#ifdef HAVE_LIBFTDI1
+#if defined(HAVE_LIBFTDI1) || defined(HAVE_LIBFTDI)
#include <libusb-1.0/libusb.h>
+#ifdef HAVE_LIBFTDI1
#include <libftdi1/ftdi.h>
+#elif HAVE_LIBFTDI
+#include <ftdi.h>
+#endif
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)
{
+ avrftdi_powerup(pgm);
+
if(p->flags & AVRPART_HAS_TPI)
{
/* see avrftdi_tpi.c */