From c792f8e0283caa76432b99857cce5b269d95c34c Mon Sep 17 00:00:00 2001
From: Sebastian Zagrodzki <sebek@zagrodzki.net>
Date: Thu, 9 Feb 2017 22:51:28 +0100
Subject: [PATCH] replace allocTransfer with a new more generic newUSBTransfer

---
 usb/endpoint.go | 33 +++++++++++++++++++++++++++++++++
 usb/iso.go      | 46 ++++------------------------------------------
 2 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/usb/endpoint.go b/usb/endpoint.go
index 3baa10a..6c9c3cd 100644
--- a/usb/endpoint.go
+++ b/usb/endpoint.go
@@ -99,3 +99,36 @@ func interrupt_xfer(e *endpoint, buf []byte, timeout time.Duration) (int, error)
 	}
 	return int(cnt), nil
 }
+
+func (e *endpoint) newUSBTransfer(tt TransferType, buf []byte) (*usbTransfer, error) {
+	var isoPackets int
+	if tt == TRANSFER_TYPE_ISOCHRONOUS {
+		isoPackets = len(buf) / int(e.EndpointInfo.MaxIsoPacket)
+	}
+
+	xfer := C.libusb_alloc_transfer(C.int(isoPackets))
+	if xfer == nil {
+		return nil, fmt.Errorf("libusb_alloc_transfer(%d) failed", isoPackets)
+	}
+
+	done := make(chan struct{}, 1)
+	xfer.user_data = (unsafe.Pointer)(&done)
+
+	xfer.dev_handle = e.Device.handle
+	xfer.endpoint = C.uchar(e.Address)
+	xfer._type = C.uchar(tt)
+
+	xfer.buffer = (*C.uchar)((unsafe.Pointer)(&buf[0]))
+	xfer.length = C.int(len(buf))
+
+	if tt == TRANSFER_TYPE_ISOCHRONOUS {
+		xfer.num_iso_packets = C.int(isoPackets)
+		C.libusb_set_iso_packet_lengths(xfer, C.uint(e.EndpointInfo.MaxIsoPacket))
+	}
+
+	return &usbTransfer{
+		xfer: xfer,
+		done: done,
+		buf:  buf,
+	}, nil
+}
diff --git a/usb/iso.go b/usb/iso.go
index 732a5e5..ef410e9 100644
--- a/usb/iso.go
+++ b/usb/iso.go
@@ -32,49 +32,11 @@ func iso_callback(cptr unsafe.Pointer) {
 	close(ch)
 }
 
-func (end *endpoint) allocTransfer() *usbTransfer {
-	const (
-		iso_packets = 8 // 128 // 242
-	)
-
-	xfer := C.libusb_alloc_transfer(C.int(iso_packets))
-	if xfer == nil {
-		log.Printf("usb: transfer allocation failed?!")
-		return nil
-	}
-
-	buf := make([]byte, iso_packets*end.EndpointInfo.MaxIsoPacket)
-	done := make(chan struct{}, 1)
-
-	xfer.dev_handle = end.Device.handle
-	xfer.endpoint = C.uchar(end.Address)
-	xfer._type = C.LIBUSB_TRANSFER_TYPE_ISOCHRONOUS
-
-	xfer.buffer = (*C.uchar)((unsafe.Pointer)(&buf[0]))
-	xfer.length = C.int(len(buf))
-	xfer.num_iso_packets = iso_packets
-
-	C.libusb_set_iso_packet_lengths(xfer, C.uint(end.EndpointInfo.MaxIsoPacket))
-	/*
-		pkts := *(*[]C.struct_libusb_packet_descriptor)(unsafe.Pointer(&reflect.SliceHeader{
-			Data: uintptr(unsafe.Pointer(&xfer.iso_packet_desc)),
-			Len:  iso_packets,
-			Cap:  iso_packets,
-		}))
-	*/
-
-	t := &usbTransfer{
-		xfer: xfer,
-		done: done,
-		buf:  buf,
-	}
-	xfer.user_data = (unsafe.Pointer)(&t.done)
-
-	return t
-}
-
 func isochronous_xfer(e *endpoint, buf []byte, timeout time.Duration) (int, error) {
-	t := e.allocTransfer()
+	t, err := e.newUSBTransfer(TRANSFER_TYPE_ISOCHRONOUS, buf)
+	if err != nil {
+		return 0, err
+	}
 	defer t.free()
 
 	if err := t.submit(timeout); err != nil {