From patchwork Tue Mar 29 02:31:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Hards X-Patchwork-Id: 88713 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 906E4B6F2B for ; Tue, 29 Mar 2011 13:33:47 +1100 (EST) Received: from localhost ([127.0.0.1]:51781 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q4OkG-0000kC-R2 for incoming@patchwork.ozlabs.org; Mon, 28 Mar 2011 22:33:24 -0400 Received: from [140.186.70.92] (port=34250 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q4Oj6-0000jD-Gu for qemu-devel@nongnu.org; Mon, 28 Mar 2011 22:32:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q4Oj4-0004Os-Jd for qemu-devel@nongnu.org; Mon, 28 Mar 2011 22:32:12 -0400 Received: from smtpout3.three.com.au ([202.124.68.59]:55928) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q4Oj4-0004Mq-2d for qemu-devel@nongnu.org; Mon, 28 Mar 2011 22:32:10 -0400 Received: from auumvs2fe06.three.com.au (auhgvpsmtp.three.com.au [10.176.77.86]) by smtpout3.three.com.au (Postfix) with ESMTP id 3064116B5E6; Tue, 29 Mar 2011 12:32:03 +1000 (EST) Received: from localhost.localdomain ([10.169.92.157]) by auumvs2fe06.three.com.au with ESMTP id p2T2Vuac004090-p2T2Vuaf004090; Tue, 29 Mar 2011 12:32:00 +1000 From: Brad Hards To: qemu-devel@nongnu.org Date: Tue, 29 Mar 2011 13:31:33 +1100 Message-Id: <1301365895-15056-3-git-send-email-bradh@frogmouth.net> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1301365895-15056-1-git-send-email-bradh@frogmouth.net> References: <1301365895-15056-1-git-send-email-bradh@frogmouth.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 202.124.68.59 Cc: Brad Hards Subject: [Qemu-devel] [PATCH 2/4] usb: update config descriptors to identify number of interfaces X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Previously we relied on the .bNumInterfaces, but that won't always be accurate after the introduction of grouped interfaces. --- hw/usb-hid.c | 3 +++ hw/usb-hub.c | 1 + hw/usb-msd.c | 2 ++ hw/usb-serial.c | 1 + hw/usb-wacom.c | 1 + 5 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/usb-hid.c b/hw/usb-hid.c index c25362c..8a5e2ca 100644 --- a/hw/usb-hid.c +++ b/hw/usb-hid.c @@ -211,6 +211,7 @@ static const USBDescDevice desc_device_mouse = { .iConfiguration = STR_CONFIG_MOUSE, .bmAttributes = 0xa0, .bMaxPower = 50, + .nif = 1, .ifs = &desc_iface_mouse, }, }, @@ -227,6 +228,7 @@ static const USBDescDevice desc_device_tablet = { .iConfiguration = STR_CONFIG_TABLET, .bmAttributes = 0xa0, .bMaxPower = 50, + .nif = 1, .ifs = &desc_iface_tablet, }, }, @@ -243,6 +245,7 @@ static const USBDescDevice desc_device_keyboard = { .iConfiguration = STR_CONFIG_KEYBOARD, .bmAttributes = 0xa0, .bMaxPower = 50, + .nif = 1, .ifs = &desc_iface_keyboard, }, }, diff --git a/hw/usb-hub.c b/hw/usb-hub.c index 3dd31ba..4c19c8c 100644 --- a/hw/usb-hub.c +++ b/hw/usb-hub.c @@ -119,6 +119,7 @@ static const USBDescDevice desc_device_hub = { .bNumInterfaces = 1, .bConfigurationValue = 1, .bmAttributes = 0xe0, + .nif = 1, .ifs = &desc_iface_hub, }, }, diff --git a/hw/usb-msd.c b/hw/usb-msd.c index 76f5b02..ea466c5 100644 --- a/hw/usb-msd.c +++ b/hw/usb-msd.c @@ -119,6 +119,7 @@ static const USBDescDevice desc_device_full = { .bConfigurationValue = 1, .iConfiguration = STR_CONFIG_FULL, .bmAttributes = 0xc0, + .nif = 1, .ifs = &desc_iface_full, }, }, @@ -153,6 +154,7 @@ static const USBDescDevice desc_device_high = { .bConfigurationValue = 1, .iConfiguration = STR_CONFIG_HIGH, .bmAttributes = 0xc0, + .nif = 1, .ifs = &desc_iface_high, }, }, diff --git a/hw/usb-serial.c b/hw/usb-serial.c index 6763d52..48ea0d8 100644 --- a/hw/usb-serial.c +++ b/hw/usb-serial.c @@ -146,6 +146,7 @@ static const USBDescDevice desc_device = { .bConfigurationValue = 1, .bmAttributes = 0x80, .bMaxPower = 50, + .nif = 1, .ifs = &desc_iface0, }, }, diff --git a/hw/usb-wacom.c b/hw/usb-wacom.c index 16be7a2..57041a1 100644 --- a/hw/usb-wacom.c +++ b/hw/usb-wacom.c @@ -108,6 +108,7 @@ static const USBDescDevice desc_device_wacom = { .bConfigurationValue = 1, .bmAttributes = 0x80, .bMaxPower = 40, + .nif = 1, .ifs = &desc_iface_wacom, }, },