Indefinitely block on interrupt/bulk reads but allow aborting after

each USB timeout. Timeout is now 5 seconds instead of 2.5

Author: kayahr

src/main/java/org/usb4java/javax/AbstractIrpQueue.java

@@ -32,6 +32,9 @@ abstract class AbstractIrpQueue<T extends UsbIrp>
 
     /** The queue processor thread. */
     private volatile Thread processor;
+    
+    /** If queue is currently aborting. */
+    protected volatile boolean aborting;
 
     /** The USB device. */
     private final AbstractDevice device;
@@ -152,6 +155,7 @@ final void process()
      */
     public final void abort()
     {
+        this.aborting = true;
         this.irps.clear();
         while (isBusy())
         {
@@ -167,6 +171,7 @@ public final void abort()
                 Thread.currentThread().interrupt();
             }
         }
+        this.aborting = false;
     }
 
     /**

src/main/java/org/usb4java/javax/Config.java

@@ -18,7 +18,7 @@ final class Config
     private static final String KEY_BASE = "org.usb4java.javax.";
 
     /** The default USB communication timeout in milliseconds. */
-    private static final int DEFAULT_TIMEOUT = 2500;
+    private static final int DEFAULT_TIMEOUT = 5000;
 
     /** The default scan interval in milliseconds. */
     private static final int DEFAULT_SCAN_INTERVAL = 500;

src/main/java/org/usb4java/javax/IrpQueue.java

@@ -188,13 +188,20 @@ private int transfer(final DeviceHandle handle,
         final UsbEndpointDescriptor descriptor, final int type, 
         final ByteBuffer buffer) throws UsbException
     {
+        final byte address = descriptor.bEndpointAddress();
+        final int timeout = getConfig().getTimeout();
+        final boolean in = this.pipe.getUsbEndpoint().getDirection() == 
+            UsbConst.ENDPOINT_DIRECTION_IN;
         final IntBuffer transferred = IntBuffer.allocate(1);
         int result;
         if (type == UsbConst.ENDPOINT_TYPE_BULK)
         {
-            result = LibUsb.bulkTransfer(handle,
-                descriptor.bEndpointAddress(), buffer, transferred,
-                getConfig().getTimeout());
+            do
+            {
+                result = LibUsb.bulkTransfer(handle, address, buffer, 
+                    transferred, timeout);
+            }
+            while (in && result == LibUsb.ERROR_TIMEOUT && !this.aborting);
             if (result < 0)
             {
                 throw new LibUsbException(
@@ -203,9 +210,12 @@ private int transfer(final DeviceHandle handle,
         }
         else if (type == UsbConst.ENDPOINT_TYPE_INTERRUPT)
         {
-            result = LibUsb.interruptTransfer(handle,
-                descriptor.bEndpointAddress(), buffer, transferred,
-                getConfig().getTimeout());
+            do
+            {
+                result = LibUsb.interruptTransfer(handle, address, buffer, 
+                    transferred, timeout);
+            }
+            while (in && result == LibUsb.ERROR_TIMEOUT && !this.aborting);
             if (result < 0)
             {
                 throw new LibUsbException(