Revert "Async buffering for high-speed transfers."

This reverts commit b9a840cc79bb96f135fe4abd4248881240026112.

Conflicts:
	src/libusb-glue.h

The only non-obvious conflict is because of later changes to how
libusb.h is included

Signed-off-by: Linus Walleij <triad@df.lth.se>

1 files changed, 0 insertions, 32 deletions

diff --git a/src/libusb-glue.h b/src/libusb-glue.h
index 5ba6183..0ea6b29 100644
--- a/src/libusb-glue.h
+++ b/src/libusb-glue.h
@@ -33,7 +33,6 @@
 #include "ptp.h"
 #ifdef HAVE_LIBUSB1
 #include <libusb.h>
-#include <pthread.h>
 #endif
 #ifdef HAVE_LIBUSB0
 #include <usb.h>
@@ -77,20 +76,6 @@ extern "C" {
 #define USB_BULK_WRITE openusb_bulk_xfer
 #endif
 
-#ifdef HAVE_LIBUSB1
-/*
- * With libusb1 we use a threaded read/write handler
- * to speed up transfers.
- */
-struct ptp_write_td {
-	struct libusb_transfer *transfer;
-	struct ptp_write_td *next;
-	unsigned char *buffer;
-};
-/* Number of async transfer buffers */
-#define WRITE_TRANSFER_NUM 4
-#endif
-
 /**
  * Internal USB struct.
  */
@@ -98,24 +83,7 @@ typedef struct _PTP_USB PTP_USB;
 struct _PTP_USB {
   PTPParams *params;
 #ifdef HAVE_LIBUSB1
-  /*
-   * With libusb1 we use a threaded read/write handler
-   * to speed up transfers.
-   */
   libusb_device_handle* handle;
-  int event_thread_run;
-  pthread_t ptp_event_thread_tid;
-  int ptp_read_transfer_done_flag;
-  pthread_cond_t ptp_read_transfer_done_cv;
-  pthread_mutex_t ptp_read_transfer_done_mutex;
-
-  int ptp_write_transfer_done_flag;
-  pthread_cond_t ptp_write_transfer_cv;
-  pthread_mutex_t ptp_write_transfer_mutex;
-
-  unsigned char *bytes[WRITE_TRANSFER_NUM];
-  struct ptp_write_td write_td_array[WRITE_TRANSFER_NUM];
-  struct ptp_write_td *p_write_head_td, *p_write_tail_td;
 #endif
 #ifdef HAVE_LIBUSB0
   usb_dev_handle* handle;