From a980a065fb5e86d6dec337e6cb6ff432f1a143c9 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 26 Nov 2010 20:20:41 +0100 Subject: 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 --- hw/usb-hub.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'hw/usb-hub.c') diff --git a/hw/usb-hub.c b/hw/usb-hub.c index 1d321acaeb..fc0b94b20e 100644 --- a/hw/usb-hub.c +++ b/hw/usb-hub.c @@ -297,13 +297,6 @@ static int usb_hub_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; @@ -541,7 +534,7 @@ static int usb_hub_initfn(USBDevice *dev) USBHubPort *port; int i; - s->dev.speed = USB_SPEED_FULL; + usb_desc_init(dev); for (i = 0; i < NUM_PORTS; i++) { port = &s->ports[i]; usb_register_port(usb_bus_from_device(dev), -- cgit v1.2.3