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

Rename more "Info" fields to "Desc"

Browse Source
This commit is contained in:
Sebastian Zagrodzki
2017-05-06 02:52:19 +02:00
parent 9f04f7bdf0
commit d68d0c1a41
10 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
device.go
View File

@@ -117,12 +117,12 @@ func (d *Device) Config(cfgNum int) (*Config, error) {
if d.handle == nil {
return nil, fmt.Errorf("Config(%d) called on %s after Close", cfgNum, d)
}
info, ok := d.Desc.Configs[cfgNum]
desc, ok := d.Desc.Configs[cfgNum]
if !ok {
return nil, fmt.Errorf("configuration id %d not found in the descriptor of the device %s. Available config ids: %v", cfgNum, d, d.Desc.sortedConfigIds())
}
cfg := &Config{
Info: info,
Desc: desc,
dev: d,
claimed: make(map[int]bool),
}
@@ -175,7 +175,7 @@ func (d *Device) Close() error {
d.mu.Lock()
defer d.mu.Unlock()
if d.claimed != nil {
return fmt.Errorf("can't release the device %s, it has an open config %s", d, d.claimed.Info.Config)
return fmt.Errorf("can't release the device %s, it has an open config %s", d, d.claimed.Desc.Number)
}
libusb.close(d.handle)
d.handle = nil