From ed5a83ddd8c1d8ec7b1015315530cf29949e7c48 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 30 Nov 2010 17:35:34 +0100 Subject: [PATCH] usb: move remote wakeup handling to common code This patch moves setting and clearing the remote_wakeup feature bit (via USB_REQ_{SET,CLEAR}_FEATURE) to common code. Also USB_REQ_GET_STATUS handling is moved to common code. Signed-off-by: Gerd Hoffmann --- hw/usb-bt.c | 21 +++------------------ hw/usb-desc.c | 26 ++++++++++++++++++++++++++ hw/usb-hid.c | 22 ---------------------- hw/usb-hub.c | 22 ---------------------- hw/usb-msd.c | 23 ----------------------- hw/usb-net.c | 25 ------------------------- hw/usb-serial.c | 22 ---------------------- hw/usb-wacom.c | 23 ----------------------- trace-events | 2 ++ 9 files changed, 31 insertions(+), 155 deletions(-) diff --git a/hw/usb-bt.c b/hw/usb-bt.c index 36c90a35cf..22e6845049 100644 --- a/hw/usb-bt.c +++ b/hw/usb-bt.c @@ -396,33 +396,18 @@ static int usb_bt_handle_control(USBDevice *dev, int request, int value, ret = 0; switch (request) { - case DeviceRequest | USB_REQ_GET_STATUS: case InterfaceRequest | USB_REQ_GET_STATUS: case EndpointRequest | USB_REQ_GET_STATUS: - data[0] = (1 << USB_DEVICE_SELF_POWERED) | - (dev->remote_wakeup << USB_DEVICE_REMOTE_WAKEUP); + data[0] = 0x00; data[1] = 0x00; ret = 2; break; - case DeviceOutRequest | USB_REQ_CLEAR_FEATURE: case InterfaceOutRequest | USB_REQ_CLEAR_FEATURE: case EndpointOutRequest | USB_REQ_CLEAR_FEATURE: - if (value == USB_DEVICE_REMOTE_WAKEUP) { - dev->remote_wakeup = 0; - } else { - goto fail; - } - ret = 0; - break; - case DeviceOutRequest | USB_REQ_SET_FEATURE: + goto fail; case InterfaceOutRequest | USB_REQ_SET_FEATURE: case EndpointOutRequest | USB_REQ_SET_FEATURE: - if (value == USB_DEVICE_REMOTE_WAKEUP) { - dev->remote_wakeup = 1; - } else { - goto fail; - } - ret = 0; + goto fail; break; case InterfaceRequest | USB_REQ_GET_INTERFACE: if (value != 0 || (index & ~1) || length != 1) diff --git a/hw/usb-desc.c b/hw/usb-desc.c index 14c9e112ce..56ef734bde 100644 --- a/hw/usb-desc.c +++ b/hw/usb-desc.c @@ -299,6 +299,32 @@ int usb_desc_handle_control(USBDevice *dev, int request, int value, } trace_usb_set_config(dev->addr, value, ret); break; + + case DeviceRequest | USB_REQ_GET_STATUS: + data[0] = 0; + if (dev->config->bmAttributes & 0x40) { + data[0] |= 1 << USB_DEVICE_SELF_POWERED; + } + if (dev->remote_wakeup) { + data[0] |= 1 << USB_DEVICE_REMOTE_WAKEUP; + } + data[1] = 0x00; + ret = 2; + break; + case DeviceOutRequest | USB_REQ_CLEAR_FEATURE: + if (value == USB_DEVICE_REMOTE_WAKEUP) { + dev->remote_wakeup = 0; + ret = 0; + } + trace_usb_clear_device_feature(dev->addr, value, ret); + break; + case DeviceOutRequest | USB_REQ_SET_FEATURE: + if (value == USB_DEVICE_REMOTE_WAKEUP) { + dev->remote_wakeup = 1; + ret = 0; + } + trace_usb_set_device_feature(dev->addr, value, ret); + break; } return ret; } diff --git a/hw/usb-hid.c b/hw/usb-hid.c index 21c0c7224c..1c3596025f 100644 --- a/hw/usb-hid.c +++ b/hw/usb-hid.c @@ -673,28 +673,6 @@ static int usb_hid_handle_control(USBDevice *dev, int request, int value, ret = 0; switch(request) { - case DeviceRequest | USB_REQ_GET_STATUS: - data[0] = (1 << USB_DEVICE_SELF_POWERED) | - (dev->remote_wakeup << USB_DEVICE_REMOTE_WAKEUP); - data[1] = 0x00; - ret = 2; - break; - case DeviceOutRequest | USB_REQ_CLEAR_FEATURE: - if (value == USB_DEVICE_REMOTE_WAKEUP) { - dev->remote_wakeup = 0; - } else { - goto fail; - } - ret = 0; - break; - case DeviceOutRequest | USB_REQ_SET_FEATURE: - if (value == USB_DEVICE_REMOTE_WAKEUP) { - dev->remote_wakeup = 1; - } else { - goto fail; - } - ret = 0; - break; case DeviceRequest | USB_REQ_GET_INTERFACE: data[0] = 0; ret = 1; diff --git a/hw/usb-hub.c b/hw/usb-hub.c index fc0b94b20e..3c7c3eee43 100644 --- a/hw/usb-hub.c +++ b/hw/usb-hub.c @@ -269,34 +269,12 @@ static int usb_hub_handle_control(USBDevice *dev, int request, int value, } switch(request) { - case DeviceRequest | USB_REQ_GET_STATUS: - data[0] = (1 << USB_DEVICE_SELF_POWERED) | - (dev->remote_wakeup << USB_DEVICE_REMOTE_WAKEUP); - data[1] = 0x00; - ret = 2; - break; - case DeviceOutRequest | USB_REQ_CLEAR_FEATURE: - if (value == USB_DEVICE_REMOTE_WAKEUP) { - dev->remote_wakeup = 0; - } else { - goto fail; - } - ret = 0; - break; case EndpointOutRequest | USB_REQ_CLEAR_FEATURE: if (value == 0 && index != 0x81) { /* clear ep halt */ goto fail; } ret = 0; break; - case DeviceOutRequest | USB_REQ_SET_FEATURE: - if (value == USB_DEVICE_REMOTE_WAKEUP) { - dev->remote_wakeup = 1; - } else { - goto fail; - } - ret = 0; - break; case DeviceRequest | USB_REQ_GET_INTERFACE: data[0] = 0; ret = 1; diff --git a/hw/usb-msd.c b/hw/usb-msd.c index 56c6f3dcf2..74e657e7f9 100644 --- a/hw/usb-msd.c +++ b/hw/usb-msd.c @@ -239,28 +239,6 @@ static int usb_msd_handle_control(USBDevice *dev, int request, int value, ret = 0; switch (request) { - case DeviceRequest | USB_REQ_GET_STATUS: - data[0] = (1 << USB_DEVICE_SELF_POWERED) | - (dev->remote_wakeup << USB_DEVICE_REMOTE_WAKEUP); - data[1] = 0x00; - ret = 2; - break; - case DeviceOutRequest | USB_REQ_CLEAR_FEATURE: - if (value == USB_DEVICE_REMOTE_WAKEUP) { - dev->remote_wakeup = 0; - } else { - goto fail; - } - ret = 0; - break; - case DeviceOutRequest | USB_REQ_SET_FEATURE: - if (value == USB_DEVICE_REMOTE_WAKEUP) { - dev->remote_wakeup = 1; - } else { - goto fail; - } - ret = 0; - break; case DeviceRequest | USB_REQ_GET_INTERFACE: data[0] = 0; ret = 1; @@ -285,7 +263,6 @@ static int usb_msd_handle_control(USBDevice *dev, int request, int value, ret = 1; break; default: - fail: ret = USB_RET_STALL; break; } diff --git a/hw/usb-net.c b/hw/usb-net.c index f12304590b..bf51bb3890 100644 --- a/hw/usb-net.c +++ b/hw/usb-net.c @@ -1055,31 +1055,6 @@ static int usb_net_handle_control(USBDevice *dev, int request, int value, ret = 0; switch(request) { - case DeviceRequest | USB_REQ_GET_STATUS: - data[0] = (1 << USB_DEVICE_SELF_POWERED) | - (dev->remote_wakeup << USB_DEVICE_REMOTE_WAKEUP); - data[1] = 0x00; - ret = 2; - break; - - case DeviceOutRequest | USB_REQ_CLEAR_FEATURE: - if (value == USB_DEVICE_REMOTE_WAKEUP) { - dev->remote_wakeup = 0; - } else { - goto fail; - } - ret = 0; - break; - - case DeviceOutRequest | USB_REQ_SET_FEATURE: - if (value == USB_DEVICE_REMOTE_WAKEUP) { - dev->remote_wakeup = 1; - } else { - goto fail; - } - ret = 0; - break; - case ClassInterfaceOutRequest | USB_CDC_SEND_ENCAPSULATED_COMMAND: if (!is_rndis(s) || value || index != 0) { goto fail; diff --git a/hw/usb-serial.c b/hw/usb-serial.c index 2bdb10b8fe..6763d52040 100644 --- a/hw/usb-serial.c +++ b/hw/usb-serial.c @@ -232,28 +232,6 @@ static int usb_serial_handle_control(USBDevice *dev, int request, int value, ret = 0; switch (request) { - case DeviceRequest | USB_REQ_GET_STATUS: - data[0] = (0 << USB_DEVICE_SELF_POWERED) | - (dev->remote_wakeup << USB_DEVICE_REMOTE_WAKEUP); - data[1] = 0x00; - ret = 2; - break; - case DeviceOutRequest | USB_REQ_CLEAR_FEATURE: - if (value == USB_DEVICE_REMOTE_WAKEUP) { - dev->remote_wakeup = 0; - } else { - goto fail; - } - ret = 0; - break; - case DeviceOutRequest | USB_REQ_SET_FEATURE: - if (value == USB_DEVICE_REMOTE_WAKEUP) { - dev->remote_wakeup = 1; - } else { - goto fail; - } - ret = 0; - break; case DeviceRequest | USB_REQ_GET_INTERFACE: data[0] = 0; ret = 1; diff --git a/hw/usb-wacom.c b/hw/usb-wacom.c index 3a98e8066f..16be7a20cf 100644 --- a/hw/usb-wacom.c +++ b/hw/usb-wacom.c @@ -262,28 +262,6 @@ static int usb_wacom_handle_control(USBDevice *dev, int request, int value, ret = 0; switch (request) { - case DeviceRequest | USB_REQ_GET_STATUS: - data[0] = (1 << USB_DEVICE_SELF_POWERED) | - (dev->remote_wakeup << USB_DEVICE_REMOTE_WAKEUP); - data[1] = 0x00; - ret = 2; - break; - case DeviceOutRequest | USB_REQ_CLEAR_FEATURE: - if (value == USB_DEVICE_REMOTE_WAKEUP) { - dev->remote_wakeup = 0; - } else { - goto fail; - } - ret = 0; - break; - case DeviceOutRequest | USB_REQ_SET_FEATURE: - if (value == USB_DEVICE_REMOTE_WAKEUP) { - dev->remote_wakeup = 1; - } else { - goto fail; - } - ret = 0; - break; case DeviceRequest | USB_REQ_GET_INTERFACE: data[0] = 0; ret = 1; @@ -320,7 +298,6 @@ static int usb_wacom_handle_control(USBDevice *dev, int request, int value, ret = 0; break; default: - fail: ret = USB_RET_STALL; break; } diff --git a/trace-events b/trace-events index 9ef84747a0..45e75828dc 100644 --- a/trace-events +++ b/trace-events @@ -196,6 +196,8 @@ disable usb_desc_config(int addr, int index, int len, int ret) "dev %d query con disable usb_desc_string(int addr, int index, int len, int ret) "dev %d query string %d, len %d, ret %d" disable usb_set_addr(int addr) "dev %d" disable usb_set_config(int addr, int config, int ret) "dev %d, config %d, ret %d" +disable usb_clear_device_feature(int addr, int feature, int ret) "dev %d, feature %d, ret %d" +disable usb_set_device_feature(int addr, int feature, int ret) "dev %d, feature %d, ret %d" # vl.c disable vm_state_notify(int running, int reason) "running %d reason %d"