OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

usb-linux: introduce a usb_linux_get_configuration function 

The next patch in this series introduces multiple ways to get the
configuration dependent upon usb_fs_type, it is cleaner to put this
into its own function.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Hans de Goede 2010-11-10 10:06:24 +01:00 committed by Anthony Liguori
parent 0f5160d1ea
commit 71d71bbdeb
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
usb-linux.c
View File

@ -775,13 +775,11 @@ static int usb_host_handle_packet(USBDevice *s, USBPacket *p)
}
}
/* returns 1 on problem encountered or 0 for success */
static int usb_linux_update_endp_table(USBHostDevice *s)
static int usb_linux_get_configuration(USBHostDevice *s)
{
uint8_t *descriptors;
uint8_t devep, type, configuration, alt_interface;
uint8_t configuration;
struct usb_ctrltransfer ct;
int interface, ret, length, i;
int ret;
ct.bRequestType = USB_DIR_IN;
ct.bRequest = USB_REQ_GET_CONFIGURATION;
@ -793,15 +791,31 @@ static int usb_linux_update_endp_table(USBHostDevice *s)
ret = ioctl(s->fd, USBDEVFS_CONTROL, &ct);
if (ret < 0) {
perror("usb_linux_update_endp_table");
return 1;
perror("usb_linux_get_configuration");
return -1;
}
/* in address state */
if (configuration == 0) {
return 1;
return -1;
}
return configuration;
}
/* returns 1 on problem encountered or 0 for success */
static int usb_linux_update_endp_table(USBHostDevice *s)
{
uint8_t *descriptors;
uint8_t devep, type, configuration, alt_interface;
struct usb_ctrltransfer ct;
int interface, ret, length, i;
i = usb_linux_get_configuration(s);
if (i < 0)
return 1;
configuration = i;
/* get the desired configuration, interface, and endpoint descriptors
* from device description */
descriptors = &s->descr[18];