summary refs log tree commit diff stats
path: root/hw/usb-hid.c
diff options
context:
space:
mode:
authorBrad Hards <bradh@frogmouth.net>2011-04-03 15:33:19 +1000
committerGerd Hoffmann <kraxel@redhat.com>2011-05-26 11:55:02 +0200
commitadd750882f327db813af0795727efe5e4579ca5c (patch)
tree81367565194098ea827914c74d8f7c2e8fa778dd /hw/usb-hid.c
parentc6d3ad0fad34b33557976e579ab0e4159989506f (diff)
downloadfocaccia-qemu-add750882f327db813af0795727efe5e4579ca5c.tar.gz
focaccia-qemu-add750882f327db813af0795727efe5e4579ca5c.zip
usb: update config descriptors to identify number of interfaces
Previously we relied on the .bNumInterfaces, but that won't always be
accurate after the introduction of grouped interfaces.

Signed-off-by: Brad Hards <bradh@frogmouth.net>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/usb-hid.c')
-rw-r--r--hw/usb-hid.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/usb-hid.c b/hw/usb-hid.c
index 89c293c466..bf59a7d748 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,
         },
     },