X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=ftdipp%2Fftdi.cpp;h=1f5000a07172d15cd0bdaebd80b101e632d915b5;hp=7c1ba60d47cb32236cd4f5f96183360bbd3664ec;hb=579b006f4873fa72c73d372660d158061497bcc9;hpb=cdf448f6d42cbda7d5ced7661f6de22ffb96cc54 diff --git a/ftdipp/ftdi.cpp b/ftdipp/ftdi.cpp index 7c1ba60..1f5000a 100644 --- a/ftdipp/ftdi.cpp +++ b/ftdipp/ftdi.cpp @@ -5,15 +5,27 @@ copyright : (C) 2008 by Marek Vavruša email : opensource@intra2net.com and marek@vavrusa.com ***************************************************************************/ +/* +Copyright (C) 2008 by Marek Vavruša -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Lesser General Public License * - * version 2.1 as published by the Free Software Foundation; * - * * - ***************************************************************************/ +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. +However the source code for this file must still be made available +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 "ftdi.hpp" #include "ftdi.h" @@ -24,14 +36,23 @@ class Context::Private { public: Private() - : ftdi(0), dev(0), open(false) + : ftdi(0), dev(0), open(false) { + ftdi = ftdi_new(); + } + + ~Private() + { + if (open) + ftdi_usb_close(ftdi); + + ftdi_free(ftdi); } bool open; struct ftdi_context* ftdi; - struct usb_device* dev; + struct libusb_device* dev; std::string vendor; std::string description; @@ -43,18 +64,12 @@ public: Context::Context() : d( new Private() ) { - d->ftdi = ftdi_new(); } /*! \brief Destructor. */ Context::~Context() { - if (d->open) - close(); - - ftdi_free(d->ftdi); - delete d; } bool Context::is_open() @@ -62,43 +77,55 @@ 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 + int ret = ftdi_usb_open(d->ftdi, vendor, product); + + if (ret < 0) + return ret; - 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()); + return get_strings_and_reopen(); +} - d->dev = usb_device(d->ftdi->usb_dev); +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(); - if ((ret = ftdi_usb_open_dev(d->ftdi, d->dev)) >= 0) - { - d->open = true; - get_strings(); - } + int ret = ftdi_usb_open_desc_index(d->ftdi, vendor, product, c_description, c_serial, index); - return ret; + 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 = 0; + 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; if (d->dev == 0) return -1; - if ((ret = ftdi_usb_open_dev(d->ftdi, d->dev)) >= 0) - { - d->open = true; - get_strings(); - } - - return ret; + return get_strings_and_reopen(); } int Context::close() @@ -129,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) @@ -246,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() @@ -256,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); } @@ -286,21 +318,39 @@ int Context::get_strings() return 1; } -/*! \fn vendor - * \fn description - * \fn serial - * \brief Device strings properties. +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() { return d->vendor; } +/*! \brief Device strings properties. + */ const std::string& Context::description() { return d->description; } +/*! \brief Device strings properties. + */ const std::string& Context::serial() { return d->serial; @@ -312,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; } @@ -341,7 +391,6 @@ Eeprom::Eeprom(Context* parent) Eeprom::~Eeprom() { - delete d; } void Eeprom::init_defaults() @@ -379,6 +428,16 @@ int Eeprom::write(unsigned char *eeprom) return ftdi_write_eeprom(d->context, eeprom); } +int Eeprom::read_location(int eeprom_addr, unsigned short *eeprom_val) +{ + return ftdi_read_eeprom_location(d->context, eeprom_addr, eeprom_val); +} + +int Eeprom::write_location(int eeprom_addr, unsigned short eeprom_val) +{ + return ftdi_write_eeprom_location(d->context, eeprom_addr, eeprom_val); +} + int Eeprom::erase() { return ftdi_erase_eeprom(d->context); @@ -387,44 +446,185 @@ int Eeprom::erase() class List::Private { public: - Private() - : list(0) + Private(struct ftdi_device_list* _devlist) + : devlist(_devlist) {} - struct ftdi_device_list* list; + ~Private() + { + if(devlist) + ftdi_list_free(&devlist); + } + + std::list list; + struct ftdi_device_list* devlist; }; List::List(struct ftdi_device_list* devlist) - : ListBase(), d( new Private() ) + : d( new Private(devlist) ) { if (devlist != 0) { // Iterate list - Context* c = 0; - for (d->list = devlist; d->list != 0; d->list = d->list->next) + for (; devlist != 0; devlist = devlist->next) { - c = new Context(); - c->set_usb_device(d->list->dev); - push_back(c); + Context c; + c.set_usb_device(devlist->dev); + c.get_strings(); + d->list.push_back(c); } - - // Store pointer - d->list = devlist; } } List::~List() { - // Deallocate instances - for (iterator it = begin(); it != end(); it++) - delete *it; +} + +/** +* Return begin iterator for accessing the contained list elements +* @return Iterator +*/ +List::iterator List::begin() +{ + return d->list.begin(); +} + +/** +* Return end iterator for accessing the contained list elements +* @return Iterator +*/ +List::iterator List::end() +{ + return d->list.end(); +} + +/** +* Return begin iterator for accessing the contained list elements +* @return Const iterator +*/ +List::const_iterator List::begin() const +{ + return d->list.begin(); +} + +/** +* Return end iterator for accessing the contained list elements +* @return Const iterator +*/ +List::const_iterator List::end() const +{ + return d->list.end(); +} - // Clear list - clear(); - ftdi_list_free(&d->list); +/** +* Return begin reverse iterator for accessing the contained list elements +* @return Reverse iterator +*/ +List::reverse_iterator List::rbegin() +{ + return d->list.rbegin(); +} + +/** +* Return end reverse iterator for accessing the contained list elements +* @return Reverse iterator +*/ +List::reverse_iterator List::rend() +{ + return d->list.rend(); +} + +/** +* Return begin reverse iterator for accessing the contained list elements +* @return Const reverse iterator +*/ +List::const_reverse_iterator List::rbegin() const +{ + return d->list.rbegin(); +} + +/** +* Return end reverse iterator for accessing the contained list elements +* @return Const reverse iterator +*/ +List::const_reverse_iterator List::rend() const +{ + return d->list.rend(); - // Delete d-ptr - delete d; +} + +/** +* Get number of elements stored in the list +* @return Number of elements +*/ +List::ListType::size_type List::size() const +{ + return d->list.size(); +} + +/** +* Check if list is empty +* @return True if empty, false otherwise +*/ +bool List::empty() const +{ + return d->list.empty(); +} + +/** + * Removes all elements. Invalidates all iterators. + * Do it in a non-throwing way and also make + * sure we really free the allocated memory. + */ +void List::clear() +{ + ListType().swap(d->list); + + // Free device list + if (d->devlist) + { + ftdi_list_free(&d->devlist); + d->devlist = 0; + } +} + +/** + * Appends a copy of the element as the new last element. + * @param element Value to copy and append +*/ +void List::push_back(const Context& element) +{ + d->list.push_back(element); +} + +/** + * Adds a copy of the element as the new first element. + * @param element Value to copy and add +*/ +void List::push_front(const Context& element) +{ + d->list.push_front(element); +} + +/** + * Erase one element pointed by iterator + * @param pos Element to erase + * @return Position of the following element (or end()) +*/ +List::iterator List::erase(iterator pos) +{ + return d->list.erase(pos); +} + +/** + * Erase a range of elements + * @param beg Begin of range + * @param end End of range + * @return Position of the element after the erased range (or end()) +*/ +List::iterator List::erase(iterator beg, iterator end) +{ + return d->list.erase(beg, end); } List* List::find_all(int vendor, int product)