|
 |
3f1f29 |
From fc63639374684dae600d200c133adad75044e587 Mon Sep 17 00:00:00 2001
|
|
|
3f1f29 |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
3f1f29 |
Date: Fri, 24 Jun 2011 11:29:56 +0200
|
|
|
3f1f29 |
Subject: [PATCH 04/35] usb: Add a register_companion USB bus op.
|
|
|
3f1f29 |
|
|
|
3f1f29 |
This is a preparation patch for adding support for USB companion controllers.
|
|
|
3f1f29 |
|
|
|
3f1f29 |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
3f1f29 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
3f1f29 |
---
|
|
|
3f1f29 |
hw/usb-bus.c | 31 +++++++++++++++++++++++++++++++
|
|
|
3f1f29 |
hw/usb.h | 5 +++++
|
|
|
3f1f29 |
2 files changed, 36 insertions(+), 0 deletions(-)
|
|
|
3f1f29 |
|
|
|
3f1f29 |
diff --git a/hw/usb-bus.c b/hw/usb-bus.c
|
|
|
3f1f29 |
index e37e8a2..b511bac 100644
|
|
|
3f1f29 |
--- a/hw/usb-bus.c
|
|
|
3f1f29 |
+++ b/hw/usb-bus.c
|
|
|
3f1f29 |
@@ -160,6 +160,37 @@ void usb_register_port(USBBus *bus, USBPort *port, void *opaque, int index,
|
|
|
3f1f29 |
bus->nfree++;
|
|
|
3f1f29 |
}
|
|
|
3f1f29 |
|
|
|
3f1f29 |
+int usb_register_companion(const char *masterbus, USBPort *ports[],
|
|
|
3f1f29 |
+ uint32_t portcount, uint32_t firstport,
|
|
|
3f1f29 |
+ void *opaque, USBPortOps *ops, int speedmask)
|
|
|
3f1f29 |
+{
|
|
|
3f1f29 |
+ USBBus *bus;
|
|
|
3f1f29 |
+ int i;
|
|
|
3f1f29 |
+
|
|
|
3f1f29 |
+ QTAILQ_FOREACH(bus, &busses, next) {
|
|
|
3f1f29 |
+ if (strcmp(bus->qbus.name, masterbus) == 0) {
|
|
|
3f1f29 |
+ break;
|
|
|
3f1f29 |
+ }
|
|
|
3f1f29 |
+ }
|
|
|
3f1f29 |
+
|
|
|
3f1f29 |
+ if (!bus || !bus->ops->register_companion) {
|
|
|
3f1f29 |
+ qerror_report(QERR_INVALID_PARAMETER_VALUE, "masterbus",
|
|
|
3f1f29 |
+ "an USB masterbus");
|
|
|
3f1f29 |
+ if (bus) {
|
|
|
3f1f29 |
+ error_printf_unless_qmp(
|
|
|
3f1f29 |
+ "USB bus '%s' does not allow companion controllers\n",
|
|
|
3f1f29 |
+ masterbus);
|
|
|
3f1f29 |
+ }
|
|
|
3f1f29 |
+ return -1;
|
|
|
3f1f29 |
+ }
|
|
|
3f1f29 |
+
|
|
|
3f1f29 |
+ for (i = 0; i < portcount; i++) {
|
|
|
3f1f29 |
+ usb_fill_port(ports[i], opaque, i, ops, speedmask);
|
|
|
3f1f29 |
+ }
|
|
|
3f1f29 |
+
|
|
|
3f1f29 |
+ return bus->ops->register_companion(bus, ports, portcount, firstport);
|
|
|
3f1f29 |
+}
|
|
|
3f1f29 |
+
|
|
|
3f1f29 |
void usb_port_location(USBPort *downstream, USBPort *upstream, int portnr)
|
|
|
3f1f29 |
{
|
|
|
3f1f29 |
if (upstream) {
|
|
|
3f1f29 |
diff --git a/hw/usb.h b/hw/usb.h
|
|
|
3f1f29 |
index 076e2ff..a5f2efa 100644
|
|
|
3f1f29 |
--- a/hw/usb.h
|
|
|
3f1f29 |
+++ b/hw/usb.h
|
|
|
3f1f29 |
@@ -344,6 +344,8 @@ struct USBBus {
|
|
|
3f1f29 |
};
|
|
|
3f1f29 |
|
|
|
3f1f29 |
struct USBBusOps {
|
|
|
3f1f29 |
+ int (*register_companion)(USBBus *bus, USBPort *ports[],
|
|
|
3f1f29 |
+ uint32_t portcount, uint32_t firstport);
|
|
|
3f1f29 |
void (*device_destroy)(USBBus *bus, USBDevice *dev);
|
|
|
3f1f29 |
};
|
|
|
3f1f29 |
|
|
|
3f1f29 |
@@ -356,6 +358,9 @@ USBDevice *usb_create_simple(USBBus *bus, const char *name);
|
|
|
3f1f29 |
USBDevice *usbdevice_create(const char *cmdline);
|
|
|
3f1f29 |
void usb_register_port(USBBus *bus, USBPort *port, void *opaque, int index,
|
|
|
3f1f29 |
USBPortOps *ops, int speedmask);
|
|
|
3f1f29 |
+int usb_register_companion(const char *masterbus, USBPort *ports[],
|
|
|
3f1f29 |
+ uint32_t portcount, uint32_t firstport,
|
|
|
3f1f29 |
+ void *opaque, USBPortOps *ops, int speedmask);
|
|
|
3f1f29 |
void usb_port_location(USBPort *downstream, USBPort *upstream, int portnr);
|
|
|
3f1f29 |
void usb_unregister_port(USBBus *bus, USBPort *port);
|
|
|
3f1f29 |
int usb_device_attach(USBDevice *dev);
|
|
|
3f1f29 |
--
|
|
|
3f1f29 |
1.7.5.1
|
|
|
3f1f29 |
|