From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:36127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzQYr-0005RU-QH for qemu-devel@nongnu.org; Fri, 02 Sep 2011 06:01:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QzQYq-0003XJ-4B for qemu-devel@nongnu.org; Fri, 02 Sep 2011 06:01:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13359) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzQYp-0003X5-SQ for qemu-devel@nongnu.org; Fri, 02 Sep 2011 06:01:20 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p82A1I2M008948 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 2 Sep 2011 06:01:19 -0400 From: Gerd Hoffmann Date: Fri, 2 Sep 2011 12:01:10 +0200 Message-Id: <1314957674-30133-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1314957674-30133-1-git-send-email-kraxel@redhat.com> References: <1314957674-30133-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 3/7] usb-host: fix configuration tracking. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann It is perfectly fine to leave the usb device in unconfigured state (USBHostDevice->configuration == 0). Just do that and wait for the guest to explicitly set a configuration. This is closer to what real hardware does and it also simplifies the device initialization. There is no need to figure how the device is configured on the host. Signed-off-by: Gerd Hoffmann (cherry picked from commit b2d7c159824b5cf6af797e8bf52243fcbb42395a) --- usb-linux.c | 82 +++++++++++++--------------------------------------------- 1 files changed, 19 insertions(+), 63 deletions(-) diff --git a/usb-linux.c b/usb-linux.c index 1d0ccf8..74f1a0b 100644 --- a/usb-linux.c +++ b/usb-linux.c @@ -397,8 +397,11 @@ static int usb_host_claim_interfaces(USBHostDevice *dev, int configuration) int interface, nb_interfaces; int ret, i; - if (configuration == 0) /* address state - ignore */ + if (configuration == 0) { /* address state - ignore */ + dev->ninterfaces = 0; + dev->configuration = 0; return 1; + } DPRINTF("husb: claiming interfaces. config %d\n", configuration); @@ -423,7 +426,7 @@ static int usb_host_claim_interfaces(USBHostDevice *dev, int configuration) printf("husb: config #%d need %d\n", dev->descr[i + 5], configuration); - if (configuration < 0 || configuration == dev->descr[i + 5]) { + if (configuration == dev->descr[i + 5]) { configuration = dev->descr[i + 5]; break; } @@ -509,7 +512,7 @@ static void usb_host_handle_reset(USBDevice *dev) ioctl(s->fd, USBDEVFS_RESET); - usb_host_claim_interfaces(s, s->configuration); + usb_host_claim_interfaces(s, 0); usb_linux_update_endp_table(s); } @@ -810,6 +813,7 @@ static int usb_host_set_config(USBHostDevice *s, int config) return ctrl_error(); } usb_host_claim_interfaces(s, config); + usb_linux_update_endp_table(s); return 0; } @@ -913,51 +917,6 @@ static int usb_host_handle_control(USBDevice *dev, USBPacket *p, return USB_RET_ASYNC; } -static int usb_linux_get_configuration(USBHostDevice *s) -{ - uint8_t configuration; - struct usb_ctrltransfer ct; - int ret; - - if (usb_fs_type == USB_FS_SYS) { - char device_name[32], line[1024]; - int configuration; - - sprintf(device_name, "%d-%s", s->bus_num, s->port); - - if (!usb_host_read_file(line, sizeof(line), "bConfigurationValue", - device_name)) { - goto usbdevfs; - } - if (sscanf(line, "%d", &configuration) != 1) { - goto usbdevfs; - } - return configuration; - } - -usbdevfs: - ct.bRequestType = USB_DIR_IN; - ct.bRequest = USB_REQ_GET_CONFIGURATION; - ct.wValue = 0; - ct.wIndex = 0; - ct.wLength = 1; - ct.data = &configuration; - ct.timeout = 50; - - ret = ioctl(s->fd, USBDEVFS_CONTROL, &ct); - if (ret < 0) { - perror("usb_linux_get_configuration"); - return -1; - } - - /* in address state */ - if (configuration == 0) { - return -1; - } - - return configuration; -} - static uint8_t usb_linux_get_alt_setting(USBHostDevice *s, uint8_t configuration, uint8_t interface) { @@ -1003,16 +962,16 @@ usbdevfs: static int usb_linux_update_endp_table(USBHostDevice *s) { uint8_t *descriptors; - uint8_t devep, type, configuration, alt_interface; + uint8_t devep, type, alt_interface; int interface, length, i; for (i = 0; i < MAX_ENDPOINTS; i++) s->endp_table[i].type = INVALID_EP_TYPE; - i = usb_linux_get_configuration(s); - if (i < 0) - return 1; - configuration = i; + if (s->configuration == 0) { + /* not configured yet -- leave all endpoints disabled */ + return 0; + } /* get the desired configuration, interface, and endpoint descriptors * from device description */ @@ -1021,8 +980,9 @@ static int usb_linux_update_endp_table(USBHostDevice *s) i = 0; if (descriptors[i + 1] != USB_DT_CONFIG || - descriptors[i + 5] != configuration) { - DPRINTF("invalid descriptor data - configuration\n"); + descriptors[i + 5] != s->configuration) { + fprintf(stderr, "invalid descriptor data - configuration %d\n", + s->configuration); return 1; } i += descriptors[i]; @@ -1036,7 +996,8 @@ static int usb_linux_update_endp_table(USBHostDevice *s) } interface = descriptors[i + 2]; - alt_interface = usb_linux_get_alt_setting(s, configuration, interface); + alt_interface = usb_linux_get_alt_setting(s, s->configuration, + interface); /* the current interface descriptor is the active interface * and has endpoints */ @@ -1175,13 +1136,8 @@ static int usb_host_open(USBHostDevice *dev, int bus_num, #endif - /* - * Initial configuration is -1 which makes us claim first - * available config. We used to start with 1, which does not - * always work. I've seen devices where first config starts - * with 2. - */ - if (!usb_host_claim_interfaces(dev, -1)) { + /* start unconfigured -- we'll wait for the guest to set a configuration */ + if (!usb_host_claim_interfaces(dev, 0)) { goto fail; } -- 1.7.1