libftdi: (tomj) improved libusb-win32 support

diff --git a/AUTHORS b/AUTHORS
index a198fea..03a341c 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -20,6 +20,7 @@ see Changelog for full details:
   Matthias Kranz <matthias@hcilab.org>
   Matthijs ten Berge <m.h.tenberge@alumnus.utwente.nl>
   Max <max@koeln.ccc.de>
+  Mike Frysinger <vapier.adi@gmail.com>
   Peter Holik <peter@holik.at>
   Rogier Wolff <R.E.Wolff@harddisk-recovery.nl>
   Steven Turner <steven.turner@ftdichip.com>

diff --git a/ChangeLog b/ChangeLog
index 784f8e3..eccc094 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+New in 0.13
+-----------
+* Improved libusb-win32 support (Mike Frysinger)
+
 New in 0.12
 -----------
 * Fix build of documentation for "out of tree" builds

diff --git a/src/ftdi.c b/src/ftdi.c
index f5d09a9..043d24a 100644 (file)
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -223,7 +223,7 @@ int ftdi_usb_find_all(struct ftdi_context *ftdi, struct ftdi_device_list **devli
 
     curdev = devlist;
     *curdev = NULL;
-    for (bus = usb_busses; bus; bus = bus->next) {
+    for (bus = usb_get_busses(); bus; bus = bus->next) {
         for (dev = bus->devices; dev; dev = dev->next) {
             if (dev->descriptor.idVendor == vendor
                     && dev->descriptor.idProduct == product)
@@ -445,7 +445,7 @@ int ftdi_usb_open_desc(struct ftdi_context *ftdi, int vendor, int product,
     if (usb_find_devices() < 0)
         ftdi_error_return(-2, "usb_find_devices() failed");
 
-    for (bus = usb_busses; bus; bus = bus->next) {
+    for (bus = usb_get_busses(); bus; bus = bus->next) {
         for (dev = bus->devices; dev; dev = dev->next) {
             if (dev->descriptor.idVendor == vendor
                     && dev->descriptor.idProduct == product) {