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

14
usb/device.go
View File

@@ -92,7 +92,7 @@ func (d *Device) Close() error {
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
for _, c := range d.Configs {
if c.Config == cfgNum {
@@ -102,7 +102,7 @@ func (d *Device) OpenEndpoint(epNum, cfgNum, ifNum, setNum uint8) (*Endpoint, er
}
}
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
@@ -114,7 +114,7 @@ func (d *Device) OpenEndpoint(epNum, cfgNum, ifNum, setNum uint8) (*Endpoint, er
}
}
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
@@ -127,18 +127,18 @@ func (d *Device) OpenEndpoint(epNum, cfgNum, ifNum, setNum uint8) (*Endpoint, er
}
}
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
for _, e := range ifs.Endpoints {
if e.Number == epNum {
debug.Printf("found ep %02x in %#v\n", epNum, *ifs)
if endpointAddr(e.Number, e.Direction) == epAddr {
debug.Printf("found ep 0x%02x %s in %#v\n", e.Number, e.Direction, *ifs)
ep = &e
}
}
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)