Patchwork [4/6] usb: Allow overriding of usb_desc at the device level

login
register
mail settings
Submitter Gerd Hoffmann
Date Dec. 5, 2012, 10:11 a.m.
Message ID <1354702284-13518-5-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/203833/
State New
Headers show

Comments

Gerd Hoffmann - Dec. 5, 2012, 10:11 a.m.
From: Hans de Goede <hdegoede@redhat.com>

This allows devices to present a different set of descriptors based on
device properties.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/usb.h     |    1 +
 hw/usb/bus.c |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)

Patch

diff --git a/hw/usb.h b/hw/usb.h
index 58f812f..268e653 100644
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -230,6 +230,7 @@  struct USBDevice {
     USBEndpoint ep_out[USB_MAX_ENDPOINTS];
 
     QLIST_HEAD(, USBDescString) strings;
+    const USBDesc *usb_desc; /* Overrides class usb_desc if not NULL */
     const USBDescDevice *device;
 
     int configuration;
diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 55d0edd..8264c24 100644
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -166,6 +166,9 @@  const char *usb_device_get_product_desc(USBDevice *dev)
 const USBDesc *usb_device_get_usb_desc(USBDevice *dev)
 {
     USBDeviceClass *klass = USB_DEVICE_GET_CLASS(dev);
+    if (dev->usb_desc) {
+        return dev->usb_desc;
+    }
     return klass->usb_desc;
 }