Fix old use of transferIn()

Author: manuelbl

java-does-usb/src/main/java/net/codecrete/usb/common/EndpointInputStream.java

@@ -22,14 +22,12 @@ public class EndpointInputStream extends InputStream {
 
     private USBDevice device_;
     private final int endpointNumber_;
-    private final int packetSize_;
     private byte[] packet_;
     private int readOffset_;
 
-    EndpointInputStream(USBDevice device, int endpointNumber, int packetSize) {
+    EndpointInputStream(USBDevice device, int endpointNumber) {
         device_ = device;
         endpointNumber_ = endpointNumber;
-        packetSize_ = packetSize;
     }
 
     @Override
@@ -72,7 +70,7 @@ private void receiveMoreData() throws IOException {
         readOffset_ = 0;
         // skip zero-length packets
         do {
-            packet_ = device_.transferIn(endpointNumber_, packetSize_);
+            packet_ = device_.transferIn(endpointNumber_);
         } while (packet_.length == 0);
     }
 

java-does-usb/src/main/java/net/codecrete/usb/common/USBDeviceImpl.java

@@ -333,9 +333,8 @@ public OutputStream openOutputStream(int endpointNumber) {
     @Override
     public InputStream openInputStream(int endpointNumber) {
         // check that endpoint number is valid
-        var endpointInfo = getEndpoint(endpointNumber, USBDirection.IN, USBTransferType.BULK, null);
-        var endpoint = getInterface(endpointInfo.interfaceNumber).alternate().getEndpoint(endpointNumber, USBDirection.IN);
-        return new EndpointInputStream(this, endpointNumber, endpoint.packetSize());
+        getEndpoint(endpointNumber, USBDirection.IN, USBTransferType.BULK, null);
+        return new EndpointInputStream(this, endpointNumber);
     }
 
     @Override

java-does-usb/src/test/java/net/codecrete/usb/AlternateInterfaceTest.java

@@ -49,7 +49,7 @@ void transferOnValidEndpoint_succeeds() {
 
         byte[] sampleData = generateRandomBytes(12, 293872394);
         testDevice.transferOut(LOOPBACK_EP_OUT, sampleData);
-        var received = testDevice.transferIn(LOOPBACK_EP_IN, 64);
+        var received = testDevice.transferIn(LOOPBACK_EP_IN);
         assertArrayEquals(sampleData, received);
     }
 
@@ -59,6 +59,6 @@ void transferOnInvalidEndpoint_fails() {
 
         assertThrows(USBException.class, () -> testDevice.transferOut(ECHO_EP_OUT, new byte[] { 1, 2, 3 }));
 
-        assertThrows(USBException.class, () -> testDevice.transferIn(ECHO_EP_IN, 16));
+        assertThrows(USBException.class, () -> testDevice.transferIn(ECHO_EP_IN));
     }
 }

java-does-usb/src/test/java/net/codecrete/usb/BulkTransferTest.java

@@ -41,9 +41,9 @@ void mediumTransfer_succeeds() {
     void transferWithZLP_succeeds() {
         byte[] sampleData = generateRandomBytes(64, 97333894);
         writeBytes(sampleData);
-        byte[] data = testDevice.transferIn(LOOPBACK_EP_IN, LOOPBACK_MAX_PACKET_SIZE);
+        byte[] data = testDevice.transferIn(LOOPBACK_EP_IN);
         assertArrayEquals(sampleData, data);
-        data = testDevice.transferIn(LOOPBACK_EP_IN, LOOPBACK_MAX_PACKET_SIZE);
+        data = testDevice.transferIn(LOOPBACK_EP_IN);
         assertNotNull(data);
         assertEquals(0, data.length);
     }
@@ -73,7 +73,7 @@ static byte[] readBytes(int numBytes) {
         var buffer = new ByteArrayOutputStream();
         int bytesRead = 0;
         while (bytesRead < numBytes) {
-            byte[] data = testDevice.transferIn(LOOPBACK_EP_IN, LOOPBACK_MAX_PACKET_SIZE);
+            byte[] data = testDevice.transferIn(LOOPBACK_EP_IN);
             buffer.writeBytes(data);
             bytesRead += data.length;
         }

java-does-usb/src/test/java/net/codecrete/usb/InterruptTransferTest.java

@@ -25,11 +25,11 @@ void smallTransfer_succeeds() {
         testDevice.transferOut(ECHO_EP_OUT, sampleData);
 
         // receive first echo
-        byte[] echo = testDevice.transferIn(ECHO_EP_IN, ECHO_MAX_PACKET_SIZE);
+        byte[] echo = testDevice.transferIn(ECHO_EP_IN);
         assertArrayEquals(sampleData, echo);
 
         // receive second echo
-        echo = testDevice.transferIn(ECHO_EP_IN, ECHO_MAX_PACKET_SIZE);
+        echo = testDevice.transferIn(ECHO_EP_IN);
         assertArrayEquals(sampleData, echo);
     }
 }

java-does-usb/src/test/java/net/codecrete/usb/InvalidOperationTest.java

@@ -40,10 +40,10 @@ void invalidEndpoint_throws() {
 
         Assertions.assertThrows(USBException.class, () -> testDevice.transferOut(4, data));
 
-        Assertions.assertThrows(USBException.class, () -> testDevice.transferIn(1, 64));
+        Assertions.assertThrows(USBException.class, () -> testDevice.transferIn(1));
 
-        Assertions.assertThrows(USBException.class, () -> testDevice.transferIn(0, 64));
+        Assertions.assertThrows(USBException.class, () -> testDevice.transferIn(0));
 
-        Assertions.assertThrows(USBException.class, () -> testDevice.transferIn(5, 64));
+        Assertions.assertThrows(USBException.class, () -> testDevice.transferIn(5));
     }
 }

java-does-usb/src/test/java/net/codecrete/usb/StallTest.java

@@ -26,21 +26,21 @@ void stalledBulkTransferOut_recovers() {
         testDevice.clearHalt(USBDirection.OUT, LOOPBACK_EP_OUT);
 
         testDevice.transferOut(LOOPBACK_EP_OUT, data);
-        var receivedData = testDevice.transferIn(LOOPBACK_EP_IN, 20);
+        var receivedData = testDevice.transferIn(LOOPBACK_EP_IN);
         assertArrayEquals(data, receivedData);
     }
 
     @Test
     void stalledBulkTransferIn_recovers() {
         haltEndpoint(USBDirection.IN, LOOPBACK_EP_IN);
 
-        assertThrows(USBStallException.class, () -> testDevice.transferIn(LOOPBACK_EP_IN, LOOPBACK_MAX_PACKET_SIZE));
+        assertThrows(USBStallException.class, () -> testDevice.transferIn(LOOPBACK_EP_IN));
 
         testDevice.clearHalt(USBDirection.IN, LOOPBACK_EP_IN);
 
         byte[] data = new byte[] { 9, 8, 7, 6, 5, 4, 3, 2 };
         testDevice.transferOut(LOOPBACK_EP_OUT, data);
-        var receivedData = testDevice.transferIn(LOOPBACK_EP_IN, 20);
+        var receivedData = testDevice.transferIn(LOOPBACK_EP_IN);
         assertArrayEquals(data, receivedData);
     }