From de92c7047b33a5f0d90e888e138d139ed0d1281a Mon Sep 17 00:00:00 2001 From: Sebastian Zagrodzki Date: Thu, 9 Feb 2017 22:38:16 +0100 Subject: [PATCH] make methods of usbTransfer private --- usb/iso.go | 6 +++--- usb/transfer.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/usb/iso.go b/usb/iso.go index cefaa7d..732a5e5 100644 --- a/usb/iso.go +++ b/usb/iso.go @@ -75,14 +75,14 @@ func (end *endpoint) allocTransfer() *usbTransfer { func isochronous_xfer(e *endpoint, buf []byte, timeout time.Duration) (int, error) { t := e.allocTransfer() - defer t.Close() + defer t.free() - if err := t.Submit(timeout); err != nil { + if err := t.submit(timeout); err != nil { log.Printf("iso: xfer failed to submit: %s", err) return 0, err } - n, err := t.Wait(buf) + n, err := t.wait(buf) if err != nil { log.Printf("iso: xfer failed: %s", err) return 0, err diff --git a/usb/transfer.go b/usb/transfer.go index d4714af..becfbf5 100644 --- a/usb/transfer.go +++ b/usb/transfer.go @@ -35,7 +35,7 @@ type usbTransfer struct { buf []byte } -func (t *usbTransfer) Submit(timeout time.Duration) error { +func (t *usbTransfer) submit(timeout time.Duration) error { t.xfer.timeout = C.uint(timeout / time.Millisecond) if errno := C.submit(t.xfer); errno < 0 { return usbError(errno) @@ -43,7 +43,7 @@ func (t *usbTransfer) Submit(timeout time.Duration) error { return nil } -func (t *usbTransfer) Wait(b []byte) (n int, err error) { +func (t *usbTransfer) wait(b []byte) (n int, err error) { select { case <-time.After(10 * time.Second): return 0, fmt.Errorf("wait timed out after 10s") @@ -57,7 +57,7 @@ func (t *usbTransfer) Wait(b []byte) (n int, err error) { return n, err } -func (t *usbTransfer) Close() error { +func (t *usbTransfer) free() error { C.libusb_free_transfer(t.xfer) return nil }