summaryrefslogtreecommitdiffstats
path: root/hw
authorHans de Goede <[email protected]>2011-05-27 12:27:18 (GMT)
committer Gerd Hoffmann <[email protected]>2011-06-23 09:28:06 (GMT)
commitba3f9bfba9ad8d2bbcb9a9fa9ed0f07347fc1c58 (patch) (side-by-side diff)
tree7868a7af402691d899d6c54007d619c9fb5cc6ce /hw
parentfa19bf831b8c87006533645ece58bc620aca00bc (diff)
downloadqemu-kvm-ba3f9bfba9ad8d2bbcb9a9fa9ed0f07347fc1c58.zip
qemu-kvm-ba3f9bfba9ad8d2bbcb9a9fa9ed0f07347fc1c58.tar.gz
qemu-kvm-ba3f9bfba9ad8d2bbcb9a9fa9ed0f07347fc1c58.tar.bz2
usb: Add a speedmask to devices
This is used to indicate at which speed[s] the device can operate, so that this can be checked to match the ports capabilities when it gets attached to a bus. Note that currently all usb1 emulated device claim to be fullspeed, this seems to not cause any problems, but still seems wrong, because with real hardware keyboards, mice and tablets usually are lo-speed, so reporting these as fullspeed devices seems wrong. Signed-off-by: Gerd Hoffmann <[email protected]>
Diffstat (limited to 'hw') (more/less context) (ignore whitespace changes)
-rw-r--r--hw/usb-ccid.c1
-rw-r--r--hw/usb-desc.c10
-rw-r--r--hw/usb.h3
3 files changed, 14 insertions, 0 deletions
diff --git a/hw/usb-ccid.c b/hw/usb-ccid.c
index 59c6431..30bb4d6 100644
--- a/hw/usb-ccid.c
+++ b/hw/usb-ccid.c
@@ -1271,6 +1271,7 @@ static int ccid_initfn(USBDevice *dev)
s->migration_target_ip = 0;
s->migration_target_port = 0;
s->dev.speed = USB_SPEED_FULL;
+ s->dev.speedmask = USB_SPEED_MASK_FULL;
s->notify_slot_change = false;
s->powered = true;
s->pending_answers_num = 0;
diff --git a/hw/usb-desc.c b/hw/usb-desc.c
index e4a4680..0b9d351 100644
--- a/hw/usb-desc.c
+++ b/hw/usb-desc.c
@@ -242,7 +242,17 @@ static void usb_desc_setdefaults(USBDevice *dev)
void usb_desc_init(USBDevice *dev)
{
+ const USBDesc *desc = dev->info->usb_desc;
+
+ assert(desc != NULL);
dev->speed = USB_SPEED_FULL;
+ dev->speedmask = 0;
+ if (desc->full) {
+ dev->speedmask |= USB_SPEED_MASK_FULL;
+ }
+ if (desc->high) {
+ dev->speedmask |= USB_SPEED_MASK_HIGH;
+ }
usb_desc_setdefaults(dev);
}
diff --git a/hw/usb.h b/hw/usb.h
index 06ce058..a6b311f 100644
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -168,7 +168,10 @@ struct USBDevice {
char *port_path;
void *opaque;
+ /* Actual connected speed */
int speed;
+ /* Supported speeds, not in info because it may be variable (hostdevs) */
+ int speedmask;
uint8_t addr;
char product_desc[32];
int auto_attach;