From 79d47be10f6e8c967b8efaaf06ab0bb9ac463b1a Mon Sep 17 00:00:00 2001
From: Thomas Sailer <t.sailer@alumni.ethz.ch>
Date: Jul 01 2014 16:38:13 +0000
Subject: fix libftdi1 code


---

diff --git a/ftdiconfig.patch b/ftdiconfig.patch
index 105af0c..4bb282f 100644
--- a/ftdiconfig.patch
+++ b/ftdiconfig.patch
@@ -75,7 +75,7 @@ index a0a7aec..c659a03 100644
  flightdeckftdieeprog_SOURCES = ftdieeprog.cc
  flightdeckftdieeprog_LDADD = @GLIBMM_LIBS@ @FTDI_LIBS@
 diff --git a/flightdeck/ftdieeprog.cc b/flightdeck/ftdieeprog.cc
-index 96a1d42..462a204 100644
+index 96a1d42..b805a9c 100644
 --- a/flightdeck/ftdieeprog.cc
 +++ b/flightdeck/ftdieeprog.cc
 @@ -13,7 +13,7 @@
@@ -96,7 +96,7 @@ index 96a1d42..462a204 100644
  
  class FtdiProg {
  public:
-@@ -202,6 +202,196 @@ std::vector<uint8_t> FtdiDump::dump(void)
+@@ -202,6 +202,194 @@ std::vector<uint8_t> FtdiDump::dump(void)
  	return r;
  }
  
@@ -150,7 +150,7 @@ index 96a1d42..462a204 100644
 +	if (!serial)
 +		serial = dev_serial;
 +	for (struct ftdi_device_list *dev(m_devlist); dev; dev = dev->next) {
-+                struct usb_device *udev(dev->dev);
++                struct libusb_device *udev(dev->dev);
 +                if (!udev)
 +                        continue;
 +		char mfg[128], desc[128], ser[128];
@@ -169,7 +169,7 @@ index 96a1d42..462a204 100644
 +			continue;
 +		std::cout << "Reprogramming Adapter: MFG \"" << mfg << "\" Desc \""
 +			  << desc << "\" Serial \"" << ser << "\"" << std::endl;
-+		ftdi_eeprom_initdefaults(&m_ctx, manufacturer, product, serial);
++		ftdi_eeprom_initdefaults(&m_ctx, const_cast<char *>(manufacturer), const_cast<char *>(product), const_cast<char *>(serial));
 +		chk(ftdi_set_eeprom_value(&m_ctx, VENDOR_ID, vendor_id), "ftdi_set_eeprom_value: VENDOR_ID");
 +		chk(ftdi_set_eeprom_value(&m_ctx, PRODUCT_ID, device_id), "ftdi_set_eeprom_value: PRODUCT_ID");
 +		chk(ftdi_set_eeprom_value(&m_ctx, SELF_POWERED, 0), "ftdi_set_eeprom_value: SELF_POWERED");
@@ -280,7 +280,7 @@ index 96a1d42..462a204 100644
 +	int rsize(0);
 +	chk(ftdi_get_eeprom_value(&m_ctx, CHIP_SIZE, &rsize), "ftdi_get_eeprom_value");
 +	std::vector<uint8_t> r;
-+	if (rsize > 0 && rsize <= FTDI_MAX_EEPROM_SIZE) {
++	if (rsize > 0 && rsize <= 65536) {
 +		r.resize(rsize, 0);
 +		chk(ftdi_get_eeprom_buf(&m_ctx, &r[0], rsize), "ftdi_get_eeprom_buf");
 +	}
@@ -288,8 +288,6 @@ index 96a1d42..462a204 100644
 +	return r;
 +}
 +
-+};
-+
  #else
  
  class FtdiProg {