valentineus/0xFFFF
1
Fork 0
Code Releases Activity

usb-device: Rename struct members of usb_device_info

Browse Source
This commit is contained in:
Pali Rohár committed 2012-08-09 19:43:22 +02:00
1 parent f597e28a87
commit d29c63cac9
2 files changed
+10 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/usb-device.c
+7 -6
View File
@@ -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; int i;
@@ -86,7 +86,7 @@ static struct usb_device_info * usb_device_is_valid(struct usb_device * dev) {
PRINTF_END(); PRINTF_END();
PRINTF_ADD("Found "); PRINTF_ADD("Found ");
usb_device_info_print(&usb_devices[i]); usb_flash_device_info_print(&usb_devices[i]);
PRINTF_END(); PRINTF_END();
PRINTF_LINE("Opening USB..."); 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 ) { if ( ! ret ) {
ALLOC_ERROR(); ALLOC_ERROR();
usb_close(udev); usb_close(udev);
return NULL; return NULL;
} }
ret->dev = udev; ret->detected_device = DEVICE_UNKNOWN;
ret->info = &usb_devices[i]; ret->flash_device = &usb_devices[i];
ret->udev = udev;
break; 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) { void usb_close_device(struct usb_device_info * dev) {
free(dev->dev); free(dev->udev);
free(dev); free(dev);
} }
src/usb-device.h
+3 -2
View File
@@ -40,8 +40,9 @@ struct usb_flash_device {
}; };
struct usb_device_info { struct usb_device_info {
usb_dev_handle * dev; enum device detected_device;
struct usb_flash_device * info; struct usb_flash_device * flash_device;
usb_dev_handle * udev;
}; };
const char * usb_flash_protocol_to_string(enum usb_flash_protocol protocol); const char * usb_flash_protocol_to_string(enum usb_flash_protocol protocol);