[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/14] usb-linux: introduce a usb_linux_alt_setting
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 01/14] usb-linux: introduce a usb_linux_alt_setting function |
Date: |
Wed, 4 May 2011 17:41:35 +0200 |
From: Hans de Goede <address@hidden>
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>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
usb-linux.c | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/usb-linux.c b/usb-linux.c
index 1f33c2c..353e1b1 100644
--- a/usb-linux.c
+++ b/usb-linux.c
@@ -823,13 +823,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)
@@ -858,19 +880,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.1
- [Qemu-devel] [PULL] usb patch queue, Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 01/14] usb-linux: introduce a usb_linux_alt_setting function,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 02/14] usb-linux: Get the alt. setting from sysfs rather then asking the dev, Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 07/14] usb-linux: Add support for buffering iso out usb packets, Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 03/14] usb-linux: Add support for buffering iso usb packets, Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 11/14] ohci: get ohci state via container_of(), Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 06/14] usb-linux: We only need to keep track of 15 endpoints, Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 04/14] usb-linux: Refuse packets for endpoints which are not in the usb descriptor, Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 05/14] usb-linux: Refuse iso packets when max packet size is 0 (alt setting 0), Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 10/14] uhci: keep uhci state pointer in async packet struct., Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 08/14] usb: control buffer fixes, Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 12/14] musb: get musb state via container_of(), Gerd Hoffmann, 2011/05/04