diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2010-11-26 20:20:41 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2011-01-11 15:56:01 +0100 |
| commit | a980a065fb5e86d6dec337e6cb6ff432f1a143c9 (patch) | |
| tree | 770139308761e2eb59bea5b1520e5b5dd7431308 /hw/usb-msd.c | |
| parent | 41c6abbdeb5a86a135ee80a30541ecf52ffd3e23 (diff) | |
| download | qemu-a980a065fb5e86d6dec337e6cb6ff432f1a143c9.zip qemu-a980a065fb5e86d6dec337e6cb6ff432f1a143c9.tar.gz qemu-a980a065fb5e86d6dec337e6cb6ff432f1a143c9.tar.bz2 | |
usb: move USB_REQ_{GET,SET}_CONFIGURATION handling to common code
This patch adds fields to the USBDevice struct for the current
speed (hard-wired to full speed for now) and current device
configuration. Also a init function is added which inializes
these fields. This allows USB_REQ_{GET,SET}_CONFIGURATION
handling to be moved to common code.
For most drivers the conversion is trivial ad they support a single
configuration only anyway. One exception is bluetooth where some
device-specific setup code runs after get/set configuration. The
other is usb-net which actually has two configurations so the
the code to check for the active configuration has been adapted.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/usb-msd.c')
| -rw-r--r-- | hw/usb-msd.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/hw/usb-msd.c b/hw/usb-msd.c index b54ccbc..56c6f3d 100644 --- a/hw/usb-msd.c +++ b/hw/usb-msd.c @@ -261,13 +261,6 @@ static int usb_msd_handle_control(USBDevice *dev, int request, int value, } ret = 0; break; - case DeviceRequest | USB_REQ_GET_CONFIGURATION: - data[0] = 1; - ret = 1; - break; - case DeviceOutRequest | USB_REQ_SET_CONFIGURATION: - ret = 0; - break; case DeviceRequest | USB_REQ_GET_INTERFACE: data[0] = 0; ret = 1; @@ -502,7 +495,7 @@ static int usb_msd_initfn(USBDevice *dev) usb_desc_set_string(dev, STR_SERIALNUMBER, dinfo->serial); } - s->dev.speed = USB_SPEED_FULL; + usb_desc_init(dev); scsi_bus_new(&s->bus, &s->dev.qdev, 0, 1, usb_msd_command_complete); s->scsi_dev = scsi_bus_legacy_add_drive(&s->bus, bs, 0); if (!s->scsi_dev) { |