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

OpenEndpoint for now takes an address - a device can have two endpoints

Browse Source 
with the same number...
This commit is contained in:
Sebastian Zagrodzki
2017-04-09 19:08:42 +02:00
parent c44b5b7307
commit f668df87df
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
usb/config.go
View File

@@ -27,6 +27,8 @@ type EndpointInfo struct {
// Number represents the endpoint number. Note that the endpoint number is different from the // Number represents the endpoint number. Note that the endpoint number is different from the
// address field in the descriptor - address 0x82 means endpoint number 2, // address field in the descriptor - address 0x82 means endpoint number 2,
// with endpoint direction IN. // with endpoint direction IN.
// The device can have up to two endpoints with the same number but with
// different directions.
Number uint8 Number uint8
// Direction defines whether the data is flowing IN or OUT from the host perspective. // Direction defines whether the data is flowing IN or OUT from the host perspective.
Direction EndpointDirection Direction EndpointDirection
@@ -44,9 +46,9 @@ type EndpointInfo struct {
UsageType UsageType UsageType UsageType
} }
func (e EndpointInfo) addr() uint8 { func endpointAddr(n uint8, d EndpointDirection) uint8 {
addr := e.Number addr := n
if e.Direction == EndpointDirectionIn { if d == EndpointDirectionIn {
addr |= 0x80 addr |= 0x80
} }
return addr return addr
@@ -55,7 +57,7 @@ func (e EndpointInfo) addr() uint8 {
// String returns the human-readable description of the endpoint. // String returns the human-readable description of the endpoint.
func (e EndpointInfo) String() string { func (e EndpointInfo) String() string {
ret := make([]string, 0, 3) ret := make([]string, 0, 3)
ret = append(ret, fmt.Sprintf("Endpoint #%d %s (address 0x%02x) %s", e.Number, e.Direction, e.addr(), e.TransferType)) ret = append(ret, fmt.Sprintf("Endpoint #%d %s (address 0x%02x) %s", e.Number, e.Direction, endpointAddr(e.Number, e.Direction), e.TransferType))
switch e.TransferType { switch e.TransferType {
case TransferTypeIsochronous: case TransferTypeIsochronous:
ret = append(ret, fmt.Sprintf("- %s %s", e.IsoSyncType, e.UsageType)) ret = append(ret, fmt.Sprintf("- %s %s", e.IsoSyncType, e.UsageType))

14
usb/device.go
View File

@@ -92,7 +92,7 @@ func (d *Device) Close() error {
return nil return nil
} }
func (d *Device) OpenEndpoint(epNum, cfgNum, ifNum, setNum uint8) (*Endpoint, error) { func (d *Device) OpenEndpoint(epAddr, cfgNum, ifNum, setNum uint8) (*Endpoint, error) {
var cfg *ConfigInfo var cfg *ConfigInfo
for _, c := range d.Configs { for _, c := range d.Configs {
if c.Config == cfgNum { if c.Config == cfgNum {
@@ -102,7 +102,7 @@ func (d *Device) OpenEndpoint(epNum, cfgNum, ifNum, setNum uint8) (*Endpoint, er
} }
} }
if cfg == nil { if cfg == nil {
return nil, fmt.Errorf("usb: unknown configuration %02x", cfgNum) return nil, fmt.Errorf("usb: unknown configuration 0x%02x", cfgNum)
} }
var intf *InterfaceInfo var intf *InterfaceInfo
@@ -114,7 +114,7 @@ func (d *Device) OpenEndpoint(epNum, cfgNum, ifNum, setNum uint8) (*Endpoint, er
} }
} }
if intf == nil { if intf == nil {
return nil, fmt.Errorf("usb: unknown interface %02x", ifNum) return nil, fmt.Errorf("usb: unknown interface 0x%02x", ifNum)
} }
var setAlternate bool var setAlternate bool
@@ -127,18 +127,18 @@ func (d *Device) OpenEndpoint(epNum, cfgNum, ifNum, setNum uint8) (*Endpoint, er
} }
} }
if ifs == nil { if ifs == nil {
return nil, fmt.Errorf("usb: unknown setup %02x", setNum) return nil, fmt.Errorf("usb: unknown setup 0x%02x", setNum)
} }
var ep *EndpointInfo var ep *EndpointInfo
for _, e := range ifs.Endpoints { for _, e := range ifs.Endpoints {
if e.Number == epNum { if endpointAddr(e.Number, e.Direction) == epAddr {
debug.Printf("found ep %02x in %#v\n", epNum, *ifs) debug.Printf("found ep 0x%02x %s in %#v\n", e.Number, e.Direction, *ifs)
ep = &e ep = &e
} }
} }
if ep == nil { if ep == nil {
return nil, fmt.Errorf("usb: unknown endpoint %02x", epNum) return nil, fmt.Errorf("usb: didn't find endpoint address 0x%02x", epAddr)
} }
end := newEndpoint(d.handle, *ifs, *ep, d.ReadTimeout, d.WriteTimeout) end := newEndpoint(d.handle, *ifs, *ep, d.ReadTimeout, d.WriteTimeout)

2
usb/endpoint_test.go
View File

@@ -120,7 +120,7 @@ func TestOpenEndpoint(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("OpenDeviceWithVidPid(0x8888, 0x0002): got error %v, want nil", err) t.Fatalf("OpenDeviceWithVidPid(0x8888, 0x0002): got error %v, want nil", err)
} }
got, err := dev.OpenEndpoint(6, 1, 1, 2) got, err := dev.OpenEndpoint(0x86, 1, 1, 2)
if err != nil { if err != nil {
t.Fatalf("OpenEndpoint(cfg=1, if=1, alt=2, ep=0x86): got error %v, want nil", err) t.Fatalf("OpenEndpoint(cfg=1, if=1, alt=2, ep=0x86): got error %v, want nil", err)
} }

2
usb/libusb.go
View File

@@ -374,7 +374,7 @@ func (libusbImpl) alloc(d *libusbDevHandle, ep *EndpointInfo, timeout time.Durat
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(ep.addr()) xfer.endpoint = C.uchar(endpointAddr(ep.Number, ep.Direction))
xfer.timeout = C.uint(timeout / time.Millisecond) xfer.timeout = C.uint(timeout / time.Millisecond)
xfer._type = C.uchar(ep.TransferType) xfer._type = C.uchar(ep.TransferType)
xfer.num_iso_packets = C.int(isoPackets) xfer.num_iso_packets = C.int(isoPackets)