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

rename Descriptor to DeviceDesc

Browse Source
This commit is contained in:
Sebastian Zagrodzki
2017-05-06 02:36:45 +02:00
parent 86c8e27edf
commit fedc9864dd
9 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
usb.go
View File

@@ -149,7 +149,7 @@ func NewContext() *Context {
// Every Device returned (whether an error is also returned or not) must be closed.
// If there are any errors enumerating the devices,
// the final one is returned along with any successfully opened devices.
func (c *Context) ListDevices(each func(desc *Descriptor) bool) ([]*Device, error) {
func (c *Context) ListDevices(each func(desc *DeviceDesc) bool) ([]*Device, error) {
list, err := libusb.getDevices(c.ctx)
if err != nil {
return nil, err
@@ -171,7 +171,7 @@ func (c *Context) ListDevices(each func(desc *Descriptor) bool) ([]*Device, erro
reterr = err
continue
}
ret = append(ret, &Device{handle: handle, Descriptor: desc})
ret = append(ret, &Device{handle: handle, DeviceDesc: desc})
} else {
libusb.dereference(dev)
}
@@ -187,7 +187,7 @@ func (c *Context) ListDevices(each func(desc *Descriptor) bool) ([]*Device, erro
// be called to release the device if the returned device wasn't nil.
func (c *Context) OpenDeviceWithVIDPID(vid, pid ID) (*Device, error) {
var found bool
devs, err := c.ListDevices(func(desc *Descriptor) bool {
devs, err := c.ListDevices(func(desc *DeviceDesc) bool {
if found {
return false
}