rusefi
/
usb4java
mirror of https://github.com/rusefi/usb4java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Corrected placement of exception throw.

This commit is contained in:
Klaus Reimer 2011-02-05 15:17:21 +01:00 committed by k
parent a4ec2a9d68
commit 7b4194c285
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/de/ailis/usb4java/jsr80/PipeQueueProcessor.java
View File

@ -161,9 +161,11 @@ final class PipeQueueProcessor extends Thread
break; break;
} }
break; break;
default:
throw new UsbException("Unsupported endpoint type: " + type);
} }
throw new UsbException("Unsupported endpoint type: " + type);
} }
catch (final UsbException e) catch (final UsbException e)
{ {
@ -187,7 +189,7 @@ final class PipeQueueProcessor extends Thread
{ {
final UsbEndpointDescriptor descriptor = getEndpointDescriptor(); final UsbEndpointDescriptor descriptor = getEndpointDescriptor();
final int size = final int size =
Math.min(data.length, descriptor.wMaxPacketSize() & 0xffff); Math.min(data.length, descriptor.wMaxPacketSize() & 0xffff);
final int ep = descriptor.bEndpointAddress(); final int ep = descriptor.bEndpointAddress();
final ByteBuffer buffer = ByteBuffer.allocateDirect(size); final ByteBuffer buffer = ByteBuffer.allocateDirect(size);
final int result = usb_bulk_read(getDevice().open(), ep, buffer, 5000); final int result = usb_bulk_read(getDevice().open(), ep, buffer, 5000);
@ -243,11 +245,11 @@ final class PipeQueueProcessor extends Thread
{ {
final UsbEndpointDescriptor descriptor = getEndpointDescriptor(); final UsbEndpointDescriptor descriptor = getEndpointDescriptor();
final int size = final int size =
Math.min(data.length, descriptor.wMaxPacketSize() & 0xffff); Math.min(data.length, descriptor.wMaxPacketSize() & 0xffff);
final int ep = descriptor.bEndpointAddress(); final int ep = descriptor.bEndpointAddress();
final ByteBuffer buffer = ByteBuffer.allocateDirect(size); final ByteBuffer buffer = ByteBuffer.allocateDirect(size);
final int result = final int result =
usb_interrupt_read(getDevice().open(), ep, buffer, 5000); usb_interrupt_read(getDevice().open(), ep, buffer, 5000);
if (result < 0) throw new LibUsbException(result); if (result < 0) throw new LibUsbException(result);
buffer.rewind(); buffer.rewind();
buffer.get(data, 0, result); buffer.get(data, 0, result);