Let the eeprom functions work on the ftdi_context, not the ftdi_eeprom structure

[libftdi] / ftdipp / ftdi.cpp

diff --git a/ftdipp/ftdi.cpp b/ftdipp/ftdi.cpp
index 2bc6c6e..82c1fca 100644 (file)
--- a/ftdipp/ftdi.cpp
+++ b/ftdipp/ftdi.cpp
@@ -36,7 +36,7 @@ class Context::Private
 {
 public:
     Private()
-            :  ftdi(0), dev(0), open(false)
+            : open(false), ftdi(0), dev(0)
     {
         ftdi = ftdi_new();
     }
@@ -52,7 +52,7 @@ public:
     bool open;
 
     struct ftdi_context* ftdi;
-    struct usb_device*   dev;
+    struct libusb_device* dev;
 
     std::string vendor;
     std::string description;
@@ -117,7 +117,7 @@ int Context::open(const std::string& description)
     return get_strings_and_reopen();
 }
 
-int Context::open(struct usb_device *dev)
+int Context::open(struct libusb_device *dev)
 {
     if (dev != 0)
         d->dev = dev;
@@ -156,10 +156,10 @@ int Context::set_interface(enum ftdi_interface interface)
     return ftdi_set_interface(d->ftdi, interface);
 }
 
-void Context::set_usb_device(struct usb_dev_handle *dev)
+void Context::set_usb_device(struct libusb_device_handle *dev)
 {
     ftdi_set_usbdev(d->ftdi, dev);
-    d->dev = usb_device(dev);
+    d->dev = libusb_get_device(dev);
 }
 
 int Context::set_baud_rate(int baudrate)
@@ -283,7 +283,7 @@ int Context::bitbang_disable()
 
 int Context::set_bitmode(unsigned char bitmask, unsigned char mode)
 {
-    return set_bitmode(bitmask, mode);
+    return ftdi_set_bitmode(d->ftdi, bitmask, mode);
 }
 
 int Context::set_bitmode(unsigned char bitmask, enum ftdi_mpsse_mode mode)
@@ -362,7 +362,7 @@ void Context::set_context(struct ftdi_context* context)
     d->ftdi = context;
 }
 
-void Context::set_usb_device(struct usb_device *dev)
+void Context::set_usb_device(struct libusb_device *dev)
 {
     d->dev = dev;
 }
@@ -395,7 +395,7 @@ Eeprom::~Eeprom()
 
 void Eeprom::init_defaults()
 {
-    return ftdi_eeprom_initdefaults(&d->eeprom);
+    return ftdi_eeprom_initdefaults(d->context);
 }
 
 void Eeprom::set_size(int size)
@@ -415,7 +415,7 @@ int Eeprom::chip_id(unsigned int *chipid)
 
 int Eeprom::build(unsigned char *output)
 {
-    return ftdi_eeprom_build(&d->eeprom, output);
+    return ftdi_eeprom_build(d->context, output);
 }
 
 int Eeprom::read(unsigned char *eeprom)