Isolation the logic for doing complex transfers into a separate file

Author: cgutman

src/org/cgutman/usbip/service/UsbIpService.java

@@ -21,6 +21,7 @@
 import org.cgutman.usbip.server.protocol.dev.UsbIpSubmitUrbReply;
 import org.cgutman.usbip.usb.DescriptorReader;
 import org.cgutman.usbip.usb.UsbDeviceDescriptor;
+import org.cgutman.usbip.usb.XferUtils;
 
 import android.annotation.SuppressLint;
 import android.app.PendingIntent;
@@ -286,46 +287,18 @@ public void run() {
 							buff.array().length, msg.direction == UsbIpDevicePacket.USBIP_DIR_IN ? "in" : "out",
 									selectedEndpoint.getEndpointNumber());
 
-					// Bulk is handled via a helper method
-					byte[] bulkBuffer = buff.array();
-					
-					int bytesTransferred = 0;
-					while (bytesTransferred < bulkBuffer.length) {
-						byte[] remainingBuffer = new byte[bulkBuffer.length - bytesTransferred];
-						
-						if (msg.direction == UsbIpDevicePacket.USBIP_DIR_OUT) {
-							// Copy input data into the new buffer
-							System.arraycopy(bulkBuffer, bytesTransferred, remainingBuffer, 0, remainingBuffer.length);
-						}
-						
-						int res = context.devConn.bulkTransfer(selectedEndpoint, remainingBuffer,
-								remainingBuffer.length, msg.interval);
-						if (res < 0) {
-							// Failed transfer terminates the bulk transfer
-							System.err.println("Bulk Xfer failed: "+res);
-							sendReply(replyOut, reply, ProtoDefs.ST_NA);
-							return;
-						}
-						
-						if (msg.direction == UsbIpDevicePacket.USBIP_DIR_IN) {
-							// Copy output data into the original buffer
-							System.arraycopy(remainingBuffer, 0, bulkBuffer, bytesTransferred, res);
-						}
-						
-						bytesTransferred += res;
-						
-						if (res < selectedEndpoint.getMaxPacketSize()) {
-							// A packet less than the maximum size for this endpoint
-							// indicates the transfer has ended
-							break;
-						}
-					}
+					int res = XferUtils.doBulkTransfer(context.devConn,selectedEndpoint, buff.array(), msg.interval);
 
 					System.out.printf("Bulk transfer complete with %d bytes (wanted %d)\n",
-							bytesTransferred, msg.transferBufferLength);
+							res, msg.transferBufferLength);
 
-					reply.actualLength = bytesTransferred;
-					reply.status = ProtoDefs.ST_OK;
+					if (res < 0) {
+						reply.status = ProtoDefs.ST_NA;
+					}
+					else {
+						reply.actualLength = res;
+						reply.status = ProtoDefs.ST_OK;
+					}
 					sendReply(replyOut, reply, reply.status);
 				}
 				else if (selectedEndpoint.getType() == UsbConstants.USB_ENDPOINT_XFER_INT) {
@@ -429,25 +402,22 @@ public void submitUrbRequest(OutputStream replyOut, UsbIpSubmitUrb msg) {
 			short value = bb.getShort();
 			short index = bb.getShort();
 			short length = bb.getShort();
-						
-			System.out.printf("%x %x %x %x %x\n",
-					requestType, request, value, index, length);
 
 			if (length != 0) {
 				reply.inData = new byte[length];
 			}
-			int res = devConn.controlTransfer(requestType, request, value,
-					index,
-					(requestType & 0x80) != 0 ? reply.inData : msg.outData,
-					length, msg.interval);
+			
+			int res = XferUtils.doControlTransfer(devConn, requestType, request, value, index,
+					(requestType & 0x80) != 0 ? reply.inData : msg.outData, length, msg.interval);
 			if (res < 0) {
-				System.err.println("Control Xfer failed: "+res);
-				sendReply(replyOut, reply, ProtoDefs.ST_NA);
-				return;
+				reply.status = ProtoDefs.ST_NA;
+			}
+			else {
+				reply.actualLength = res;
+				reply.status = ProtoDefs.ST_OK;
 			}
 
-			reply.actualLength = res;
-			sendReply(replyOut, reply, ProtoDefs.ST_OK);
+			sendReply(replyOut, reply, reply.status);
 			return;
 		}
 		else {

src/org/cgutman/usbip/usb/DescriptorReader.java

@@ -13,7 +13,7 @@ public static UsbDeviceDescriptor readDeviceDescriptor(UsbDeviceConnection devCo
 		byte[] descriptorBuffer = new byte[UsbDeviceDescriptor.DESCRIPTOR_SIZE];
 
 
-		int res = devConn.controlTransfer(GET_DESCRIPTOR_REQUEST_TYPE,
+		int res = XferUtils.doControlTransfer(devConn, GET_DESCRIPTOR_REQUEST_TYPE,
 				GET_DESCRIPTOR_REQUEST,
 				(DEVICE_DESCRIPTOR_TYPE << 8) | 0x00, // Devices only have 1 descriptor
 				0, descriptorBuffer, descriptorBuffer.length, 0);

src/org/cgutman/usbip/usb/XferUtils.java

@@ -0,0 +1,57 @@
+package org.cgutman.usbip.usb;
+
+import android.hardware.usb.UsbConstants;
+import android.hardware.usb.UsbDeviceConnection;
+import android.hardware.usb.UsbEndpoint;
+
+public class XferUtils {
+
+	public static int doBulkTransfer(UsbDeviceConnection devConn, UsbEndpoint endpoint, byte[] buff, int interval) {
+		int bytesTransferred = 0;
+		while (bytesTransferred < buff.length) {
+			byte[] remainingBuffer = new byte[buff.length - bytesTransferred];
+			
+			if (endpoint.getDirection() == UsbConstants.USB_DIR_OUT) {
+				// Copy input data into the new buffer
+				System.arraycopy(buff, bytesTransferred, remainingBuffer, 0, remainingBuffer.length);
+			}
+			
+			int res = devConn.bulkTransfer(endpoint, remainingBuffer,
+					remainingBuffer.length, interval);
+			if (res < 0) {
+				// Failed transfer terminates the bulk transfer
+				System.err.println("Bulk Xfer failed: "+res);
+				return -1;
+			}
+			
+			if (endpoint.getDirection() == UsbConstants.USB_DIR_IN) {
+				// Copy output data into the original buffer
+				System.arraycopy(remainingBuffer, 0, buff, bytesTransferred, res);
+			}
+			
+			bytesTransferred += res;
+			
+			if (res < endpoint.getMaxPacketSize()) {
+				// A packet less than the maximum size for this endpoint
+				// indicates the transfer has ended
+				break;
+			}
+		}
+		
+		return bytesTransferred;
+	}
+
+	public static int doControlTransfer(UsbDeviceConnection devConn, int requestType,
+			int request, int value, int index, byte[] buff, int length, int interval) {
+		System.out.printf("SETUP: %x %x %x %x %x\n",
+				requestType, request, value, index, length);
+		
+		int res = devConn.controlTransfer(requestType, request, value,
+				index, buff, length, interval);
+		if (res < 0) {
+			System.err.println("Control Xfer failed: "+res);
+		}
+		
+		return res;
+	}
+}