Tryanks/gousb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move all transfer C parts to libusb.go to alloc()

Browse Source
This commit is contained in:
Sebastian Zagrodzki
2017-02-23 10:45:35 +01:00
parent 21d53c9180
commit bf3b23ccd2
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
usb/libusb.go
View File

@@ -71,7 +71,7 @@ type libusbIntf interface {
setAlt(*libusbDevHandle, uint8, uint8) error setAlt(*libusbDevHandle, uint8, uint8) error
// endpoint // endpoint
alloc(*libusbDevHandle, int) (*libusbTransfer, error) alloc(*libusbDevHandle, uint8, TransferType, time.Duration, int, []byte) (*libusbTransfer, error)
cancel(*libusbTransfer) error cancel(*libusbTransfer) error
submit(*libusbTransfer) error submit(*libusbTransfer) error
free(*libusbTransfer) free(*libusbTransfer)
@@ -327,13 +327,18 @@ func (libusbImpl) setAlt(d *libusbDevHandle, iface, setup uint8) error {
return fromUSBError(C.libusb_set_interface_alt_setting((*C.libusb_device_handle)(d), C.int(iface), C.int(setup))) return fromUSBError(C.libusb_set_interface_alt_setting((*C.libusb_device_handle)(d), C.int(iface), C.int(setup)))
} }
func (libusbImpl) alloc(d *libusbDevHandle, isoPackets int) (*libusbTransfer, error) { func (libusbImpl) alloc(d *libusbDevHandle, addr uint8, tt TransferType, timeout time.Duration, isoPackets int, buf []byte) (*libusbTransfer, error) {
xfer := C.libusb_alloc_transfer(C.int(isoPackets)) xfer := C.libusb_alloc_transfer(C.int(isoPackets))
if xfer == nil { if xfer == nil {
return nil, fmt.Errorf("libusb_alloc_transfer(%d) failed", isoPackets) return nil, fmt.Errorf("libusb_alloc_transfer(%d) failed", isoPackets)
} }
xfer.dev_handle = (*C.libusb_device_handle)(d) xfer.dev_handle = (*C.libusb_device_handle)(d)
xfer.endpoint = C.uchar(addr)
xfer.timeout = C.uint(timeout / time.Millisecond)
xfer._type = C.uchar(tt)
xfer.num_iso_packets = C.int(isoPackets) xfer.num_iso_packets = C.int(isoPackets)
xfer.buffer = (*C.uchar)((unsafe.Pointer)(&buf[0]))
xfer.length = C.int(len(buf))
return (*libusbTransfer)(xfer), nil return (*libusbTransfer)(xfer), nil
} }

11
usb/transfer.go
View File

@@ -133,24 +133,17 @@ func newUSBTransfer(dev *libusbDevHandle, ei EndpointInfo, buf []byte, timeout t
} }
} }
xfer, err := libusb.alloc(dev, isoPackets) xfer, err := libusb.alloc(dev, ei.Address, tt, timeout, isoPackets, buf)
if err != nil { if err != nil {
return nil, err return nil, err
} }
xfer.timeout = C.uint(timeout / time.Millisecond)
xfer.endpoint = C.uchar(ei.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 { if tt == TRANSFER_TYPE_ISOCHRONOUS {
libusb.setIsoPacketLengths(xfer, ei.MaxIsoPacket) libusb.setIsoPacketLengths(xfer, ei.MaxIsoPacket)
} }
t := &usbTransfer{ t := &usbTransfer{
xfer: (*libusbTransfer)(xfer), xfer: xfer,
buf: buf, buf: buf,
} }
runtime.SetFinalizer(t, func(t *usbTransfer) { runtime.SetFinalizer(t, func(t *usbTransfer) {