remove transferIntf, instead rely on transfer.go "usbTransfer", but with

a fake libusb xfer underneath.
This commit is contained in:
Sebastian Zagrodzki
2017-02-26 21:12:18 +01:00
parent c2167157be
commit 6caeb9d701

View File

@@ -27,12 +27,6 @@ type Endpoint interface {
Info() EndpointInfo Info() EndpointInfo
} }
type transferIntf interface {
submit() error
wait() (int, error)
free() error
}
type endpoint struct { type endpoint struct {
h *libusbDevHandle h *libusbDevHandle
@@ -41,8 +35,6 @@ type endpoint struct {
readTimeout time.Duration readTimeout time.Duration
writeTimeout time.Duration writeTimeout time.Duration
newUSBTransfer func([]byte, time.Duration) (transferIntf, error)
} }
func (e *endpoint) Read(buf []byte) (int, error) { func (e *endpoint) Read(buf []byte) (int, error) {
@@ -64,16 +56,12 @@ func (e *endpoint) Write(buf []byte) (int, error) {
func (e *endpoint) Interface() InterfaceSetup { return e.InterfaceSetup } func (e *endpoint) Interface() InterfaceSetup { return e.InterfaceSetup }
func (e *endpoint) Info() EndpointInfo { return e.EndpointInfo } func (e *endpoint) Info() EndpointInfo { return e.EndpointInfo }
func (e *endpoint) newLibUSBTransfer(buf []byte, timeout time.Duration) (transferIntf, error) {
return newUSBTransfer(e.h, e.EndpointInfo, buf, timeout)
}
func (e *endpoint) transfer(buf []byte, timeout time.Duration) (int, error) { func (e *endpoint) transfer(buf []byte, timeout time.Duration) (int, error) {
if len(buf) == 0 { if len(buf) == 0 {
return 0, nil return 0, nil
} }
t, err := e.newUSBTransfer(buf, timeout) t, err := newUSBTransfer(e.h, e.EndpointInfo, buf, timeout)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -91,11 +79,9 @@ func (e *endpoint) transfer(buf []byte, timeout time.Duration) (int, error) {
} }
func newEndpoint(d *Device) *endpoint { func newEndpoint(d *Device) *endpoint {
ep := &endpoint{ return &endpoint{
h: d.handle, h: d.handle,
readTimeout: d.ReadTimeout, readTimeout: d.ReadTimeout,
writeTimeout: d.WriteTimeout, writeTimeout: d.WriteTimeout,
} }
ep.newUSBTransfer = ep.newLibUSBTransfer
return ep
} }