diff options
| author | Pali Rohár <pali.rohar@gmail.com> | 2012-08-09 19:43:22 +0200 |
|---|---|---|
| committer | Pali Rohár <pali.rohar@gmail.com> | 2012-08-09 19:43:22 +0200 |
| commit | d29c63cac9bf16a53e008ab5407174fc3e41efca (patch) | |
| tree | d6a17543621f53c60459fca7021af21a0a6694c9 | |
| parent | f597e28a875fdf2254b1c96ef43f18918045b7aa (diff) | |
| download | 0xFFFF-d29c63cac9bf16a53e008ab5407174fc3e41efca.tar.bz2 | |
usb-device: Rename struct members of usb_device_info
| -rw-r--r-- | src/usb-device.c | 13 | ||||
| -rw-r--r-- | src/usb-device.h | 5 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/usb-device.c b/src/usb-device.c index 482ee14..69e4997 100644 --- a/src/usb-device.c +++ b/src/usb-device.c @@ -62,7 +62,7 @@ const char * usb_flash_protocol_to_string(enum usb_flash_protocol protocol) { } -static void usb_device_info_print(const struct usb_flash_device * dev) { +static void usb_flash_device_info_print(const struct usb_flash_device * dev) { int i; @@ -86,7 +86,7 @@ static struct usb_device_info * usb_device_is_valid(struct usb_device * dev) { PRINTF_END(); PRINTF_ADD("Found "); - usb_device_info_print(&usb_devices[i]); + usb_flash_device_info_print(&usb_devices[i]); PRINTF_END(); PRINTF_LINE("Opening USB..."); @@ -126,15 +126,16 @@ static struct usb_device_info * usb_device_is_valid(struct usb_device * dev) { } } - ret = malloc(sizeof(struct usb_device_info)); + ret = calloc(1, sizeof(struct usb_device_info)); if ( ! ret ) { ALLOC_ERROR(); usb_close(udev); return NULL; } - ret->dev = udev; - ret->info = &usb_devices[i]; + ret->detected_device = DEVICE_UNKNOWN; + ret->flash_device = &usb_devices[i]; + ret->udev = udev; break; } } @@ -217,7 +218,7 @@ struct usb_device_info * usb_open_and_wait_for_device(void) { void usb_close_device(struct usb_device_info * dev) { - free(dev->dev); + free(dev->udev); free(dev); } diff --git a/src/usb-device.h b/src/usb-device.h index 8caea1d..73408ad 100644 --- a/src/usb-device.h +++ b/src/usb-device.h @@ -40,8 +40,9 @@ struct usb_flash_device { }; struct usb_device_info { - usb_dev_handle * dev; - struct usb_flash_device * info; + enum device detected_device; + struct usb_flash_device * flash_device; + usb_dev_handle * udev; }; const char * usb_flash_protocol_to_string(enum usb_flash_protocol protocol); |