valentineus/0xFFFF
1
Fork 0
Code Releases Activity

all: Switch to libusb-1.0

Browse Source 
libusb 0.1 is deprecated. This updates 0xFFFF to use the
newer libusb 1.0 API instead.
This commit is contained in:
Sebastian Reichel authored and Pali Rohár committed 2016-01-23 16:06:12 +01:00
1 parent 6482e4d2b7
commit d5028a12ca
7 files changed
+170 -168
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/disk.c
+10 -4
View File
@@ -277,14 +277,20 @@ int disk_init(struct usb_device_info * dev) {
unsigned int devnum;
unsigned int busnum;
struct usb_device * device;
uint8_t usbdevnum;
uint8_t usbbusnum;
device = usb_device(dev->udev);
if ( ! device || ! device->bus ) {
struct libusb_device * device;
device = libusb_get_device(dev->udev);
if ( ! device ) {
ERROR_INFO("Cannot read usb devnum and busnum");
return -1;
}
usbbusnum = libusb_get_bus_number(device);
usbdevnum = libusb_get_port_number(device);
dir = opendir("/sys/dev/block/");
if ( ! dir ) {
ERROR_INFO("Cannot open '/sys/dev/block/' directory");
@@ -324,7 +330,7 @@ int disk_init(struct usb_device_info * dev) {
fclose(f);
if ( devnum != device->devnum || device->bus->location != busnum )
if ( devnum != usbdevnum || usbbusnum != busnum )
continue;
if ( sscanf(dirent->d_name, "%d:%d", &maj, &min) != 2 ) {