diff options
| author | Pali Rohár <pali.rohar@gmail.com> | 2012-08-11 09:50:38 +0200 |
|---|---|---|
| committer | Pali Rohár <pali.rohar@gmail.com> | 2012-08-11 09:50:38 +0200 |
| commit | e75b963d3a7a6fd206082115bc2ab9b4e377438a (patch) | |
| tree | 704d2b81f0a1905636cb74898ff3dcab7065da38 | |
| parent | 378dfe316240c1ec1d488828a19b9b33debd1ac4 (diff) | |
| download | 0xFFFF-e75b963d3a7a6fd206082115bc2ab9b4e377438a.tar.bz2 | |
usb-device: Add variable detected_hwrev to struct usb_device_info
| -rw-r--r-- | src/usb-device.c | 4 | ||||
| -rw-r--r-- | src/usb-device.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/usb-device.c b/src/usb-device.c index 0bf954f..103c729 100644 --- a/src/usb-device.c +++ b/src/usb-device.c @@ -129,6 +129,7 @@ static struct usb_device_info * usb_device_is_valid(struct usb_device * dev) { } ret->detected_device = DEVICE_UNKNOWN; + ret->detected_hwrev = NULL; ret->flash_device = &usb_devices[i]; ret->udev = udev; break; @@ -213,7 +214,8 @@ struct usb_device_info * usb_open_and_wait_for_device(void) { void usb_close_device(struct usb_device_info * dev) { - free(dev->udev); + usb_close(dev->udev); + free(dev->detected_hwrev); free(dev); } diff --git a/src/usb-device.h b/src/usb-device.h index 93a5b0d..2c4894c 100644 --- a/src/usb-device.h +++ b/src/usb-device.h @@ -44,7 +44,8 @@ struct usb_flash_device { struct usb_device_info { enum device detected_device; - struct usb_flash_device * flash_device; + char * detected_hwrev; + const struct usb_flash_device * flash_device; usb_dev_handle * udev; }; |