Replace descriptor Configs with a map - config ids are arbitrary numbers

(unlike interface or alt setting numbers, which are 0-based array indices).
This makes it easier to access a particular config without having to
iterate over the descriptors.
This commit is contained in:
Sebastian Zagrodzki
2017-04-29 11:56:49 +02:00
parent 60d0aba507
commit 77c176cd4c
4 changed files with 22 additions and 26 deletions

View File

@@ -207,7 +207,7 @@ func (libusbImpl) getDeviceDesc(d *libusbDevice) (*Descriptor, error) {
return nil, err
}
// Enumerate configurations
var cfgs []ConfigInfo
cfgs := make(map[int]ConfigInfo)
for i := 0; i < int(desc.bNumConfigurations); i++ {
var cfg *C.struct_libusb_config_descriptor
if err := fromErrNo(C.libusb_get_config_descriptor((*C.libusb_device)(d), C.uint8_t(i), &cfg)); err != nil {
@@ -273,7 +273,7 @@ func (libusbImpl) getDeviceDesc(d *libusbDevice) (*Descriptor, error) {
})
}
C.libusb_free_config_descriptor(cfg)
cfgs = append(cfgs, c)
cfgs[c.Config] = c
}
return &Descriptor{