X-Git-Url: http://developer.intra2net.com/git/?a=blobdiff_plain;f=ftdipp%2Fftdi.cpp;h=5e45dce3fd71a9f76d03c365ee25a5cc0507bd99;hb=2d790e377ad5f1c61b38436aa3d5a201c9184028;hp=7c2dd788fa45fc15978216c565d1805b51e1f313;hpb=449c87a96e59286cb1e3e49f40ec77b39e4eede1;p=libftdi diff --git a/ftdipp/ftdi.cpp b/ftdipp/ftdi.cpp index 7c2dd78..5e45dce 100644 --- a/ftdipp/ftdi.cpp +++ b/ftdipp/ftdi.cpp @@ -27,6 +27,7 @@ This exception does not invalidate any other reasons why a work based on this file might be covered by the GNU General Public License. */ #include "ftdi.hpp" +#include "ftdi_i.h" #include "ftdi.h" namespace Ftdi @@ -36,7 +37,7 @@ class Context::Private { public: Private() - : ftdi(0), dev(0), open(false) + : open(false), ftdi(0), dev(0) { ftdi = ftdi_new(); } @@ -52,7 +53,7 @@ public: bool open; struct ftdi_context* ftdi; - struct usb_device* dev; + struct libusb_device* dev; std::string vendor; std::string description; @@ -77,30 +78,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(struct usb_device *dev) +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 libusb_device *dev) { if (dev != 0) d->dev = dev; @@ -108,14 +126,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 +157,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) @@ -261,19 +272,19 @@ int Context::set_error_char(unsigned char errorch, unsigned char enable) return ftdi_set_error_char(d->ftdi, errorch, enable); } -int Context::bitbang_enable(unsigned char bitmask) +int Context::set_bitmode(unsigned char bitmask, unsigned char mode) { - return ftdi_enable_bitbang(d->ftdi, bitmask); + return ftdi_set_bitmode(d->ftdi, bitmask, mode); } -int Context::bitbang_disable() +int Context::set_bitmode(unsigned char bitmask, enum ftdi_mpsse_mode mode) { - return ftdi_disable_bitbang(d->ftdi); + return ftdi_set_bitmode(d->ftdi, bitmask, mode); } -int Context::set_bitmode(unsigned char bitmask, unsigned char mode) +int Context::bitbang_disable() { - return ftdi_set_bitmode(d->ftdi, bitmask, mode); + return ftdi_disable_bitbang(d->ftdi); } int Context::read_pins(unsigned char *pins) @@ -303,6 +314,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 +358,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; } @@ -361,19 +389,9 @@ Eeprom::~Eeprom() { } -void Eeprom::init_defaults() -{ - return ftdi_eeprom_initdefaults(&d->eeprom); -} - -void Eeprom::set_size(int size) -{ - return ftdi_eeprom_setsize(d->context, &d->eeprom, size); -} - -int Eeprom::size(unsigned char *eeprom, int maxsize) +int Eeprom::init_defaults(char* manufacturer, char *product, char * serial) { - return ftdi_read_eeprom_getsize(d->context, eeprom, maxsize); + return ftdi_eeprom_initdefaults(d->context, manufacturer, product, serial); } int Eeprom::chip_id(unsigned int *chipid) @@ -383,17 +401,17 @@ 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); } int Eeprom::read(unsigned char *eeprom) { - return ftdi_read_eeprom(d->context, eeprom); + return ftdi_read_eeprom(d->context); } int Eeprom::write(unsigned char *eeprom) { - return ftdi_write_eeprom(d->context, eeprom); + return ftdi_write_eeprom(d->context); } int Eeprom::read_location(int eeprom_addr, unsigned short *eeprom_val)