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

make methods of usbTransfer private

Browse Source
This commit is contained in:
Sebastian Zagrodzki
2017-02-09 22:38:16 +01:00
parent 80b2741a2c
commit de92c7047b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
usb/iso.go
View File

@@ -75,14 +75,14 @@ func (end *endpoint) allocTransfer() *usbTransfer {
func isochronous_xfer(e *endpoint, buf []byte, timeout time.Duration) (int, error) { func isochronous_xfer(e *endpoint, buf []byte, timeout time.Duration) (int, error) {
t := e.allocTransfer() 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) log.Printf("iso: xfer failed to submit: %s", err)
return 0, err return 0, err
} }
n, err := t.Wait(buf) n, err := t.wait(buf)
if err != nil { if err != nil {
log.Printf("iso: xfer failed: %s", err) log.Printf("iso: xfer failed: %s", err)
return 0, err return 0, err

6
usb/transfer.go
View File

@@ -35,7 +35,7 @@ type usbTransfer struct {
buf []byte 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) t.xfer.timeout = C.uint(timeout / time.Millisecond)
if errno := C.submit(t.xfer); errno < 0 { if errno := C.submit(t.xfer); errno < 0 {
return usbError(errno) return usbError(errno)
@@ -43,7 +43,7 @@ func (t *usbTransfer) Submit(timeout time.Duration) error {
return nil return nil
} }
func (t *usbTransfer) Wait(b []byte) (n int, err error) { func (t *usbTransfer) wait(b []byte) (n int, err error) {
select { select {
case <-time.After(10 * time.Second): case <-time.After(10 * time.Second):
return 0, fmt.Errorf("wait timed out after 10s") 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 return n, err
} }
func (t *usbTransfer) Close() error { func (t *usbTransfer) free() error {
C.libusb_free_transfer(t.xfer) C.libusb_free_transfer(t.xfer)
return nil return nil
} }