[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/7] usb-linux: introduce a usb_linux_alt_setting fu
From: |
Hans de Goede |
Subject: |
[Qemu-devel] [PATCH 1/7] usb-linux: introduce a usb_linux_alt_setting function |
Date: |
Fri, 26 Nov 2010 19:13:17 +0100 |
The next patch in this series introduces multiple ways to get the
alt setting dependent upon usb_fs_type, it is cleaner to put this
into its own function.
Note that this patch also changes the assumed alt setting in case
of an error getting the alt setting to be 0 (a sane default) rather
then the interface numberwhich makes no sense.
Signed-off-by: Hans de Goede <address@hidden>
---
usb-linux.c | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/usb-linux.c b/usb-linux.c
index ccf7073..a93f0e5 100644
--- a/usb-linux.c
+++ b/usb-linux.c
@@ -822,13 +822,35 @@ usbdevfs:
return configuration;
}
+static uint8_t usb_linux_get_alt_setting(USBHostDevice *s,
+ uint8_t configuration, uint8_t interface)
+{
+ uint8_t alt_setting;
+ struct usb_ctrltransfer ct;
+ int ret;
+
+ ct.bRequestType = USB_DIR_IN | USB_RECIP_INTERFACE;
+ ct.bRequest = USB_REQ_GET_INTERFACE;
+ ct.wValue = 0;
+ ct.wIndex = interface;
+ ct.wLength = 1;
+ ct.data = &alt_setting;
+ ct.timeout = 50;
+ ret = ioctl(s->fd, USBDEVFS_CONTROL, &ct);
+ if (ret < 0) {
+ /* Assume alt 0 on error */
+ return 0;
+ }
+
+ return alt_setting;
+}
+
/* 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;
+ int interface, length, i;
i = usb_linux_get_configuration(s);
if (i < 0)
@@ -857,19 +879,7 @@ static int usb_linux_update_endp_table(USBHostDevice *s)
}
interface = descriptors[i + 2];
-
- ct.bRequestType = USB_DIR_IN | USB_RECIP_INTERFACE;
- ct.bRequest = USB_REQ_GET_INTERFACE;
- ct.wValue = 0;
- ct.wIndex = interface;
- ct.wLength = 1;
- ct.data = &alt_interface;
- ct.timeout = 50;
-
- ret = ioctl(s->fd, USBDEVFS_CONTROL, &ct);
- if (ret < 0) {
- alt_interface = interface;
- }
+ alt_interface = usb_linux_get_alt_setting(s, configuration, interface);
/* the current interface descriptor is the active interface
* and has endpoints */
--
1.7.3.2
- [Qemu-devel] [PATCH 1/7] usb-linux: introduce a usb_linux_alt_setting function,
Hans de Goede <=
- [Qemu-devel] [PATCH 2/7] usb-linux: Get the alt. setting from sysfs rather then asking the dev, Hans de Goede, 2010/11/26
- [Qemu-devel] [PATCH 3/7] usb-linux: Add support for buffering iso usb packets, Hans de Goede, 2010/11/26
- [Qemu-devel] [PATCH 4/7] usb-linux: Refuse packets for endpoints which are not in the usb descriptor, Hans de Goede, 2010/11/26
- [Qemu-devel] [PATCH 5/7] usb-linux: Refuse iso packets when max packet size is 0 (alt setting 0), Hans de Goede, 2010/11/26
- [Qemu-devel] [PATCH 6/7] usb-linux: We only need to keep track of 15 endpoints, Hans de Goede, 2010/11/26
- [Qemu-devel] [PATCH 7/7] usb-linux: Add support for buffering iso out usb packets, Hans de Goede, 2010/11/26