X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=ftdipp%2Fftdi.cpp;h=1f5000a07172d15cd0bdaebd80b101e632d915b5;hp=7c2dd788fa45fc15978216c565d1805b51e1f313;hb=579b006f4873fa72c73d372660d158061497bcc9;hpb=449c87a96e59286cb1e3e49f40ec77b39e4eede1

diff --git a/ftdipp/ftdi.cpp b/ftdipp/ftdi.cpp
index 7c2dd78..1f5000a 100644
--- a/ftdipp/ftdi.cpp
+++ b/ftdipp/ftdi.cpp
@@ -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;
@@ -77,30 +77,47 @@ bool Context::is_open()
     return d->open;
 }
 
-int Context::open(int vendor, int product, const std::string& description, const std::string& serial)
+int Context::open(int vendor, int product)
 {
-    int ret = 0;
-
     // Open device
-    if (description.empty() && serial.empty())
-        ret = ftdi_usb_open(d->ftdi, vendor, product);
-    else
-        ret = ftdi_usb_open_desc(d->ftdi, vendor, product, description.c_str(), serial.c_str());
+    int ret = ftdi_usb_open(d->ftdi, vendor, product);
 
     if (ret < 0)
        return ret;
 
-    // Get device strings (closes device)
-    get_strings();
+    return get_strings_and_reopen();
+}
 
-    // Reattach device
-    ret = ftdi_usb_open_dev(d->ftdi, d->dev);
-    d->open = (ret >= 0);
+int Context::open(int vendor, int product, const std::string& description, const std::string& serial, unsigned int index)
+{
+    // translate empty strings to NULL
+    // -> do not use them to find the device (vs. require an empty string to be set in the EEPROM)
+    const char* c_description=NULL;
+    const char* c_serial=NULL;
+    if (!description.empty())
+        c_description=description.c_str();
+    if (!serial.empty())
+        c_serial=serial.c_str();
 
-    return ret;
+    int ret = ftdi_usb_open_desc_index(d->ftdi, vendor, product, c_description, c_serial, index);
+
+    if (ret < 0)
+       return ret;
+
+    return get_strings_and_reopen();
+}
+
+int Context::open(const std::string& description)
+{
+    int ret = ftdi_usb_open_string(d->ftdi, description.c_str());
+
+    if (ret < 0)
+       return ret;
+
+    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;
@@ -108,14 +125,7 @@ int Context::open(struct usb_device *dev)
     if (d->dev == 0)
         return -1;
 
-    // Get device strings (closes device)
-    get_strings();
-
-    // Reattach device
-    int ret = ftdi_usb_open_dev(d->ftdi, d->dev);
-    d->open = (ret >= 0);
-
-    return ret;
+    return get_strings_and_reopen();
 }
 
 int Context::close()
@@ -146,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)
@@ -263,7 +273,7 @@ int Context::set_error_char(unsigned char errorch, unsigned char enable)
 
 int Context::bitbang_enable(unsigned char bitmask)
 {
-    return ftdi_enable_bitbang(d->ftdi, bitmask);
+    return ftdi_set_bitmode(d->ftdi, bitmask, BITMODE_BITBANG);
 }
 
 int Context::bitbang_disable()
@@ -273,6 +283,11 @@ int Context::bitbang_disable()
 
 int Context::set_bitmode(unsigned char bitmask, unsigned char mode)
 {
+    return set_bitmode(bitmask, mode);
+}
+
+int Context::set_bitmode(unsigned char bitmask, enum ftdi_mpsse_mode mode)
+{
     return ftdi_set_bitmode(d->ftdi, bitmask, mode);
 }
 
@@ -303,6 +318,23 @@ int Context::get_strings()
     return 1;
 }
 
+int Context::get_strings_and_reopen()
+{
+    // Get device strings (closes device)
+    int ret=get_strings();
+    if (ret < 0)
+    {
+        d->open = 0;
+        return ret;
+    }
+
+    // Reattach device
+    ret = ftdi_usb_open_dev(d->ftdi, d->dev);
+    d->open = (ret >= 0);
+
+    return ret;
+}
+
 /*! \brief Device strings properties.
  */
 const std::string& Context::vendor()
@@ -330,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;
 }