[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/12] usb descriptors: add settable strings.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 08/12] usb descriptors: add settable strings. |
Date: |
Mon, 29 Nov 2010 17:04:05 +0100 |
This patch allows to set usb descriptor strings per device instance.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb-bus.c | 1 +
hw/usb-desc.c | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
hw/usb-desc.h | 4 +++-
hw/usb.h | 9 +++++++++
4 files changed, 57 insertions(+), 9 deletions(-)
diff --git a/hw/usb-bus.c b/hw/usb-bus.c
index b692503..15a42ff 100644
--- a/hw/usb-bus.c
+++ b/hw/usb-bus.c
@@ -46,6 +46,7 @@ static int usb_qdev_init(DeviceState *qdev, DeviceInfo *base)
pstrcpy(dev->product_desc, sizeof(dev->product_desc), info->product_desc);
dev->info = info;
dev->auto_attach = 1;
+ QLIST_INIT(&dev->strings);
rc = dev->info->init(dev);
if (rc == 0 && dev->auto_attach)
usb_device_attach(dev);
diff --git a/hw/usb-desc.c b/hw/usb-desc.c
index 22f14bb..59af8e2 100644
--- a/hw/usb-desc.c
+++ b/hw/usb-desc.c
@@ -150,9 +150,42 @@ int usb_desc_other(const USBDescOther *desc, uint8_t
*dest, size_t len)
return bLength;
}
-int usb_desc_string(const char* const *str, int index, uint8_t *dest, size_t
len)
+/* ------------------------------------------------------------------ */
+
+void usb_desc_set_string(USBDevice *dev, uint8_t index, const char *str)
+{
+ USBDescString *s;
+
+ QLIST_FOREACH(s, &dev->strings, next) {
+ if (s->index == index) {
+ break;
+ }
+ }
+ if (s == NULL) {
+ s = qemu_mallocz(sizeof(*s));
+ s->index = index;
+ QLIST_INSERT_HEAD(&dev->strings, s, next);
+ }
+ qemu_free(s->str);
+ s->str = qemu_strdup(str);
+}
+
+const char *usb_desc_get_string(USBDevice *dev, uint8_t index)
+{
+ USBDescString *s;
+
+ QLIST_FOREACH(s, &dev->strings, next) {
+ if (s->index == index) {
+ return s->str;
+ }
+ }
+ return NULL;
+}
+
+int usb_desc_string(USBDevice *dev, int index, uint8_t *dest, size_t len)
{
uint8_t bLength, pos, i;
+ const char *str;
if (len < 4) {
return -1;
@@ -167,22 +200,25 @@ int usb_desc_string(const char* const *str, int index,
uint8_t *dest, size_t len
return 4;
}
- if (str[index] == NULL) {
- return 0;
+ str = usb_desc_get_string(dev, index);
+ if (str == NULL) {
+ str = dev->info->usb_desc->str[index];
+ if (str == NULL) {
+ return 0;
+ }
}
- bLength = strlen(str[index]) * 2 + 2;
+
+ bLength = strlen(str) * 2 + 2;
dest[0] = bLength;
dest[1] = USB_DT_STRING;
i = 0; pos = 2;
while (pos+1 < bLength && pos+1 < len) {
- dest[pos++] = str[index][i++];
+ dest[pos++] = str[i++];
dest[pos++] = 0;
}
return pos;
}
-/* ------------------------------------------------------------------ */
-
int usb_desc_get_descriptor(USBDevice *dev, int value, uint8_t *dest, size_t
len)
{
const USBDesc *desc = dev->info->usb_desc;
@@ -207,7 +243,7 @@ int usb_desc_get_descriptor(USBDevice *dev, int value,
uint8_t *dest, size_t len
case USB_DT_STRING:
fprintf(stderr, "%s: %d STRING %d (len %zd)\n", __FUNCTION__,
dev->addr, index, len);
- ret = usb_desc_string(desc->str, index, buf, sizeof(buf));
+ ret = usb_desc_string(dev, index, buf, sizeof(buf));
break;
default:
fprintf(stderr, "%s: %d unknown type %d (len %zd)\n", __FUNCTION__,
diff --git a/hw/usb-desc.h b/hw/usb-desc.h
index d80efdb..20fc400 100644
--- a/hw/usb-desc.h
+++ b/hw/usb-desc.h
@@ -76,9 +76,11 @@ int usb_desc_config(const USBDescConfig *conf, uint8_t
*dest, size_t len);
int usb_desc_iface(const USBDescIface *iface, uint8_t *dest, size_t len);
int usb_desc_endpoint(const USBDescEndpoint *ep, uint8_t *dest, size_t len);
int usb_desc_other(const USBDescOther *desc, uint8_t *dest, size_t len);
-int usb_desc_string(const char* const *str, int index, uint8_t *dest, size_t
len);
/* control message emulation helpers */
+void usb_desc_set_string(USBDevice *dev, uint8_t index, const char *str);
+const char *usb_desc_get_string(USBDevice *dev, uint8_t index);
+int usb_desc_string(USBDevice *dev, int index, uint8_t *dest, size_t len);
int usb_desc_get_descriptor(USBDevice *dev, int value, uint8_t *dest, size_t
len);
int usb_desc_handle_control(USBDevice *dev, int request, int value,
int index, int length, uint8_t *data);
diff --git a/hw/usb.h b/hw/usb.h
index 5430742..47c2957 100644
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -142,6 +142,13 @@ typedef struct USBDescConfig USBDescConfig;
typedef struct USBDescIface USBDescIface;
typedef struct USBDescEndpoint USBDescEndpoint;
typedef struct USBDescOther USBDescOther;
+typedef struct USBDescString USBDescString;
+
+struct USBDescString {
+ uint8_t index;
+ char *str;
+ QLIST_ENTRY(USBDescString) next;
+};
/* definition of a USB device */
struct USBDevice {
@@ -162,6 +169,8 @@ struct USBDevice {
int setup_state;
int setup_len;
int setup_index;
+
+ QLIST_HEAD(, USBDescString) strings;
};
struct USBDeviceInfo {
--
1.7.1
- [Qemu-devel] [PATCH 00/12] usb descriptor overhaul., Gerd Hoffmann, 2010/11/29
- [Qemu-devel] [PATCH 05/12] usb wacom: use new descriptor infrastructure., Gerd Hoffmann, 2010/11/29
- [Qemu-devel] [PATCH 03/12] usb serial: use new descriptor infrastructure., Gerd Hoffmann, 2010/11/29
- [Qemu-devel] [PATCH 01/12] usb: data structs and helpers for usb descriptors., Gerd Hoffmann, 2010/11/29
- [Qemu-devel] [PATCH 02/12] usb hid: use new descriptor infrastructure., Gerd Hoffmann, 2010/11/29
- [Qemu-devel] [PATCH 09/12] usb storage: serial number support, Gerd Hoffmann, 2010/11/29
- [Qemu-devel] [PATCH 11/12] usb: move USB_REQ_SET_ADDRESS handling to common code, Gerd Hoffmann, 2010/11/29
- [Qemu-devel] [PATCH 08/12] usb descriptors: add settable strings.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 07/12] usb hub: use new descriptor infrastructure., Gerd Hoffmann, 2010/11/29
- [Qemu-devel] [PATCH 04/12] usb storage: use new descriptor infrastructure., Gerd Hoffmann, 2010/11/29
- [Qemu-devel] [PATCH 06/12] usb bluetooth: use new descriptor infrastructure., Gerd Hoffmann, 2010/11/29
- [Qemu-devel] [PATCH 12/12] usb: move USB_REQ_{GET, SET}_CONFIGURATION handling to common code, Gerd Hoffmann, 2010/11/29
- [Qemu-devel] [PATCH 10/12] usb network: use new descriptor infrastructure., Gerd Hoffmann, 2010/11/29