usb serial: use new descriptor infrastructure.
Switch the usb serial drivers (serial, braille) over to the new descriptor infrastructure. Note that this removes the freely configurable vendor and product id properties. I think the only reason this was configurable is that the only difference between the serial and the braille device is the vendor+product id. Of course the serial and braille devices keep their different IDs, but they can't be overritten from the command line any more. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
0e4e9695d5
commit
f29783f72e
192
hw/usb-serial.c
192
hw/usb-serial.c
|
@ -11,6 +11,7 @@
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
#include "qemu-error.h"
|
#include "qemu-error.h"
|
||||||
#include "usb.h"
|
#include "usb.h"
|
||||||
|
#include "usb-desc.h"
|
||||||
#include "qemu-char.h"
|
#include "qemu-char.h"
|
||||||
|
|
||||||
//#define DEBUG_Serial
|
//#define DEBUG_Serial
|
||||||
|
@ -91,8 +92,6 @@ do { printf("usb-serial: " fmt , ## __VA_ARGS__); } while (0)
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
USBDevice dev;
|
USBDevice dev;
|
||||||
uint32_t vendorid;
|
|
||||||
uint32_t productid;
|
|
||||||
uint8_t recv_buf[RECV_BUF];
|
uint8_t recv_buf[RECV_BUF];
|
||||||
uint16_t recv_ptr;
|
uint16_t recv_ptr;
|
||||||
uint16_t recv_used;
|
uint16_t recv_used;
|
||||||
|
@ -104,69 +103,78 @@ typedef struct {
|
||||||
CharDriverState *cs;
|
CharDriverState *cs;
|
||||||
} USBSerialState;
|
} USBSerialState;
|
||||||
|
|
||||||
static const uint8_t qemu_serial_dev_descriptor[] = {
|
enum {
|
||||||
0x12, /* u8 bLength; */
|
STR_MANUFACTURER = 1,
|
||||||
0x01, /* u8 bDescriptorType; Device */
|
STR_PRODUCT_SERIAL,
|
||||||
0x00, 0x02, /* u16 bcdUSB; v2.0 */
|
STR_PRODUCT_BRAILLE,
|
||||||
|
STR_SERIALNUMBER,
|
||||||
0x00, /* u8 bDeviceClass; */
|
|
||||||
0x00, /* u8 bDeviceSubClass; */
|
|
||||||
0x00, /* u8 bDeviceProtocol; [ low/full speeds only ] */
|
|
||||||
0x08, /* u8 bMaxPacketSize0; 8 Bytes */
|
|
||||||
|
|
||||||
/* Vendor and product id are arbitrary. */
|
|
||||||
0x03, 0x04, /* u16 idVendor; */
|
|
||||||
0x00, 0xFF, /* u16 idProduct; */
|
|
||||||
0x00, 0x04, /* u16 bcdDevice */
|
|
||||||
|
|
||||||
0x01, /* u8 iManufacturer; */
|
|
||||||
0x02, /* u8 iProduct; */
|
|
||||||
0x03, /* u8 iSerialNumber; */
|
|
||||||
0x01 /* u8 bNumConfigurations; */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static const uint8_t qemu_serial_config_descriptor[] = {
|
static const USBDescStrings desc_strings = {
|
||||||
|
[STR_MANUFACTURER] = "QEMU " QEMU_VERSION,
|
||||||
|
[STR_PRODUCT_SERIAL] = "QEMU USB SERIAL",
|
||||||
|
[STR_PRODUCT_BRAILLE] = "QEMU USB BRAILLE",
|
||||||
|
[STR_SERIALNUMBER] = "1",
|
||||||
|
};
|
||||||
|
|
||||||
/* one configuration */
|
static const USBDescIface desc_iface0 = {
|
||||||
0x09, /* u8 bLength; */
|
.bInterfaceNumber = 0,
|
||||||
0x02, /* u8 bDescriptorType; Configuration */
|
.bNumEndpoints = 2,
|
||||||
0x20, 0x00, /* u16 wTotalLength; */
|
.bInterfaceClass = 0xff,
|
||||||
0x01, /* u8 bNumInterfaces; (1) */
|
.bInterfaceSubClass = 0xff,
|
||||||
0x01, /* u8 bConfigurationValue; */
|
.bInterfaceProtocol = 0xff,
|
||||||
0x00, /* u8 iConfiguration; */
|
.eps = (USBDescEndpoint[]) {
|
||||||
0x80, /* u8 bmAttributes;
|
{
|
||||||
Bit 7: must be set,
|
.bEndpointAddress = USB_DIR_IN | 0x01,
|
||||||
6: Self-powered,
|
.bmAttributes = USB_ENDPOINT_XFER_BULK,
|
||||||
5: Remote wakeup,
|
.wMaxPacketSize = 64,
|
||||||
4..0: resvd */
|
},{
|
||||||
100/2, /* u8 MaxPower; */
|
.bEndpointAddress = USB_DIR_OUT | 0x02,
|
||||||
|
.bmAttributes = USB_ENDPOINT_XFER_BULK,
|
||||||
|
.wMaxPacketSize = 64,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
/* one interface */
|
static const USBDescDevice desc_device = {
|
||||||
0x09, /* u8 if_bLength; */
|
.bcdUSB = 0x0200,
|
||||||
0x04, /* u8 if_bDescriptorType; Interface */
|
.bMaxPacketSize0 = 8,
|
||||||
0x00, /* u8 if_bInterfaceNumber; */
|
.bNumConfigurations = 1,
|
||||||
0x00, /* u8 if_bAlternateSetting; */
|
.confs = (USBDescConfig[]) {
|
||||||
0x02, /* u8 if_bNumEndpoints; */
|
{
|
||||||
0xff, /* u8 if_bInterfaceClass; Vendor Specific */
|
.bNumInterfaces = 1,
|
||||||
0xff, /* u8 if_bInterfaceSubClass; Vendor Specific */
|
.bConfigurationValue = 1,
|
||||||
0xff, /* u8 if_bInterfaceProtocol; Vendor Specific */
|
.bmAttributes = 0x80,
|
||||||
0x02, /* u8 if_iInterface; */
|
.bMaxPower = 50,
|
||||||
|
.ifs = &desc_iface0,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
/* Bulk-In endpoint */
|
static const USBDesc desc_serial = {
|
||||||
0x07, /* u8 ep_bLength; */
|
.id = {
|
||||||
0x05, /* u8 ep_bDescriptorType; Endpoint */
|
.idVendor = 0x0403,
|
||||||
0x81, /* u8 ep_bEndpointAddress; IN Endpoint 1 */
|
.idProduct = 0x6001,
|
||||||
0x02, /* u8 ep_bmAttributes; Bulk */
|
.bcdDevice = 0x0400,
|
||||||
0x40, 0x00, /* u16 ep_wMaxPacketSize; */
|
.iManufacturer = STR_MANUFACTURER,
|
||||||
0x00, /* u8 ep_bInterval; */
|
.iProduct = STR_PRODUCT_SERIAL,
|
||||||
|
.iSerialNumber = STR_SERIALNUMBER,
|
||||||
|
},
|
||||||
|
.full = &desc_device,
|
||||||
|
.str = desc_strings,
|
||||||
|
};
|
||||||
|
|
||||||
/* Bulk-Out endpoint */
|
static const USBDesc desc_braille = {
|
||||||
0x07, /* u8 ep_bLength; */
|
.id = {
|
||||||
0x05, /* u8 ep_bDescriptorType; Endpoint */
|
.idVendor = 0x0403,
|
||||||
0x02, /* u8 ep_bEndpointAddress; OUT Endpoint 2 */
|
.idProduct = 0xfe72,
|
||||||
0x02, /* u8 ep_bmAttributes; Bulk */
|
.bcdDevice = 0x0400,
|
||||||
0x40, 0x00, /* u16 ep_wMaxPacketSize; */
|
.iManufacturer = STR_MANUFACTURER,
|
||||||
0x00 /* u8 ep_bInterval; */
|
.iProduct = STR_PRODUCT_BRAILLE,
|
||||||
|
.iSerialNumber = STR_SERIALNUMBER,
|
||||||
|
},
|
||||||
|
.full = &desc_device,
|
||||||
|
.str = desc_strings,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void usb_serial_reset(USBSerialState *s)
|
static void usb_serial_reset(USBSerialState *s)
|
||||||
|
@ -214,9 +222,15 @@ static int usb_serial_handle_control(USBDevice *dev, int request, int value,
|
||||||
int index, int length, uint8_t *data)
|
int index, int length, uint8_t *data)
|
||||||
{
|
{
|
||||||
USBSerialState *s = (USBSerialState *)dev;
|
USBSerialState *s = (USBSerialState *)dev;
|
||||||
int ret = 0;
|
int ret;
|
||||||
|
|
||||||
//DPRINTF("got control %x, value %x\n",request, value);
|
DPRINTF("got control %x, value %x\n",request, value);
|
||||||
|
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] = (0 << USB_DEVICE_SELF_POWERED) |
|
data[0] = (0 << USB_DEVICE_SELF_POWERED) |
|
||||||
|
@ -244,52 +258,6 @@ static int usb_serial_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_serial_dev_descriptor,
|
|
||||||
sizeof(qemu_serial_dev_descriptor));
|
|
||||||
data[8] = s->vendorid & 0xff;
|
|
||||||
data[9] = ((s->vendorid) >> 8) & 0xff;
|
|
||||||
data[10] = s->productid & 0xff;
|
|
||||||
data[11] = ((s->productid) >> 8) & 0xff;
|
|
||||||
ret = sizeof(qemu_serial_dev_descriptor);
|
|
||||||
break;
|
|
||||||
case USB_DT_CONFIG:
|
|
||||||
memcpy(data, qemu_serial_config_descriptor,
|
|
||||||
sizeof(qemu_serial_config_descriptor));
|
|
||||||
ret = sizeof(qemu_serial_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:
|
|
||||||
/* vendor description */
|
|
||||||
ret = set_usb_string(data, "QEMU " QEMU_VERSION);
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
/* product description */
|
|
||||||
ret = set_usb_string(data, "QEMU USB SERIAL");
|
|
||||||
break;
|
|
||||||
case 3:
|
|
||||||
/* serial number */
|
|
||||||
ret = set_usb_string(data, "1");
|
|
||||||
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;
|
||||||
|
@ -633,6 +601,7 @@ static struct USBDeviceInfo serial_info = {
|
||||||
.product_desc = "QEMU USB Serial",
|
.product_desc = "QEMU USB Serial",
|
||||||
.qdev.name = "usb-serial",
|
.qdev.name = "usb-serial",
|
||||||
.qdev.size = sizeof(USBSerialState),
|
.qdev.size = sizeof(USBSerialState),
|
||||||
|
.usb_desc = &desc_serial,
|
||||||
.init = usb_serial_initfn,
|
.init = usb_serial_initfn,
|
||||||
.handle_packet = usb_generic_handle_packet,
|
.handle_packet = usb_generic_handle_packet,
|
||||||
.handle_reset = usb_serial_handle_reset,
|
.handle_reset = usb_serial_handle_reset,
|
||||||
|
@ -642,9 +611,7 @@ static struct USBDeviceInfo serial_info = {
|
||||||
.usbdevice_name = "serial",
|
.usbdevice_name = "serial",
|
||||||
.usbdevice_init = usb_serial_init,
|
.usbdevice_init = usb_serial_init,
|
||||||
.qdev.props = (Property[]) {
|
.qdev.props = (Property[]) {
|
||||||
DEFINE_PROP_CHR("chardev", USBSerialState, cs),
|
DEFINE_PROP_CHR("chardev", USBSerialState, cs),
|
||||||
DEFINE_PROP_HEX32("vendorid", USBSerialState, vendorid, 0x0403),
|
|
||||||
DEFINE_PROP_HEX32("productid", USBSerialState, productid, 0x6001),
|
|
||||||
DEFINE_PROP_END_OF_LIST(),
|
DEFINE_PROP_END_OF_LIST(),
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
@ -653,6 +620,7 @@ static struct USBDeviceInfo braille_info = {
|
||||||
.product_desc = "QEMU USB Braille",
|
.product_desc = "QEMU USB Braille",
|
||||||
.qdev.name = "usb-braille",
|
.qdev.name = "usb-braille",
|
||||||
.qdev.size = sizeof(USBSerialState),
|
.qdev.size = sizeof(USBSerialState),
|
||||||
|
.usb_desc = &desc_braille,
|
||||||
.init = usb_serial_initfn,
|
.init = usb_serial_initfn,
|
||||||
.handle_packet = usb_generic_handle_packet,
|
.handle_packet = usb_generic_handle_packet,
|
||||||
.handle_reset = usb_serial_handle_reset,
|
.handle_reset = usb_serial_handle_reset,
|
||||||
|
@ -662,9 +630,7 @@ static struct USBDeviceInfo braille_info = {
|
||||||
.usbdevice_name = "braille",
|
.usbdevice_name = "braille",
|
||||||
.usbdevice_init = usb_braille_init,
|
.usbdevice_init = usb_braille_init,
|
||||||
.qdev.props = (Property[]) {
|
.qdev.props = (Property[]) {
|
||||||
DEFINE_PROP_CHR("chardev", USBSerialState, cs),
|
DEFINE_PROP_CHR("chardev", USBSerialState, cs),
|
||||||
DEFINE_PROP_HEX32("vendorid", USBSerialState, vendorid, 0x0403),
|
|
||||||
DEFINE_PROP_HEX32("productid", USBSerialState, productid, 0xfe72),
|
|
||||||
DEFINE_PROP_END_OF_LIST(),
|
DEFINE_PROP_END_OF_LIST(),
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue