commit 14a7b1a6584ee74c35a5a110fe674c62ca01e783
author Brian Silverman <brians> Fri Oct 11 21:34:03 2013 -0700
committer Brian Silverman <brians> Fri Oct 11 21:38:14 2013 -0700
tree d298e9851efc5a031239ce3293cb35d83eada161
parent f47708e64d13f4b1311844f29fdc13144d689833

added (untested) isochronous support to glibusb

aos/common/glibusb/glibusb_endpoint.cc

diff --git a/aos/common/glibusb/glibusb_endpoint.cc b/aos/common/glibusb/glibusb_endpoint.cc
index ee69ec9..2346893 100644
--- a/aos/common/glibusb/glibusb_endpoint.cc
+++ b/aos/common/glibusb/glibusb_endpoint.cc
@@ -216,11 +216,11 @@
   int r;
 
   unsigned char transfer_type = LibUsbTransferType(transfer());
-  r = do_sync_bulk_transfer(libusb_context_,
-                            handle_, endpoint_address_and_direction(),
-                            static_cast<unsigned char *>(p), length,
-                            &transferred, timeout, transfer_type,
-                            quit);
+  r = do_sync_transfer(libusb_context_,
+                       handle_, endpoint_address_and_direction(),
+                       static_cast<unsigned char *>(p), length,
+                       &transferred, timeout, transfer_type,
+                       quit);
 
   switch (r) {
   case LIBUSB_SUCCESS:
@@ -236,20 +236,25 @@
   case LIBUSB_ERROR_TIMEOUT:
     LOG(DEBUG, "libusb_%s_transfer timeout\n",
         TransferTypeName(transfer()));
+    out->Resize(0);
     return kTimeout;
   case LIBUSB_ERROR_IO:
     LOG(DEBUG, "device I/O error\n");
+    out->Resize(0);
     return kFail;
   case LIBUSB_ERROR_NO_DEVICE:
     LOG(DEBUG, "device disconnected\n");
+    out->Resize(0);
     return kNoDevice;
   case LIBUSB_ERROR_OTHER:
     LOG(INFO, "libusb_%s_transfer other error\n", TransferTypeName(transfer()));
+    out->Resize(0);
     return kUnknown;
   default:
     // Most of these are more esoteric.
     LOG(INFO, "libusb_%s_transfer failed with %d: %s\n",
         TransferTypeName(transfer()), r, libusb_error_name(r));
+    out->Resize(0);
     return kFail;
   }
 }