openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb-linux: Get speed from sysfs rather then from the connectinfo ioctl 

The connectinfo ioctl only differentiates between lo speed devices, and
all other speeds, where as we would like to know the real speed. The real
speed is available in sysfs so use that when available.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Hans de Goede 2011-05-31 11:35:18 +02:00 committed by Gerd Hoffmann
parent f72e502e5f
commit 3991c35e85
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
usb-linux.c
View File

@ -1056,10 +1056,9 @@ static int usb_linux_update_endp_table(USBHostDevice *s)
}
static int usb_host_open(USBHostDevice *dev, int bus_num,
int addr, char *port, const char *prod_name)
int addr, char *port, const char *prod_name, int speed)
{
int fd = -1, ret;
struct usbdevfs_connectinfo ci;
char buf[1024];
if (dev->fd != -1) {
@ -1114,24 +1113,29 @@ static int usb_host_open(USBHostDevice *dev, int bus_num,
goto fail;
}
ret = usb_linux_update_endp_table(dev);
if (ret) {
goto fail;
}
if (speed == -1) {
struct usbdevfs_connectinfo ci;
ret = ioctl(fd, USBDEVFS_CONNECTINFO, &ci);
if (ret < 0) {
perror("usb_host_device_open: USBDEVFS_CONNECTINFO");
goto fail;
}
printf("husb: grabbed usb device %d.%d\n", bus_num, addr);
ret = usb_linux_update_endp_table(dev);
if (ret) {
goto fail;
}
if (ci.slow) {
dev->dev.speed = USB_SPEED_LOW;
speed = USB_SPEED_LOW;
} else {
dev->dev.speed = USB_SPEED_HIGH;
speed = USB_SPEED_HIGH;
}
}
dev->dev.speed = speed;
printf("husb: grabbed usb device %d.%d\n", bus_num, addr);
if (!prod_name || prod_name[0] == '\0') {
snprintf(dev->dev.product_desc, sizeof(dev->dev.product_desc),
@ -1345,7 +1349,8 @@ static int usb_host_scan_dev(void *opaque, USBScanFunc *func)
}
device_count = 0;
bus_num = addr = speed = class_id = product_id = vendor_id = 0;
bus_num = addr = class_id = product_id = vendor_id = 0;
speed = -1; /* Can't get the speed from /[proc|dev]/bus/usb/devices */
for(;;) {
if (fgets(line, sizeof(line), f) == NULL) {
break;
@ -1655,7 +1660,7 @@ static int usb_host_auto_scan(void *opaque, int bus_num, int addr, char *port,
}
DPRINTF("husb: auto open: bus_num %d addr %d\n", bus_num, addr);
usb_host_open(s, bus_num, addr, port, product_name);
usb_host_open(s, bus_num, addr, port, product_name, speed);
}
return 0;