X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=ftdipp%2Fftdi.cpp;h=0a22bd51d60f4ec1b003fc42fd4052e316145d79;hp=23d3a5754af6423fcd0c17f3f6b3642d9e928c52;hb=6b22a0549318d1e7fba0c1d9e28c1acf7b94f8b0;hpb=e81598e4752debbc926108e4526b124f06e063b6 diff --git a/ftdipp/ftdi.cpp b/ftdipp/ftdi.cpp index 23d3a57..0a22bd5 100644 --- a/ftdipp/ftdi.cpp +++ b/ftdipp/ftdi.cpp @@ -401,30 +401,32 @@ int Eeprom::erase() class List::Private { public: - Private(struct ftdi_device_list* devlist) - : list(devlist) + Private(struct ftdi_device_list* _devlist) + : devlist(_devlist) {} ~Private() { - ftdi_list_free(&list); + if(devlist) + ftdi_list_free(&devlist); } - struct ftdi_device_list* list; + std::list list; + struct ftdi_device_list* devlist; }; List::List(struct ftdi_device_list* devlist) - : ListBase(), d( new Private(devlist) ) + : d( new Private(devlist) ) { if (devlist != 0) { // Iterate list - for (d->list = devlist; d->list != 0; d->list = d->list->next) + for (; devlist != 0; devlist = devlist->next) { Context c; - c.set_usb_device(d->list->dev); + c.set_usb_device(devlist->dev); c.get_strings(); - push_back(c); + d->list.push_back(c); } } } @@ -433,6 +435,42 @@ List::~List() { } +int List::size() +{ + return d->list.size(); +} + +void List::push_front(const Context& element) +{ + d->list.push_front(element); +} + + +void List::push_back(const Context& element) +{ + d->list.push_back(element); +} + +void List::clear() +{ + d->list.clear(); + + // Free device list + ftdi_list_free(&d->devlist); + d->devlist = 0; +} + +std::list::iterator List::begin() +{ + return d->list.begin(); +} + +std::list::iterator List::end() +{ + return d->list.end(); +} + + List* List::find_all(int vendor, int product) { struct ftdi_device_list* dlist = 0;