X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=ftdipp%2Fftdi.cpp;h=aca686a3c08028a768b2084639ef25b2fc8e19de;hp=2754033f6029ac56ff2ce818042992c303b4879f;hb=06358114cd5be4e72058048fa9b82f8fc060ca26;hpb=f14f84d3ab33c785903e5b4fb615076f9cbcefad diff --git a/ftdipp/ftdi.cpp b/ftdipp/ftdi.cpp index 2754033..aca686a 100644 --- a/ftdipp/ftdi.cpp +++ b/ftdipp/ftdi.cpp @@ -2,11 +2,11 @@ ftdi.cpp - C++ wraper for libftdi ------------------- begin : Mon Oct 13 2008 - copyright : (C) 2008 by Marek Vavruša + copyright : (C) 2008-2017 by Marek Vavruša / libftdi developers email : opensource@intra2net.com and marek@vavrusa.com ***************************************************************************/ /* -Copyright (C) 2008 by Marek Vavruša +Copyright (C) 2008-2017 by Marek Vavruša / libftdi developers The software in this package is distributed under the GNU General Public License version 2 (with a special exception described below). @@ -26,7 +26,9 @@ in accordance with section (3) of the GNU General Public License. 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 #include "ftdi.hpp" +#include "ftdi_i.h" #include "ftdi.h" namespace Ftdi @@ -85,7 +87,7 @@ int Context::open(int vendor, int product) if (ret < 0) return ret; - return get_strings_and_reopen(); + return get_strings_and_reopen(false,false,false); } int Context::open(int vendor, int product, const std::string& description, const std::string& serial, unsigned int index) @@ -104,7 +106,7 @@ int Context::open(int vendor, int product, const std::string& description, const if (ret < 0) return ret; - return get_strings_and_reopen(); + return get_strings_and_reopen(false,description.empty(),serial.empty()); } int Context::open(const std::string& description) @@ -114,7 +116,7 @@ int Context::open(const std::string& description) if (ret < 0) return ret; - return get_strings_and_reopen(); + return get_strings_and_reopen(false,true,false); } int Context::open(struct libusb_device *dev) @@ -131,6 +133,7 @@ int Context::open(struct libusb_device *dev) int Context::close() { d->open = false; + d->dev = 0; return ftdi_usb_close(d->ftdi); } @@ -177,6 +180,26 @@ int Context::set_line_property(enum ftdi_bits_type bits, enum ftdi_stopbits_type return ftdi_set_line_property2(d->ftdi, bits, sbit, parity, break_type); } +int Context::get_usb_read_timeout() const +{ + return d->ftdi->usb_read_timeout; +} + +void Context::set_usb_read_timeout(int usb_read_timeout) +{ + d->ftdi->usb_read_timeout = usb_read_timeout; +} + +int Context::get_usb_write_timeout() const +{ + return d->ftdi->usb_write_timeout; +} + +void Context::set_usb_write_timeout(int usb_write_timeout) +{ + d->ftdi->usb_write_timeout = usb_write_timeout; +} + int Context::read(unsigned char *buf, int size) { return ftdi_read_data(d->ftdi, buf, size); @@ -271,16 +294,6 @@ 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) -{ - return ftdi_set_bitmode(d->ftdi, bitmask, BITMODE_BITBANG); -} - -int Context::bitbang_disable() -{ - return ftdi_disable_bitbang(d->ftdi); -} - int Context::set_bitmode(unsigned char bitmask, unsigned char mode) { return ftdi_set_bitmode(d->ftdi, bitmask, mode); @@ -291,46 +304,61 @@ int Context::set_bitmode(unsigned char bitmask, enum ftdi_mpsse_mode mode) return ftdi_set_bitmode(d->ftdi, bitmask, mode); } +int Context::bitbang_disable() +{ + return ftdi_disable_bitbang(d->ftdi); +} + int Context::read_pins(unsigned char *pins) { return ftdi_read_pins(d->ftdi, pins); } -char* Context::error_string() +const char* Context::error_string() { return ftdi_get_error_string(d->ftdi); } -int Context::get_strings() +int Context::get_strings(bool vendor, bool description, bool serial) { // Prepare buffers - char vendor[512], desc[512], serial[512]; + char ivendor[512], idesc[512], iserial[512]; - int ret = ftdi_usb_get_strings(d->ftdi, d->dev, vendor, 512, desc, 512, serial, 512); + int ret = ftdi_usb_get_strings(d->ftdi, d->dev, vendor?ivendor:NULL, 512, description?idesc:NULL, 512, serial?iserial:NULL, 512); if (ret < 0) return -1; - d->vendor = vendor; - d->description = desc; - d->serial = serial; + d->vendor = ivendor; + d->description = idesc; + d->serial = iserial; return 1; } -int Context::get_strings_and_reopen() +int Context::get_strings_and_reopen(bool vendor, bool description, bool serial) { - // Get device strings (closes device) - int ret=get_strings(); - if (ret < 0) + int ret = 0; + + if(vendor || description || serial) { - d->open = 0; - return ret; - } + if (d->dev == 0) + { + d->dev = libusb_get_device(d->ftdi->usb_dev); + } - // Reattach device - ret = ftdi_usb_open_dev(d->ftdi, d->dev); - d->open = (ret >= 0); + // Get device strings (closes device) + ret=get_strings(vendor, description, serial); + 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; } @@ -339,6 +367,8 @@ int Context::get_strings_and_reopen() */ const std::string& Context::vendor() { + if(d->vendor.empty()) + get_strings_and_reopen(true,false,false); return d->vendor; } @@ -346,6 +376,8 @@ const std::string& Context::vendor() */ const std::string& Context::description() { + if(d->description.empty()) + get_strings_and_reopen(false,true,false); return d->description; } @@ -353,6 +385,8 @@ const std::string& Context::description() */ const std::string& Context::serial() { + if(d->serial.empty()) + get_strings_and_reopen(false,false,true); return d->serial; } @@ -617,13 +651,10 @@ List::iterator List::erase(iterator beg, iterator end) return d->list.erase(beg, end); } -List* List::find_all(int vendor, int product) +List* List::find_all(Context &context, int vendor, int product) { struct ftdi_device_list* dlist = 0; - struct ftdi_context ftdi; - ftdi_init(&ftdi); - ftdi_usb_find_all(&ftdi, &dlist, vendor, product); - ftdi_deinit(&ftdi); + ftdi_usb_find_all(context.context(), &dlist, vendor, product); return new List(dlist); }