mirror of
https://github.com/qemu/qemu.git
synced 2024-11-25 20:03:37 +08:00
usb wacom: use new descriptor infrastructure.
Switch the usb wavom driver over to the new descriptor infrastructure. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann
parent
81bfd2f246
commit
037a5203de
178
hw/usb-wacom.c
178
hw/usb-wacom.c
@ -28,6 +28,7 @@
|
|||||||
#include "hw.h"
|
#include "hw.h"
|
||||||
#include "console.h"
|
#include "console.h"
|
||||||
#include "usb.h"
|
#include "usb.h"
|
||||||
|
#include "usb-desc.h"
|
||||||
|
|
||||||
/* Interface requests */
|
/* Interface requests */
|
||||||
#define WACOM_GET_REPORT 0x2101
|
#define WACOM_GET_REPORT 0x2101
|
||||||
@ -54,68 +55,75 @@ typedef struct USBWacomState {
|
|||||||
int changed;
|
int changed;
|
||||||
} USBWacomState;
|
} USBWacomState;
|
||||||
|
|
||||||
static const uint8_t qemu_wacom_dev_descriptor[] = {
|
enum {
|
||||||
0x12, /* u8 bLength; */
|
STR_MANUFACTURER = 1,
|
||||||
0x01, /* u8 bDescriptorType; Device */
|
STR_PRODUCT,
|
||||||
0x10, 0x10, /* u16 bcdUSB; v1.10 */
|
STR_SERIALNUMBER,
|
||||||
|
|
||||||
0x00, /* u8 bDeviceClass; */
|
|
||||||
0x00, /* u8 bDeviceSubClass; */
|
|
||||||
0x00, /* u8 bDeviceProtocol; [ low/full speeds only ] */
|
|
||||||
0x08, /* u8 bMaxPacketSize0; 8 Bytes */
|
|
||||||
|
|
||||||
0x6a, 0x05, /* u16 idVendor; */
|
|
||||||
0x00, 0x00, /* u16 idProduct; */
|
|
||||||
0x10, 0x42, /* u16 bcdDevice */
|
|
||||||
|
|
||||||
0x01, /* u8 iManufacturer; */
|
|
||||||
0x02, /* u8 iProduct; */
|
|
||||||
0x00, /* u8 iSerialNumber; */
|
|
||||||
0x01, /* u8 bNumConfigurations; */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static const uint8_t qemu_wacom_config_descriptor[] = {
|
static const USBDescStrings desc_strings = {
|
||||||
/* one configuration */
|
[STR_MANUFACTURER] = "QEMU " QEMU_VERSION,
|
||||||
0x09, /* u8 bLength; */
|
[STR_PRODUCT] = "Wacom PenPartner",
|
||||||
0x02, /* u8 bDescriptorType; Configuration */
|
[STR_SERIALNUMBER] = "1",
|
||||||
0x22, 0x00, /* u16 wTotalLength; */
|
};
|
||||||
0x01, /* u8 bNumInterfaces; (1) */
|
|
||||||
0x01, /* u8 bConfigurationValue; */
|
|
||||||
0x00, /* u8 iConfiguration; */
|
|
||||||
0x80, /* u8 bmAttributes;
|
|
||||||
Bit 7: must be set,
|
|
||||||
6: Self-powered,
|
|
||||||
5: Remote wakeup,
|
|
||||||
4..0: resvd */
|
|
||||||
40, /* u8 MaxPower; */
|
|
||||||
|
|
||||||
/* one interface */
|
static const USBDescIface desc_iface_wacom = {
|
||||||
0x09, /* u8 if_bLength; */
|
.bInterfaceNumber = 0,
|
||||||
0x04, /* u8 if_bDescriptorType; Interface */
|
.bNumEndpoints = 1,
|
||||||
0x00, /* u8 if_bInterfaceNumber; */
|
.bInterfaceClass = USB_CLASS_HID,
|
||||||
0x00, /* u8 if_bAlternateSetting; */
|
.bInterfaceSubClass = 0x01, /* boot */
|
||||||
0x01, /* u8 if_bNumEndpoints; */
|
.bInterfaceProtocol = 0x02,
|
||||||
0x03, /* u8 if_bInterfaceClass; HID */
|
.ndesc = 1,
|
||||||
0x01, /* u8 if_bInterfaceSubClass; Boot */
|
.descs = (USBDescOther[]) {
|
||||||
0x02, /* u8 if_bInterfaceProtocol; [usb1.1 or single tt] */
|
{
|
||||||
0x00, /* u8 if_iInterface; */
|
/* HID descriptor */
|
||||||
|
.data = (uint8_t[]) {
|
||||||
|
0x09, /* u8 bLength */
|
||||||
|
0x21, /* u8 bDescriptorType */
|
||||||
|
0x01, 0x10, /* u16 HID_class */
|
||||||
|
0x00, /* u8 country_code */
|
||||||
|
0x01, /* u8 num_descriptors */
|
||||||
|
0x22, /* u8 type: Report */
|
||||||
|
0x6e, 0, /* u16 len */
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
.eps = (USBDescEndpoint[]) {
|
||||||
|
{
|
||||||
|
.bEndpointAddress = USB_DIR_IN | 0x01,
|
||||||
|
.bmAttributes = USB_ENDPOINT_XFER_INT,
|
||||||
|
.wMaxPacketSize = 8,
|
||||||
|
.bInterval = 0x0a,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
/* HID descriptor */
|
static const USBDescDevice desc_device_wacom = {
|
||||||
0x09, /* u8 bLength; */
|
.bcdUSB = 0x0110,
|
||||||
0x21, /* u8 bDescriptorType; */
|
.bMaxPacketSize0 = 8,
|
||||||
0x01, 0x10, /* u16 HID_class */
|
.bNumConfigurations = 1,
|
||||||
0x00, /* u8 country_code */
|
.confs = (USBDescConfig[]) {
|
||||||
0x01, /* u8 num_descriptors */
|
{
|
||||||
0x22, /* u8 type; Report */
|
.bNumInterfaces = 1,
|
||||||
0x6e, 0x00, /* u16 len */
|
.bConfigurationValue = 1,
|
||||||
|
.bmAttributes = 0x80,
|
||||||
|
.bMaxPower = 40,
|
||||||
|
.ifs = &desc_iface_wacom,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
/* one endpoint (status change endpoint) */
|
static const USBDesc desc_wacom = {
|
||||||
0x07, /* u8 ep_bLength; */
|
.id = {
|
||||||
0x05, /* u8 ep_bDescriptorType; Endpoint */
|
.idVendor = 0x056a,
|
||||||
0x81, /* u8 ep_bEndpointAddress; IN Endpoint 1 */
|
.idProduct = 0x0000,
|
||||||
0x03, /* u8 ep_bmAttributes; Interrupt */
|
.bcdDevice = 0x4210,
|
||||||
0x08, 0x00, /* u16 ep_wMaxPacketSize; */
|
.iManufacturer = STR_MANUFACTURER,
|
||||||
0x0a, /* u8 ep_bInterval; */
|
.iProduct = STR_PRODUCT,
|
||||||
|
.iSerialNumber = STR_SERIALNUMBER,
|
||||||
|
},
|
||||||
|
.full = &desc_device_wacom,
|
||||||
|
.str = desc_strings,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void usb_mouse_event(void *opaque,
|
static void usb_mouse_event(void *opaque,
|
||||||
@ -245,8 +253,14 @@ static int usb_wacom_handle_control(USBDevice *dev, int request, int value,
|
|||||||
int index, int length, uint8_t *data)
|
int index, int length, uint8_t *data)
|
||||||
{
|
{
|
||||||
USBWacomState *s = (USBWacomState *) dev;
|
USBWacomState *s = (USBWacomState *) dev;
|
||||||
int ret = 0;
|
int ret;
|
||||||
|
|
||||||
|
ret = usb_desc_handle_control(dev, request, value, index, length, data);
|
||||||
|
if (ret >= 0) {
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = 0;
|
||||||
switch (request) {
|
switch (request) {
|
||||||
case DeviceRequest | USB_REQ_GET_STATUS:
|
case DeviceRequest | USB_REQ_GET_STATUS:
|
||||||
data[0] = (1 << USB_DEVICE_SELF_POWERED) |
|
data[0] = (1 << USB_DEVICE_SELF_POWERED) |
|
||||||
@ -274,53 +288,6 @@ static int usb_wacom_handle_control(USBDevice *dev, int request, int value,
|
|||||||
dev->addr = value;
|
dev->addr = value;
|
||||||
ret = 0;
|
ret = 0;
|
||||||
break;
|
break;
|
||||||
case DeviceRequest | USB_REQ_GET_DESCRIPTOR:
|
|
||||||
switch (value >> 8) {
|
|
||||||
case USB_DT_DEVICE:
|
|
||||||
memcpy(data, qemu_wacom_dev_descriptor,
|
|
||||||
sizeof(qemu_wacom_dev_descriptor));
|
|
||||||
ret = sizeof(qemu_wacom_dev_descriptor);
|
|
||||||
break;
|
|
||||||
case USB_DT_CONFIG:
|
|
||||||
memcpy(data, qemu_wacom_config_descriptor,
|
|
||||||
sizeof(qemu_wacom_config_descriptor));
|
|
||||||
ret = sizeof(qemu_wacom_config_descriptor);
|
|
||||||
break;
|
|
||||||
case USB_DT_STRING:
|
|
||||||
switch (value & 0xff) {
|
|
||||||
case 0:
|
|
||||||
/* language ids */
|
|
||||||
data[0] = 4;
|
|
||||||
data[1] = 3;
|
|
||||||
data[2] = 0x09;
|
|
||||||
data[3] = 0x04;
|
|
||||||
ret = 4;
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
/* serial number */
|
|
||||||
ret = set_usb_string(data, "1");
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
ret = set_usb_string(data, "Wacom PenPartner");
|
|
||||||
break;
|
|
||||||
case 3:
|
|
||||||
/* vendor description */
|
|
||||||
ret = set_usb_string(data, "QEMU " QEMU_VERSION);
|
|
||||||
break;
|
|
||||||
case 4:
|
|
||||||
ret = set_usb_string(data, "Wacom Tablet");
|
|
||||||
break;
|
|
||||||
case 5:
|
|
||||||
ret = set_usb_string(data, "Endpoint1 Interrupt Pipe");
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case DeviceRequest | USB_REQ_GET_CONFIGURATION:
|
case DeviceRequest | USB_REQ_GET_CONFIGURATION:
|
||||||
data[0] = 1;
|
data[0] = 1;
|
||||||
ret = 1;
|
ret = 1;
|
||||||
@ -420,6 +387,7 @@ static struct USBDeviceInfo wacom_info = {
|
|||||||
.qdev.name = "usb-wacom-tablet",
|
.qdev.name = "usb-wacom-tablet",
|
||||||
.qdev.desc = "QEMU PenPartner Tablet",
|
.qdev.desc = "QEMU PenPartner Tablet",
|
||||||
.usbdevice_name = "wacom-tablet",
|
.usbdevice_name = "wacom-tablet",
|
||||||
|
.usb_desc = &desc_wacom,
|
||||||
.qdev.size = sizeof(USBWacomState),
|
.qdev.size = sizeof(USBWacomState),
|
||||||
.init = usb_wacom_initfn,
|
.init = usb_wacom_initfn,
|
||||||
.handle_packet = usb_generic_handle_packet,
|
.handle_packet = usb_generic_handle_packet,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user