2005-11-05 17:57:08 +01:00
|
|
|
/*
|
|
|
|
* QEMU USB HID devices
|
2007-09-16 23:08:06 +02:00
|
|
|
*
|
2005-11-05 17:57:08 +01:00
|
|
|
* Copyright (c) 2005 Fabrice Bellard
|
2007-06-22 10:16:00 +02:00
|
|
|
* Copyright (c) 2007 OpenMoko, Inc. (andrew@openedhand.com)
|
2007-09-16 23:08:06 +02:00
|
|
|
*
|
2005-11-05 17:57:08 +01:00
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
2012-03-07 14:55:18 +01:00
|
|
|
#include "hw/hw.h"
|
2007-11-17 18:14:51 +01:00
|
|
|
#include "console.h"
|
2012-03-07 14:55:18 +01:00
|
|
|
#include "hw/usb.h"
|
|
|
|
#include "hw/usb/desc.h"
|
2011-03-27 16:31:31 +02:00
|
|
|
#include "qemu-timer.h"
|
2012-03-07 14:55:18 +01:00
|
|
|
#include "hw/hid.h"
|
2005-11-05 17:57:08 +01:00
|
|
|
|
|
|
|
/* HID interface requests */
|
|
|
|
#define GET_REPORT 0xa101
|
|
|
|
#define GET_IDLE 0xa102
|
|
|
|
#define GET_PROTOCOL 0xa103
|
2007-06-22 10:16:00 +02:00
|
|
|
#define SET_REPORT 0x2109
|
2005-11-05 17:57:08 +01:00
|
|
|
#define SET_IDLE 0x210a
|
|
|
|
#define SET_PROTOCOL 0x210b
|
|
|
|
|
2007-06-22 10:16:00 +02:00
|
|
|
/* HID descriptor types */
|
|
|
|
#define USB_DT_HID 0x21
|
|
|
|
#define USB_DT_REPORT 0x22
|
|
|
|
#define USB_DT_PHY 0x23
|
|
|
|
|
2011-07-15 13:12:44 +02:00
|
|
|
typedef struct USBHIDState {
|
|
|
|
USBDevice dev;
|
2012-01-17 13:25:46 +01:00
|
|
|
USBEndpoint *intr;
|
2011-07-15 13:12:44 +02:00
|
|
|
HIDState hid;
|
2007-06-22 10:16:00 +02:00
|
|
|
} USBHIDState;
|
|
|
|
|
2010-11-17 11:05:05 +01:00
|
|
|
enum {
|
|
|
|
STR_MANUFACTURER = 1,
|
|
|
|
STR_PRODUCT_MOUSE,
|
|
|
|
STR_PRODUCT_TABLET,
|
|
|
|
STR_PRODUCT_KEYBOARD,
|
|
|
|
STR_SERIALNUMBER,
|
|
|
|
STR_CONFIG_MOUSE,
|
|
|
|
STR_CONFIG_TABLET,
|
|
|
|
STR_CONFIG_KEYBOARD,
|
2005-11-05 17:57:08 +01:00
|
|
|
};
|
|
|
|
|
2010-11-17 11:05:05 +01:00
|
|
|
static const USBDescStrings desc_strings = {
|
2012-05-30 05:35:51 +02:00
|
|
|
[STR_MANUFACTURER] = "QEMU",
|
2010-11-17 11:05:05 +01:00
|
|
|
[STR_PRODUCT_MOUSE] = "QEMU USB Mouse",
|
|
|
|
[STR_PRODUCT_TABLET] = "QEMU USB Tablet",
|
|
|
|
[STR_PRODUCT_KEYBOARD] = "QEMU USB Keyboard",
|
2010-12-14 16:46:40 +01:00
|
|
|
[STR_SERIALNUMBER] = "42", /* == remote wakeup works */
|
2010-11-17 11:05:05 +01:00
|
|
|
[STR_CONFIG_MOUSE] = "HID Mouse",
|
|
|
|
[STR_CONFIG_TABLET] = "HID Tablet",
|
|
|
|
[STR_CONFIG_KEYBOARD] = "HID Keyboard",
|
2006-04-12 23:09:08 +02:00
|
|
|
};
|
|
|
|
|
2010-11-17 11:05:05 +01:00
|
|
|
static const USBDescIface desc_iface_mouse = {
|
|
|
|
.bInterfaceNumber = 0,
|
|
|
|
.bNumEndpoints = 1,
|
|
|
|
.bInterfaceClass = USB_CLASS_HID,
|
|
|
|
.bInterfaceSubClass = 0x01, /* boot */
|
|
|
|
.bInterfaceProtocol = 0x02,
|
|
|
|
.ndesc = 1,
|
|
|
|
.descs = (USBDescOther[]) {
|
|
|
|
{
|
|
|
|
/* HID descriptor */
|
|
|
|
.data = (uint8_t[]) {
|
|
|
|
0x09, /* u8 bLength */
|
|
|
|
USB_DT_HID, /* u8 bDescriptorType */
|
|
|
|
0x01, 0x00, /* u16 HID_class */
|
|
|
|
0x00, /* u8 country_code */
|
|
|
|
0x01, /* u8 num_descriptors */
|
|
|
|
USB_DT_REPORT, /* u8 type: Report */
|
|
|
|
52, 0, /* u16 len */
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
.eps = (USBDescEndpoint[]) {
|
|
|
|
{
|
|
|
|
.bEndpointAddress = USB_DIR_IN | 0x01,
|
|
|
|
.bmAttributes = USB_ENDPOINT_XFER_INT,
|
|
|
|
.wMaxPacketSize = 4,
|
|
|
|
.bInterval = 0x0a,
|
|
|
|
},
|
|
|
|
},
|
2005-11-05 17:57:08 +01:00
|
|
|
};
|
|
|
|
|
2010-11-17 11:05:05 +01:00
|
|
|
static const USBDescIface desc_iface_tablet = {
|
|
|
|
.bInterfaceNumber = 0,
|
|
|
|
.bNumEndpoints = 1,
|
|
|
|
.bInterfaceClass = USB_CLASS_HID,
|
|
|
|
.bInterfaceProtocol = 0x02,
|
|
|
|
.ndesc = 1,
|
|
|
|
.descs = (USBDescOther[]) {
|
|
|
|
{
|
|
|
|
/* HID descriptor */
|
|
|
|
.data = (uint8_t[]) {
|
|
|
|
0x09, /* u8 bLength */
|
|
|
|
USB_DT_HID, /* u8 bDescriptorType */
|
|
|
|
0x01, 0x00, /* u16 HID_class */
|
|
|
|
0x00, /* u8 country_code */
|
|
|
|
0x01, /* u8 num_descriptors */
|
|
|
|
USB_DT_REPORT, /* u8 type: Report */
|
|
|
|
74, 0, /* u16 len */
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
.eps = (USBDescEndpoint[]) {
|
|
|
|
{
|
|
|
|
.bEndpointAddress = USB_DIR_IN | 0x01,
|
|
|
|
.bmAttributes = USB_ENDPOINT_XFER_INT,
|
|
|
|
.wMaxPacketSize = 8,
|
|
|
|
.bInterval = 0x0a,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const USBDescIface desc_iface_keyboard = {
|
|
|
|
.bInterfaceNumber = 0,
|
|
|
|
.bNumEndpoints = 1,
|
|
|
|
.bInterfaceClass = USB_CLASS_HID,
|
|
|
|
.bInterfaceSubClass = 0x01, /* boot */
|
|
|
|
.bInterfaceProtocol = 0x01, /* keyboard */
|
|
|
|
.ndesc = 1,
|
|
|
|
.descs = (USBDescOther[]) {
|
|
|
|
{
|
|
|
|
/* HID descriptor */
|
|
|
|
.data = (uint8_t[]) {
|
|
|
|
0x09, /* u8 bLength */
|
|
|
|
USB_DT_HID, /* u8 bDescriptorType */
|
|
|
|
0x11, 0x01, /* u16 HID_class */
|
|
|
|
0x00, /* u8 country_code */
|
|
|
|
0x01, /* u8 num_descriptors */
|
|
|
|
USB_DT_REPORT, /* u8 type: Report */
|
|
|
|
0x3f, 0, /* u16 len */
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
.eps = (USBDescEndpoint[]) {
|
|
|
|
{
|
|
|
|
.bEndpointAddress = USB_DIR_IN | 0x01,
|
|
|
|
.bmAttributes = USB_ENDPOINT_XFER_INT,
|
|
|
|
.wMaxPacketSize = 8,
|
|
|
|
.bInterval = 0x0a,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const USBDescDevice desc_device_mouse = {
|
|
|
|
.bcdUSB = 0x0100,
|
|
|
|
.bMaxPacketSize0 = 8,
|
|
|
|
.bNumConfigurations = 1,
|
|
|
|
.confs = (USBDescConfig[]) {
|
|
|
|
{
|
|
|
|
.bNumInterfaces = 1,
|
|
|
|
.bConfigurationValue = 1,
|
|
|
|
.iConfiguration = STR_CONFIG_MOUSE,
|
|
|
|
.bmAttributes = 0xa0,
|
|
|
|
.bMaxPower = 50,
|
2011-04-03 07:33:19 +02:00
|
|
|
.nif = 1,
|
2010-11-17 11:05:05 +01:00
|
|
|
.ifs = &desc_iface_mouse,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const USBDescDevice desc_device_tablet = {
|
|
|
|
.bcdUSB = 0x0100,
|
|
|
|
.bMaxPacketSize0 = 8,
|
|
|
|
.bNumConfigurations = 1,
|
|
|
|
.confs = (USBDescConfig[]) {
|
|
|
|
{
|
|
|
|
.bNumInterfaces = 1,
|
|
|
|
.bConfigurationValue = 1,
|
|
|
|
.iConfiguration = STR_CONFIG_TABLET,
|
|
|
|
.bmAttributes = 0xa0,
|
|
|
|
.bMaxPower = 50,
|
2011-04-03 07:33:19 +02:00
|
|
|
.nif = 1,
|
2010-11-17 11:05:05 +01:00
|
|
|
.ifs = &desc_iface_tablet,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const USBDescDevice desc_device_keyboard = {
|
|
|
|
.bcdUSB = 0x0100,
|
|
|
|
.bMaxPacketSize0 = 8,
|
|
|
|
.bNumConfigurations = 1,
|
|
|
|
.confs = (USBDescConfig[]) {
|
|
|
|
{
|
|
|
|
.bNumInterfaces = 1,
|
|
|
|
.bConfigurationValue = 1,
|
|
|
|
.iConfiguration = STR_CONFIG_KEYBOARD,
|
|
|
|
.bmAttributes = 0xa0,
|
|
|
|
.bMaxPower = 50,
|
2011-04-03 07:33:19 +02:00
|
|
|
.nif = 1,
|
2010-11-17 11:05:05 +01:00
|
|
|
.ifs = &desc_iface_keyboard,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const USBDesc desc_mouse = {
|
|
|
|
.id = {
|
|
|
|
.idVendor = 0x0627,
|
|
|
|
.idProduct = 0x0001,
|
|
|
|
.bcdDevice = 0,
|
|
|
|
.iManufacturer = STR_MANUFACTURER,
|
|
|
|
.iProduct = STR_PRODUCT_MOUSE,
|
|
|
|
.iSerialNumber = STR_SERIALNUMBER,
|
|
|
|
},
|
|
|
|
.full = &desc_device_mouse,
|
|
|
|
.str = desc_strings,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const USBDesc desc_tablet = {
|
|
|
|
.id = {
|
|
|
|
.idVendor = 0x0627,
|
|
|
|
.idProduct = 0x0001,
|
|
|
|
.bcdDevice = 0,
|
|
|
|
.iManufacturer = STR_MANUFACTURER,
|
|
|
|
.iProduct = STR_PRODUCT_TABLET,
|
|
|
|
.iSerialNumber = STR_SERIALNUMBER,
|
|
|
|
},
|
|
|
|
.full = &desc_device_tablet,
|
|
|
|
.str = desc_strings,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const USBDesc desc_keyboard = {
|
|
|
|
.id = {
|
|
|
|
.idVendor = 0x0627,
|
|
|
|
.idProduct = 0x0001,
|
|
|
|
.bcdDevice = 0,
|
|
|
|
.iManufacturer = STR_MANUFACTURER,
|
|
|
|
.iProduct = STR_PRODUCT_KEYBOARD,
|
|
|
|
.iSerialNumber = STR_SERIALNUMBER,
|
|
|
|
},
|
|
|
|
.full = &desc_device_keyboard,
|
|
|
|
.str = desc_strings,
|
2007-06-22 10:16:00 +02:00
|
|
|
};
|
|
|
|
|
2005-11-05 17:57:08 +01:00
|
|
|
static const uint8_t qemu_mouse_hid_report_descriptor[] = {
|
2008-05-17 21:55:28 +02:00
|
|
|
0x05, 0x01, /* Usage Page (Generic Desktop) */
|
|
|
|
0x09, 0x02, /* Usage (Mouse) */
|
|
|
|
0xa1, 0x01, /* Collection (Application) */
|
|
|
|
0x09, 0x01, /* Usage (Pointer) */
|
|
|
|
0xa1, 0x00, /* Collection (Physical) */
|
|
|
|
0x05, 0x09, /* Usage Page (Button) */
|
|
|
|
0x19, 0x01, /* Usage Minimum (1) */
|
|
|
|
0x29, 0x03, /* Usage Maximum (3) */
|
|
|
|
0x15, 0x00, /* Logical Minimum (0) */
|
|
|
|
0x25, 0x01, /* Logical Maximum (1) */
|
|
|
|
0x95, 0x03, /* Report Count (3) */
|
|
|
|
0x75, 0x01, /* Report Size (1) */
|
|
|
|
0x81, 0x02, /* Input (Data, Variable, Absolute) */
|
|
|
|
0x95, 0x01, /* Report Count (1) */
|
|
|
|
0x75, 0x05, /* Report Size (5) */
|
|
|
|
0x81, 0x01, /* Input (Constant) */
|
|
|
|
0x05, 0x01, /* Usage Page (Generic Desktop) */
|
|
|
|
0x09, 0x30, /* Usage (X) */
|
|
|
|
0x09, 0x31, /* Usage (Y) */
|
|
|
|
0x09, 0x38, /* Usage (Wheel) */
|
|
|
|
0x15, 0x81, /* Logical Minimum (-0x7f) */
|
|
|
|
0x25, 0x7f, /* Logical Maximum (0x7f) */
|
|
|
|
0x75, 0x08, /* Report Size (8) */
|
|
|
|
0x95, 0x03, /* Report Count (3) */
|
|
|
|
0x81, 0x06, /* Input (Data, Variable, Relative) */
|
|
|
|
0xc0, /* End Collection */
|
|
|
|
0xc0, /* End Collection */
|
2005-11-05 17:57:08 +01:00
|
|
|
};
|
|
|
|
|
2006-04-12 23:09:08 +02:00
|
|
|
static const uint8_t qemu_tablet_hid_report_descriptor[] = {
|
2008-05-17 21:55:28 +02:00
|
|
|
0x05, 0x01, /* Usage Page (Generic Desktop) */
|
|
|
|
0x09, 0x01, /* Usage (Pointer) */
|
|
|
|
0xa1, 0x01, /* Collection (Application) */
|
|
|
|
0x09, 0x01, /* Usage (Pointer) */
|
|
|
|
0xa1, 0x00, /* Collection (Physical) */
|
|
|
|
0x05, 0x09, /* Usage Page (Button) */
|
|
|
|
0x19, 0x01, /* Usage Minimum (1) */
|
|
|
|
0x29, 0x03, /* Usage Maximum (3) */
|
|
|
|
0x15, 0x00, /* Logical Minimum (0) */
|
|
|
|
0x25, 0x01, /* Logical Maximum (1) */
|
|
|
|
0x95, 0x03, /* Report Count (3) */
|
|
|
|
0x75, 0x01, /* Report Size (1) */
|
|
|
|
0x81, 0x02, /* Input (Data, Variable, Absolute) */
|
|
|
|
0x95, 0x01, /* Report Count (1) */
|
|
|
|
0x75, 0x05, /* Report Size (5) */
|
|
|
|
0x81, 0x01, /* Input (Constant) */
|
|
|
|
0x05, 0x01, /* Usage Page (Generic Desktop) */
|
|
|
|
0x09, 0x30, /* Usage (X) */
|
|
|
|
0x09, 0x31, /* Usage (Y) */
|
|
|
|
0x15, 0x00, /* Logical Minimum (0) */
|
2008-09-16 00:26:35 +02:00
|
|
|
0x26, 0xff, 0x7f, /* Logical Maximum (0x7fff) */
|
2008-05-17 21:55:28 +02:00
|
|
|
0x35, 0x00, /* Physical Minimum (0) */
|
2008-09-16 00:26:35 +02:00
|
|
|
0x46, 0xff, 0x7f, /* Physical Maximum (0x7fff) */
|
2008-05-17 21:55:28 +02:00
|
|
|
0x75, 0x10, /* Report Size (16) */
|
|
|
|
0x95, 0x02, /* Report Count (2) */
|
|
|
|
0x81, 0x02, /* Input (Data, Variable, Absolute) */
|
|
|
|
0x05, 0x01, /* Usage Page (Generic Desktop) */
|
|
|
|
0x09, 0x38, /* Usage (Wheel) */
|
|
|
|
0x15, 0x81, /* Logical Minimum (-0x7f) */
|
|
|
|
0x25, 0x7f, /* Logical Maximum (0x7f) */
|
|
|
|
0x35, 0x00, /* Physical Minimum (same as logical) */
|
|
|
|
0x45, 0x00, /* Physical Maximum (same as logical) */
|
|
|
|
0x75, 0x08, /* Report Size (8) */
|
|
|
|
0x95, 0x01, /* Report Count (1) */
|
|
|
|
0x81, 0x06, /* Input (Data, Variable, Relative) */
|
|
|
|
0xc0, /* End Collection */
|
|
|
|
0xc0, /* End Collection */
|
2006-04-12 23:09:08 +02:00
|
|
|
};
|
|
|
|
|
2007-06-22 10:16:00 +02:00
|
|
|
static const uint8_t qemu_keyboard_hid_report_descriptor[] = {
|
|
|
|
0x05, 0x01, /* Usage Page (Generic Desktop) */
|
|
|
|
0x09, 0x06, /* Usage (Keyboard) */
|
|
|
|
0xa1, 0x01, /* Collection (Application) */
|
|
|
|
0x75, 0x01, /* Report Size (1) */
|
|
|
|
0x95, 0x08, /* Report Count (8) */
|
|
|
|
0x05, 0x07, /* Usage Page (Key Codes) */
|
|
|
|
0x19, 0xe0, /* Usage Minimum (224) */
|
|
|
|
0x29, 0xe7, /* Usage Maximum (231) */
|
|
|
|
0x15, 0x00, /* Logical Minimum (0) */
|
|
|
|
0x25, 0x01, /* Logical Maximum (1) */
|
|
|
|
0x81, 0x02, /* Input (Data, Variable, Absolute) */
|
|
|
|
0x95, 0x01, /* Report Count (1) */
|
|
|
|
0x75, 0x08, /* Report Size (8) */
|
|
|
|
0x81, 0x01, /* Input (Constant) */
|
|
|
|
0x95, 0x05, /* Report Count (5) */
|
|
|
|
0x75, 0x01, /* Report Size (1) */
|
|
|
|
0x05, 0x08, /* Usage Page (LEDs) */
|
|
|
|
0x19, 0x01, /* Usage Minimum (1) */
|
|
|
|
0x29, 0x05, /* Usage Maximum (5) */
|
|
|
|
0x91, 0x02, /* Output (Data, Variable, Absolute) */
|
|
|
|
0x95, 0x01, /* Report Count (1) */
|
|
|
|
0x75, 0x03, /* Report Size (3) */
|
|
|
|
0x91, 0x01, /* Output (Constant) */
|
|
|
|
0x95, 0x06, /* Report Count (6) */
|
|
|
|
0x75, 0x08, /* Report Size (8) */
|
|
|
|
0x15, 0x00, /* Logical Minimum (0) */
|
|
|
|
0x25, 0xff, /* Logical Maximum (255) */
|
|
|
|
0x05, 0x07, /* Usage Page (Key Codes) */
|
|
|
|
0x19, 0x00, /* Usage Minimum (0) */
|
|
|
|
0x29, 0xff, /* Usage Maximum (255) */
|
|
|
|
0x81, 0x00, /* Input (Data, Array) */
|
|
|
|
0xc0, /* End Collection */
|
|
|
|
};
|
|
|
|
|
2011-07-15 14:37:15 +02:00
|
|
|
static void usb_hid_changed(HIDState *hs)
|
2008-09-29 02:25:17 +02:00
|
|
|
{
|
2011-07-15 14:37:15 +02:00
|
|
|
USBHIDState *us = container_of(hs, USBHIDState, hid);
|
2008-09-29 02:25:17 +02:00
|
|
|
|
2012-01-17 13:25:46 +01:00
|
|
|
usb_wakeup(us->intr);
|
2008-09-29 02:25:17 +02:00
|
|
|
}
|
|
|
|
|
2011-07-15 14:37:15 +02:00
|
|
|
static void usb_hid_handle_reset(USBDevice *dev)
|
2007-06-22 10:16:00 +02:00
|
|
|
{
|
2011-07-15 13:12:44 +02:00
|
|
|
USBHIDState *us = DO_UPCAST(USBHIDState, dev, dev);
|
|
|
|
|
2011-07-15 15:08:01 +02:00
|
|
|
hid_reset(&us->hid);
|
2010-02-14 00:32:17 +01:00
|
|
|
}
|
|
|
|
|
usb: split packet result into actual_length + status
Since with the ehci and xhci controllers a single packet can be larger
then maxpacketsize, it is possible for the result of a single packet
to be both having transferred some data as well as the transfer to have
an error.
An example would be an input transfer from a bulk endpoint successfully
receiving 1 or more maxpacketsize packets from the device, followed
by a packet signalling halt.
While already touching all the devices and controllers handle_packet /
handle_data / handle_control code, also change the return type of
these functions to void, solely storing the status in the packet. To
make the code paths for regular versus async packet handling more
uniform.
This patch unfortunately is somewhat invasive, since makeing the qemu
usb core deal with this requires changes everywhere. This patch only
prepares the usb core for this, all the hcd / device changes are done
in such a way that there are no functional changes.
This patch has been tested with uhci and ehci hcds, together with usb-audio,
usb-hid and usb-storage devices, as well as with usb-redir redirection
with a wide variety of real devices.
Note that there is usually no need to directly set packet->actual_length
form devices handle_data callback, as that is done by usb_packet_copy()
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2012-11-01 17:15:01 +01:00
|
|
|
static void usb_hid_handle_control(USBDevice *dev, USBPacket *p,
|
2011-02-02 16:33:13 +01:00
|
|
|
int request, int value, int index, int length, uint8_t *data)
|
2005-11-05 17:57:08 +01:00
|
|
|
{
|
2011-07-15 13:12:44 +02:00
|
|
|
USBHIDState *us = DO_UPCAST(USBHIDState, dev, dev);
|
|
|
|
HIDState *hs = &us->hid;
|
2010-11-17 11:05:05 +01:00
|
|
|
int ret;
|
2005-11-05 17:57:08 +01:00
|
|
|
|
2011-02-02 16:33:13 +01:00
|
|
|
ret = usb_desc_handle_control(dev, p, request, value, index, length, data);
|
2010-11-17 11:05:05 +01:00
|
|
|
if (ret >= 0) {
|
usb: split packet result into actual_length + status
Since with the ehci and xhci controllers a single packet can be larger
then maxpacketsize, it is possible for the result of a single packet
to be both having transferred some data as well as the transfer to have
an error.
An example would be an input transfer from a bulk endpoint successfully
receiving 1 or more maxpacketsize packets from the device, followed
by a packet signalling halt.
While already touching all the devices and controllers handle_packet /
handle_data / handle_control code, also change the return type of
these functions to void, solely storing the status in the packet. To
make the code paths for regular versus async packet handling more
uniform.
This patch unfortunately is somewhat invasive, since makeing the qemu
usb core deal with this requires changes everywhere. This patch only
prepares the usb core for this, all the hcd / device changes are done
in such a way that there are no functional changes.
This patch has been tested with uhci and ehci hcds, together with usb-audio,
usb-hid and usb-storage devices, as well as with usb-redir redirection
with a wide variety of real devices.
Note that there is usually no need to directly set packet->actual_length
form devices handle_data callback, as that is done by usb_packet_copy()
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2012-11-01 17:15:01 +01:00
|
|
|
return;
|
2010-11-17 11:05:05 +01:00
|
|
|
}
|
2005-11-05 17:57:08 +01:00
|
|
|
|
2011-07-15 13:12:44 +02:00
|
|
|
switch (request) {
|
2005-11-05 17:57:08 +01:00
|
|
|
/* hid specific requests */
|
|
|
|
case InterfaceRequest | USB_REQ_GET_DESCRIPTOR:
|
2011-07-15 13:12:44 +02:00
|
|
|
switch (value >> 8) {
|
2005-11-05 17:57:08 +01:00
|
|
|
case 0x22:
|
2011-07-15 13:12:44 +02:00
|
|
|
if (hs->kind == HID_MOUSE) {
|
2007-09-16 23:08:06 +02:00
|
|
|
memcpy(data, qemu_mouse_hid_report_descriptor,
|
2006-04-12 23:09:08 +02:00
|
|
|
sizeof(qemu_mouse_hid_report_descriptor));
|
usb: split packet result into actual_length + status
Since with the ehci and xhci controllers a single packet can be larger
then maxpacketsize, it is possible for the result of a single packet
to be both having transferred some data as well as the transfer to have
an error.
An example would be an input transfer from a bulk endpoint successfully
receiving 1 or more maxpacketsize packets from the device, followed
by a packet signalling halt.
While already touching all the devices and controllers handle_packet /
handle_data / handle_control code, also change the return type of
these functions to void, solely storing the status in the packet. To
make the code paths for regular versus async packet handling more
uniform.
This patch unfortunately is somewhat invasive, since makeing the qemu
usb core deal with this requires changes everywhere. This patch only
prepares the usb core for this, all the hcd / device changes are done
in such a way that there are no functional changes.
This patch has been tested with uhci and ehci hcds, together with usb-audio,
usb-hid and usb-storage devices, as well as with usb-redir redirection
with a wide variety of real devices.
Note that there is usually no need to directly set packet->actual_length
form devices handle_data callback, as that is done by usb_packet_copy()
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2012-11-01 17:15:01 +01:00
|
|
|
p->actual_length = sizeof(qemu_mouse_hid_report_descriptor);
|
2011-07-15 13:12:44 +02:00
|
|
|
} else if (hs->kind == HID_TABLET) {
|
|
|
|
memcpy(data, qemu_tablet_hid_report_descriptor,
|
2006-04-12 23:09:08 +02:00
|
|
|
sizeof(qemu_tablet_hid_report_descriptor));
|
usb: split packet result into actual_length + status
Since with the ehci and xhci controllers a single packet can be larger
then maxpacketsize, it is possible for the result of a single packet
to be both having transferred some data as well as the transfer to have
an error.
An example would be an input transfer from a bulk endpoint successfully
receiving 1 or more maxpacketsize packets from the device, followed
by a packet signalling halt.
While already touching all the devices and controllers handle_packet /
handle_data / handle_control code, also change the return type of
these functions to void, solely storing the status in the packet. To
make the code paths for regular versus async packet handling more
uniform.
This patch unfortunately is somewhat invasive, since makeing the qemu
usb core deal with this requires changes everywhere. This patch only
prepares the usb core for this, all the hcd / device changes are done
in such a way that there are no functional changes.
This patch has been tested with uhci and ehci hcds, together with usb-audio,
usb-hid and usb-storage devices, as well as with usb-redir redirection
with a wide variety of real devices.
Note that there is usually no need to directly set packet->actual_length
form devices handle_data callback, as that is done by usb_packet_copy()
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2012-11-01 17:15:01 +01:00
|
|
|
p->actual_length = sizeof(qemu_tablet_hid_report_descriptor);
|
2011-07-15 13:12:44 +02:00
|
|
|
} else if (hs->kind == HID_KEYBOARD) {
|
2007-09-16 23:08:06 +02:00
|
|
|
memcpy(data, qemu_keyboard_hid_report_descriptor,
|
2007-06-22 10:16:00 +02:00
|
|
|
sizeof(qemu_keyboard_hid_report_descriptor));
|
usb: split packet result into actual_length + status
Since with the ehci and xhci controllers a single packet can be larger
then maxpacketsize, it is possible for the result of a single packet
to be both having transferred some data as well as the transfer to have
an error.
An example would be an input transfer from a bulk endpoint successfully
receiving 1 or more maxpacketsize packets from the device, followed
by a packet signalling halt.
While already touching all the devices and controllers handle_packet /
handle_data / handle_control code, also change the return type of
these functions to void, solely storing the status in the packet. To
make the code paths for regular versus async packet handling more
uniform.
This patch unfortunately is somewhat invasive, since makeing the qemu
usb core deal with this requires changes everywhere. This patch only
prepares the usb core for this, all the hcd / device changes are done
in such a way that there are no functional changes.
This patch has been tested with uhci and ehci hcds, together with usb-audio,
usb-hid and usb-storage devices, as well as with usb-redir redirection
with a wide variety of real devices.
Note that there is usually no need to directly set packet->actual_length
form devices handle_data callback, as that is done by usb_packet_copy()
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2012-11-01 17:15:01 +01:00
|
|
|
p->actual_length = sizeof(qemu_keyboard_hid_report_descriptor);
|
2007-06-22 10:16:00 +02:00
|
|
|
}
|
|
|
|
break;
|
2005-11-05 17:57:08 +01:00
|
|
|
default:
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case GET_REPORT:
|
2011-07-15 13:12:44 +02:00
|
|
|
if (hs->kind == HID_MOUSE || hs->kind == HID_TABLET) {
|
usb: split packet result into actual_length + status
Since with the ehci and xhci controllers a single packet can be larger
then maxpacketsize, it is possible for the result of a single packet
to be both having transferred some data as well as the transfer to have
an error.
An example would be an input transfer from a bulk endpoint successfully
receiving 1 or more maxpacketsize packets from the device, followed
by a packet signalling halt.
While already touching all the devices and controllers handle_packet /
handle_data / handle_control code, also change the return type of
these functions to void, solely storing the status in the packet. To
make the code paths for regular versus async packet handling more
uniform.
This patch unfortunately is somewhat invasive, since makeing the qemu
usb core deal with this requires changes everywhere. This patch only
prepares the usb core for this, all the hcd / device changes are done
in such a way that there are no functional changes.
This patch has been tested with uhci and ehci hcds, together with usb-audio,
usb-hid and usb-storage devices, as well as with usb-redir redirection
with a wide variety of real devices.
Note that there is usually no need to directly set packet->actual_length
form devices handle_data callback, as that is done by usb_packet_copy()
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2012-11-01 17:15:01 +01:00
|
|
|
p->actual_length = hid_pointer_poll(hs, data, length);
|
2011-07-15 13:12:44 +02:00
|
|
|
} else if (hs->kind == HID_KEYBOARD) {
|
usb: split packet result into actual_length + status
Since with the ehci and xhci controllers a single packet can be larger
then maxpacketsize, it is possible for the result of a single packet
to be both having transferred some data as well as the transfer to have
an error.
An example would be an input transfer from a bulk endpoint successfully
receiving 1 or more maxpacketsize packets from the device, followed
by a packet signalling halt.
While already touching all the devices and controllers handle_packet /
handle_data / handle_control code, also change the return type of
these functions to void, solely storing the status in the packet. To
make the code paths for regular versus async packet handling more
uniform.
This patch unfortunately is somewhat invasive, since makeing the qemu
usb core deal with this requires changes everywhere. This patch only
prepares the usb core for this, all the hcd / device changes are done
in such a way that there are no functional changes.
This patch has been tested with uhci and ehci hcds, together with usb-audio,
usb-hid and usb-storage devices, as well as with usb-redir redirection
with a wide variety of real devices.
Note that there is usually no need to directly set packet->actual_length
form devices handle_data callback, as that is done by usb_packet_copy()
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2012-11-01 17:15:01 +01:00
|
|
|
p->actual_length = hid_keyboard_poll(hs, data, length);
|
2011-07-08 13:19:01 +02:00
|
|
|
}
|
2007-06-22 10:16:00 +02:00
|
|
|
break;
|
|
|
|
case SET_REPORT:
|
2011-07-15 13:12:44 +02:00
|
|
|
if (hs->kind == HID_KEYBOARD) {
|
usb: split packet result into actual_length + status
Since with the ehci and xhci controllers a single packet can be larger
then maxpacketsize, it is possible for the result of a single packet
to be both having transferred some data as well as the transfer to have
an error.
An example would be an input transfer from a bulk endpoint successfully
receiving 1 or more maxpacketsize packets from the device, followed
by a packet signalling halt.
While already touching all the devices and controllers handle_packet /
handle_data / handle_control code, also change the return type of
these functions to void, solely storing the status in the packet. To
make the code paths for regular versus async packet handling more
uniform.
This patch unfortunately is somewhat invasive, since makeing the qemu
usb core deal with this requires changes everywhere. This patch only
prepares the usb core for this, all the hcd / device changes are done
in such a way that there are no functional changes.
This patch has been tested with uhci and ehci hcds, together with usb-audio,
usb-hid and usb-storage devices, as well as with usb-redir redirection
with a wide variety of real devices.
Note that there is usually no need to directly set packet->actual_length
form devices handle_data callback, as that is done by usb_packet_copy()
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2012-11-01 17:15:01 +01:00
|
|
|
p->actual_length = hid_keyboard_write(hs, data, length);
|
2011-07-15 13:12:44 +02:00
|
|
|
} else {
|
2007-06-22 10:16:00 +02:00
|
|
|
goto fail;
|
2011-07-15 13:12:44 +02:00
|
|
|
}
|
2007-06-22 10:16:00 +02:00
|
|
|
break;
|
|
|
|
case GET_PROTOCOL:
|
2011-07-15 13:12:44 +02:00
|
|
|
if (hs->kind != HID_KEYBOARD && hs->kind != HID_MOUSE) {
|
2007-06-22 10:16:00 +02:00
|
|
|
goto fail;
|
2011-07-15 13:12:44 +02:00
|
|
|
}
|
2011-07-15 15:52:33 +02:00
|
|
|
data[0] = hs->protocol;
|
usb: split packet result into actual_length + status
Since with the ehci and xhci controllers a single packet can be larger
then maxpacketsize, it is possible for the result of a single packet
to be both having transferred some data as well as the transfer to have
an error.
An example would be an input transfer from a bulk endpoint successfully
receiving 1 or more maxpacketsize packets from the device, followed
by a packet signalling halt.
While already touching all the devices and controllers handle_packet /
handle_data / handle_control code, also change the return type of
these functions to void, solely storing the status in the packet. To
make the code paths for regular versus async packet handling more
uniform.
This patch unfortunately is somewhat invasive, since makeing the qemu
usb core deal with this requires changes everywhere. This patch only
prepares the usb core for this, all the hcd / device changes are done
in such a way that there are no functional changes.
This patch has been tested with uhci and ehci hcds, together with usb-audio,
usb-hid and usb-storage devices, as well as with usb-redir redirection
with a wide variety of real devices.
Note that there is usually no need to directly set packet->actual_length
form devices handle_data callback, as that is done by usb_packet_copy()
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2012-11-01 17:15:01 +01:00
|
|
|
p->actual_length = 1;
|
2007-06-22 10:16:00 +02:00
|
|
|
break;
|
|
|
|
case SET_PROTOCOL:
|
2011-07-15 13:12:44 +02:00
|
|
|
if (hs->kind != HID_KEYBOARD && hs->kind != HID_MOUSE) {
|
2007-06-22 10:16:00 +02:00
|
|
|
goto fail;
|
2011-07-15 13:12:44 +02:00
|
|
|
}
|
2011-07-15 15:52:33 +02:00
|
|
|
hs->protocol = value;
|
2007-06-22 10:16:00 +02:00
|
|
|
break;
|
|
|
|
case GET_IDLE:
|
2011-07-15 15:52:33 +02:00
|
|
|
data[0] = hs->idle;
|
usb: split packet result into actual_length + status
Since with the ehci and xhci controllers a single packet can be larger
then maxpacketsize, it is possible for the result of a single packet
to be both having transferred some data as well as the transfer to have
an error.
An example would be an input transfer from a bulk endpoint successfully
receiving 1 or more maxpacketsize packets from the device, followed
by a packet signalling halt.
While already touching all the devices and controllers handle_packet /
handle_data / handle_control code, also change the return type of
these functions to void, solely storing the status in the packet. To
make the code paths for regular versus async packet handling more
uniform.
This patch unfortunately is somewhat invasive, since makeing the qemu
usb core deal with this requires changes everywhere. This patch only
prepares the usb core for this, all the hcd / device changes are done
in such a way that there are no functional changes.
This patch has been tested with uhci and ehci hcds, together with usb-audio,
usb-hid and usb-storage devices, as well as with usb-redir redirection
with a wide variety of real devices.
Note that there is usually no need to directly set packet->actual_length
form devices handle_data callback, as that is done by usb_packet_copy()
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2012-11-01 17:15:01 +01:00
|
|
|
p->actual_length = 1;
|
2005-11-05 17:57:08 +01:00
|
|
|
break;
|
|
|
|
case SET_IDLE:
|
2011-07-15 15:52:33 +02:00
|
|
|
hs->idle = (uint8_t) (value >> 8);
|
|
|
|
hid_set_next_idle(hs, qemu_get_clock_ns(vm_clock));
|
2011-08-09 12:35:57 +02:00
|
|
|
if (hs->kind == HID_MOUSE || hs->kind == HID_TABLET) {
|
|
|
|
hid_pointer_activate(hs);
|
|
|
|
}
|
2005-11-05 17:57:08 +01:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
fail:
|
usb: split packet result into actual_length + status
Since with the ehci and xhci controllers a single packet can be larger
then maxpacketsize, it is possible for the result of a single packet
to be both having transferred some data as well as the transfer to have
an error.
An example would be an input transfer from a bulk endpoint successfully
receiving 1 or more maxpacketsize packets from the device, followed
by a packet signalling halt.
While already touching all the devices and controllers handle_packet /
handle_data / handle_control code, also change the return type of
these functions to void, solely storing the status in the packet. To
make the code paths for regular versus async packet handling more
uniform.
This patch unfortunately is somewhat invasive, since makeing the qemu
usb core deal with this requires changes everywhere. This patch only
prepares the usb core for this, all the hcd / device changes are done
in such a way that there are no functional changes.
This patch has been tested with uhci and ehci hcds, together with usb-audio,
usb-hid and usb-storage devices, as well as with usb-redir redirection
with a wide variety of real devices.
Note that there is usually no need to directly set packet->actual_length
form devices handle_data callback, as that is done by usb_packet_copy()
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2012-11-01 17:15:01 +01:00
|
|
|
p->status = USB_RET_STALL;
|
2005-11-05 17:57:08 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
usb: split packet result into actual_length + status
Since with the ehci and xhci controllers a single packet can be larger
then maxpacketsize, it is possible for the result of a single packet
to be both having transferred some data as well as the transfer to have
an error.
An example would be an input transfer from a bulk endpoint successfully
receiving 1 or more maxpacketsize packets from the device, followed
by a packet signalling halt.
While already touching all the devices and controllers handle_packet /
handle_data / handle_control code, also change the return type of
these functions to void, solely storing the status in the packet. To
make the code paths for regular versus async packet handling more
uniform.
This patch unfortunately is somewhat invasive, since makeing the qemu
usb core deal with this requires changes everywhere. This patch only
prepares the usb core for this, all the hcd / device changes are done
in such a way that there are no functional changes.
This patch has been tested with uhci and ehci hcds, together with usb-audio,
usb-hid and usb-storage devices, as well as with usb-redir redirection
with a wide variety of real devices.
Note that there is usually no need to directly set packet->actual_length
form devices handle_data callback, as that is done by usb_packet_copy()
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2012-11-01 17:15:01 +01:00
|
|
|
static void usb_hid_handle_data(USBDevice *dev, USBPacket *p)
|
2005-11-05 17:57:08 +01:00
|
|
|
{
|
2011-07-15 13:12:44 +02:00
|
|
|
USBHIDState *us = DO_UPCAST(USBHIDState, dev, dev);
|
|
|
|
HIDState *hs = &us->hid;
|
2011-07-12 15:22:25 +02:00
|
|
|
uint8_t buf[p->iov.size];
|
usb: split packet result into actual_length + status
Since with the ehci and xhci controllers a single packet can be larger
then maxpacketsize, it is possible for the result of a single packet
to be both having transferred some data as well as the transfer to have
an error.
An example would be an input transfer from a bulk endpoint successfully
receiving 1 or more maxpacketsize packets from the device, followed
by a packet signalling halt.
While already touching all the devices and controllers handle_packet /
handle_data / handle_control code, also change the return type of
these functions to void, solely storing the status in the packet. To
make the code paths for regular versus async packet handling more
uniform.
This patch unfortunately is somewhat invasive, since makeing the qemu
usb core deal with this requires changes everywhere. This patch only
prepares the usb core for this, all the hcd / device changes are done
in such a way that there are no functional changes.
This patch has been tested with uhci and ehci hcds, together with usb-audio,
usb-hid and usb-storage devices, as well as with usb-redir redirection
with a wide variety of real devices.
Note that there is usually no need to directly set packet->actual_length
form devices handle_data callback, as that is done by usb_packet_copy()
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2012-11-01 17:15:01 +01:00
|
|
|
int len = 0;
|
2005-11-05 17:57:08 +01:00
|
|
|
|
2011-07-15 13:12:44 +02:00
|
|
|
switch (p->pid) {
|
2005-11-05 17:57:08 +01:00
|
|
|
case USB_TOKEN_IN:
|
2012-01-12 13:23:01 +01:00
|
|
|
if (p->ep->nr == 1) {
|
2011-03-11 16:47:48 +01:00
|
|
|
int64_t curtime = qemu_get_clock_ns(vm_clock);
|
2012-02-23 15:24:24 +01:00
|
|
|
if (hs->kind == HID_MOUSE || hs->kind == HID_TABLET) {
|
|
|
|
hid_pointer_activate(hs);
|
|
|
|
}
|
2011-07-15 14:46:39 +02:00
|
|
|
if (!hid_has_events(hs) &&
|
2011-07-15 15:52:33 +02:00
|
|
|
(!hs->idle || hs->next_idle_clock - curtime > 0)) {
|
usb: split packet result into actual_length + status
Since with the ehci and xhci controllers a single packet can be larger
then maxpacketsize, it is possible for the result of a single packet
to be both having transferred some data as well as the transfer to have
an error.
An example would be an input transfer from a bulk endpoint successfully
receiving 1 or more maxpacketsize packets from the device, followed
by a packet signalling halt.
While already touching all the devices and controllers handle_packet /
handle_data / handle_control code, also change the return type of
these functions to void, solely storing the status in the packet. To
make the code paths for regular versus async packet handling more
uniform.
This patch unfortunately is somewhat invasive, since makeing the qemu
usb core deal with this requires changes everywhere. This patch only
prepares the usb core for this, all the hcd / device changes are done
in such a way that there are no functional changes.
This patch has been tested with uhci and ehci hcds, together with usb-audio,
usb-hid and usb-storage devices, as well as with usb-redir redirection
with a wide variety of real devices.
Note that there is usually no need to directly set packet->actual_length
form devices handle_data callback, as that is done by usb_packet_copy()
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2012-11-01 17:15:01 +01:00
|
|
|
p->status = USB_RET_NAK;
|
|
|
|
return;
|
2011-01-12 13:19:20 +01:00
|
|
|
}
|
2011-07-15 15:52:33 +02:00
|
|
|
hid_set_next_idle(hs, curtime);
|
2011-07-15 13:12:44 +02:00
|
|
|
if (hs->kind == HID_MOUSE || hs->kind == HID_TABLET) {
|
usb: split packet result into actual_length + status
Since with the ehci and xhci controllers a single packet can be larger
then maxpacketsize, it is possible for the result of a single packet
to be both having transferred some data as well as the transfer to have
an error.
An example would be an input transfer from a bulk endpoint successfully
receiving 1 or more maxpacketsize packets from the device, followed
by a packet signalling halt.
While already touching all the devices and controllers handle_packet /
handle_data / handle_control code, also change the return type of
these functions to void, solely storing the status in the packet. To
make the code paths for regular versus async packet handling more
uniform.
This patch unfortunately is somewhat invasive, since makeing the qemu
usb core deal with this requires changes everywhere. This patch only
prepares the usb core for this, all the hcd / device changes are done
in such a way that there are no functional changes.
This patch has been tested with uhci and ehci hcds, together with usb-audio,
usb-hid and usb-storage devices, as well as with usb-redir redirection
with a wide variety of real devices.
Note that there is usually no need to directly set packet->actual_length
form devices handle_data callback, as that is done by usb_packet_copy()
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2012-11-01 17:15:01 +01:00
|
|
|
len = hid_pointer_poll(hs, buf, p->iov.size);
|
2011-07-15 13:12:44 +02:00
|
|
|
} else if (hs->kind == HID_KEYBOARD) {
|
usb: split packet result into actual_length + status
Since with the ehci and xhci controllers a single packet can be larger
then maxpacketsize, it is possible for the result of a single packet
to be both having transferred some data as well as the transfer to have
an error.
An example would be an input transfer from a bulk endpoint successfully
receiving 1 or more maxpacketsize packets from the device, followed
by a packet signalling halt.
While already touching all the devices and controllers handle_packet /
handle_data / handle_control code, also change the return type of
these functions to void, solely storing the status in the packet. To
make the code paths for regular versus async packet handling more
uniform.
This patch unfortunately is somewhat invasive, since makeing the qemu
usb core deal with this requires changes everywhere. This patch only
prepares the usb core for this, all the hcd / device changes are done
in such a way that there are no functional changes.
This patch has been tested with uhci and ehci hcds, together with usb-audio,
usb-hid and usb-storage devices, as well as with usb-redir redirection
with a wide variety of real devices.
Note that there is usually no need to directly set packet->actual_length
form devices handle_data callback, as that is done by usb_packet_copy()
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2012-11-01 17:15:01 +01:00
|
|
|
len = hid_keyboard_poll(hs, buf, p->iov.size);
|
2011-01-12 13:19:20 +01:00
|
|
|
}
|
usb: split packet result into actual_length + status
Since with the ehci and xhci controllers a single packet can be larger
then maxpacketsize, it is possible for the result of a single packet
to be both having transferred some data as well as the transfer to have
an error.
An example would be an input transfer from a bulk endpoint successfully
receiving 1 or more maxpacketsize packets from the device, followed
by a packet signalling halt.
While already touching all the devices and controllers handle_packet /
handle_data / handle_control code, also change the return type of
these functions to void, solely storing the status in the packet. To
make the code paths for regular versus async packet handling more
uniform.
This patch unfortunately is somewhat invasive, since makeing the qemu
usb core deal with this requires changes everywhere. This patch only
prepares the usb core for this, all the hcd / device changes are done
in such a way that there are no functional changes.
This patch has been tested with uhci and ehci hcds, together with usb-audio,
usb-hid and usb-storage devices, as well as with usb-redir redirection
with a wide variety of real devices.
Note that there is usually no need to directly set packet->actual_length
form devices handle_data callback, as that is done by usb_packet_copy()
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2012-11-01 17:15:01 +01:00
|
|
|
usb_packet_copy(p, buf, len);
|
2005-11-05 17:57:08 +01:00
|
|
|
} else {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case USB_TOKEN_OUT:
|
|
|
|
default:
|
|
|
|
fail:
|
usb: split packet result into actual_length + status
Since with the ehci and xhci controllers a single packet can be larger
then maxpacketsize, it is possible for the result of a single packet
to be both having transferred some data as well as the transfer to have
an error.
An example would be an input transfer from a bulk endpoint successfully
receiving 1 or more maxpacketsize packets from the device, followed
by a packet signalling halt.
While already touching all the devices and controllers handle_packet /
handle_data / handle_control code, also change the return type of
these functions to void, solely storing the status in the packet. To
make the code paths for regular versus async packet handling more
uniform.
This patch unfortunately is somewhat invasive, since makeing the qemu
usb core deal with this requires changes everywhere. This patch only
prepares the usb core for this, all the hcd / device changes are done
in such a way that there are no functional changes.
This patch has been tested with uhci and ehci hcds, together with usb-audio,
usb-hid and usb-storage devices, as well as with usb-redir redirection
with a wide variety of real devices.
Note that there is usually no need to directly set packet->actual_length
form devices handle_data callback, as that is done by usb_packet_copy()
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2012-11-01 17:15:01 +01:00
|
|
|
p->status = USB_RET_STALL;
|
2005-11-05 17:57:08 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-07-15 14:37:15 +02:00
|
|
|
static void usb_hid_handle_destroy(USBDevice *dev)
|
2006-04-12 23:09:08 +02:00
|
|
|
{
|
2011-07-15 13:12:44 +02:00
|
|
|
USBHIDState *us = DO_UPCAST(USBHIDState, dev, dev);
|
2010-11-26 20:20:41 +01:00
|
|
|
|
2011-07-15 14:37:15 +02:00
|
|
|
hid_free(&us->hid);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int usb_hid_initfn(USBDevice *dev, int kind)
|
|
|
|
{
|
|
|
|
USBHIDState *us = DO_UPCAST(USBHIDState, dev, dev);
|
|
|
|
|
|
|
|
usb_desc_init(dev);
|
2012-01-17 13:25:46 +01:00
|
|
|
us->intr = usb_ep_get(dev, USB_TOKEN_IN, 1);
|
2011-07-15 14:37:15 +02:00
|
|
|
hid_init(&us->hid, kind, usb_hid_changed);
|
2009-08-31 14:23:59 +02:00
|
|
|
return 0;
|
2006-04-12 23:09:08 +02:00
|
|
|
}
|
|
|
|
|
2009-08-31 14:23:59 +02:00
|
|
|
static int usb_tablet_initfn(USBDevice *dev)
|
2005-11-05 17:57:08 +01:00
|
|
|
{
|
2011-07-15 13:12:44 +02:00
|
|
|
return usb_hid_initfn(dev, HID_TABLET);
|
2009-08-31 14:23:59 +02:00
|
|
|
}
|
2005-11-05 17:57:08 +01:00
|
|
|
|
2009-08-31 14:23:59 +02:00
|
|
|
static int usb_mouse_initfn(USBDevice *dev)
|
|
|
|
{
|
2011-07-15 13:12:44 +02:00
|
|
|
return usb_hid_initfn(dev, HID_MOUSE);
|
2009-08-31 14:23:59 +02:00
|
|
|
}
|
2005-11-05 17:57:08 +01:00
|
|
|
|
2009-08-31 14:23:59 +02:00
|
|
|
static int usb_keyboard_initfn(USBDevice *dev)
|
|
|
|
{
|
2011-07-15 13:12:44 +02:00
|
|
|
return usb_hid_initfn(dev, HID_KEYBOARD);
|
2009-08-31 14:23:59 +02:00
|
|
|
}
|
2005-11-05 17:57:08 +01:00
|
|
|
|
2011-10-12 12:54:35 +02:00
|
|
|
static int usb_ptr_post_load(void *opaque, int version_id)
|
|
|
|
{
|
|
|
|
USBHIDState *s = opaque;
|
|
|
|
|
|
|
|
if (s->dev.remote_wakeup) {
|
|
|
|
hid_pointer_activate(&s->hid);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-12-10 14:40:30 +01:00
|
|
|
static const VMStateDescription vmstate_usb_ptr = {
|
|
|
|
.name = "usb-ptr",
|
|
|
|
.version_id = 1,
|
|
|
|
.minimum_version_id = 1,
|
2011-10-12 12:54:35 +02:00
|
|
|
.post_load = usb_ptr_post_load,
|
2010-12-10 14:40:30 +01:00
|
|
|
.fields = (VMStateField []) {
|
|
|
|
VMSTATE_USB_DEVICE(dev, USBHIDState),
|
2011-08-09 23:54:54 +02:00
|
|
|
VMSTATE_HID_POINTER_DEVICE(hid, USBHIDState),
|
2010-12-10 14:40:30 +01:00
|
|
|
VMSTATE_END_OF_LIST()
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
static const VMStateDescription vmstate_usb_kbd = {
|
|
|
|
.name = "usb-kbd",
|
|
|
|
.version_id = 1,
|
|
|
|
.minimum_version_id = 1,
|
|
|
|
.fields = (VMStateField []) {
|
|
|
|
VMSTATE_USB_DEVICE(dev, USBHIDState),
|
2011-08-09 23:54:54 +02:00
|
|
|
VMSTATE_HID_KEYBOARD_DEVICE(hid, USBHIDState),
|
2010-12-10 14:40:30 +01:00
|
|
|
VMSTATE_END_OF_LIST()
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2011-12-04 23:13:14 +01:00
|
|
|
static void usb_hid_class_initfn(ObjectClass *klass, void *data)
|
2011-12-15 21:53:10 +01:00
|
|
|
{
|
|
|
|
USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
|
|
|
|
|
|
|
|
uc->handle_reset = usb_hid_handle_reset;
|
|
|
|
uc->handle_control = usb_hid_handle_control;
|
|
|
|
uc->handle_data = usb_hid_handle_data;
|
|
|
|
uc->handle_destroy = usb_hid_handle_destroy;
|
|
|
|
}
|
|
|
|
|
2011-12-04 23:13:14 +01:00
|
|
|
static void usb_tablet_class_initfn(ObjectClass *klass, void *data)
|
|
|
|
{
|
2011-12-08 04:34:16 +01:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
2011-12-04 23:13:14 +01:00
|
|
|
USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
|
|
|
|
|
|
|
|
usb_hid_class_initfn(klass, data);
|
|
|
|
uc->init = usb_tablet_initfn;
|
|
|
|
uc->product_desc = "QEMU USB Tablet";
|
|
|
|
uc->usb_desc = &desc_tablet;
|
2011-12-08 04:34:16 +01:00
|
|
|
dc->vmsd = &vmstate_usb_ptr;
|
2011-12-04 23:13:14 +01:00
|
|
|
}
|
|
|
|
|
2011-12-08 04:34:16 +01:00
|
|
|
static TypeInfo usb_tablet_info = {
|
|
|
|
.name = "usb-tablet",
|
|
|
|
.parent = TYPE_USB_DEVICE,
|
|
|
|
.instance_size = sizeof(USBHIDState),
|
|
|
|
.class_init = usb_tablet_class_initfn,
|
2011-12-15 21:53:10 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
static void usb_mouse_class_initfn(ObjectClass *klass, void *data)
|
|
|
|
{
|
2011-12-08 04:34:16 +01:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
2011-12-15 21:53:10 +01:00
|
|
|
USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
|
|
|
|
|
2011-12-04 23:13:14 +01:00
|
|
|
usb_hid_class_initfn(klass, data);
|
2011-12-15 21:53:10 +01:00
|
|
|
uc->init = usb_mouse_initfn;
|
|
|
|
uc->product_desc = "QEMU USB Mouse";
|
|
|
|
uc->usb_desc = &desc_mouse;
|
2011-12-08 04:34:16 +01:00
|
|
|
dc->vmsd = &vmstate_usb_ptr;
|
2011-12-15 21:53:10 +01:00
|
|
|
}
|
|
|
|
|
2011-12-08 04:34:16 +01:00
|
|
|
static TypeInfo usb_mouse_info = {
|
|
|
|
.name = "usb-mouse",
|
|
|
|
.parent = TYPE_USB_DEVICE,
|
|
|
|
.instance_size = sizeof(USBHIDState),
|
|
|
|
.class_init = usb_mouse_class_initfn,
|
2011-12-15 21:53:10 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
static void usb_keyboard_class_initfn(ObjectClass *klass, void *data)
|
|
|
|
{
|
2011-12-08 04:34:16 +01:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
2011-12-15 21:53:10 +01:00
|
|
|
USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
|
|
|
|
|
2011-12-04 23:13:14 +01:00
|
|
|
usb_hid_class_initfn(klass, data);
|
2011-12-15 21:53:10 +01:00
|
|
|
uc->init = usb_keyboard_initfn;
|
|
|
|
uc->product_desc = "QEMU USB Keyboard";
|
|
|
|
uc->usb_desc = &desc_keyboard;
|
2011-12-08 04:34:16 +01:00
|
|
|
dc->vmsd = &vmstate_usb_kbd;
|
2011-12-15 21:53:10 +01:00
|
|
|
}
|
|
|
|
|
2011-12-08 04:34:16 +01:00
|
|
|
static TypeInfo usb_keyboard_info = {
|
|
|
|
.name = "usb-kbd",
|
|
|
|
.parent = TYPE_USB_DEVICE,
|
|
|
|
.instance_size = sizeof(USBHIDState),
|
|
|
|
.class_init = usb_keyboard_class_initfn,
|
2009-08-31 14:23:59 +02:00
|
|
|
};
|
|
|
|
|
2012-02-09 15:20:55 +01:00
|
|
|
static void usb_hid_register_types(void)
|
2009-08-31 14:23:59 +02:00
|
|
|
{
|
2011-12-08 04:34:16 +01:00
|
|
|
type_register_static(&usb_tablet_info);
|
2011-12-08 21:56:53 +01:00
|
|
|
usb_legacy_register("usb-tablet", "tablet", NULL);
|
2011-12-08 04:34:16 +01:00
|
|
|
type_register_static(&usb_mouse_info);
|
2011-12-08 21:56:53 +01:00
|
|
|
usb_legacy_register("usb-mouse", "mouse", NULL);
|
2011-12-08 04:34:16 +01:00
|
|
|
type_register_static(&usb_keyboard_info);
|
2011-12-08 21:56:53 +01:00
|
|
|
usb_legacy_register("usb-kbd", "keyboard", NULL);
|
2009-08-31 14:23:59 +02:00
|
|
|
}
|
2012-02-09 15:20:55 +01:00
|
|
|
|
|
|
|
type_init(usb_hid_register_types)
|