Changeset d369b3b in mainline for uspace/drv/bus/usb/ohci

Timestamp:

2018-01-25T02:05:57Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

296d22fc

Parents:

b357377

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-25 01:52:13)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-25 02:05:57)

Message:

usb2_bus: no longer be a bus

As the number of implemented functions got to 3, it's not so beneficial
to inherit usb2 bus to get the functionality. Overall, four trampolines
needed to be added, which is an acceptable number.

Now, the usb2_bus has become a usb2_bus_helper, to be used as
a companion to the common bus.

This is mostly a preparation to remove the runtime binding of the bus
methods.

Location:

uspace/drv/bus/usb/ohci

Files:

• ohci_bus.c (modified) (5 diffs)
• ohci_bus.h (modified) (1 diff)

uspace/drv/bus/usb/ohci/ohci_bus.c

@@ -57 +57 @@
 }
 
+static int ohci_device_enumerate(device_t *dev)
+{
+        ohci_bus_t *bus = (ohci_bus_t *) dev->bus;
+        return usb2_bus_device_enumerate(&bus->helper, dev);
+}
+
 /** Creates new hcd endpoint representation.
  */
@@ -109 +115 @@
         ohci_endpoint_t *ohci_ep = ohci_endpoint_get(ep);
 
-        const int err = usb2_bus_ops.endpoint_register(ep);
+        const int err = usb2_bus_endpoint_register(&bus->helper, ep);
         if (err)
                 return err;
@@ -126 +132 @@
         assert(ep);
 
-        usb2_bus_ops.endpoint_unregister(ep);
+        usb2_bus_endpoint_unregister(&bus->helper, ep);
         hc_dequeue_endpoint(bus->hc, ep);
 
@@ -162 +168 @@
 
 static const bus_ops_t ohci_bus_ops = {
-        .parent = &usb2_bus_ops,
-
         .interrupt = ohci_hc_interrupt,
         .status = ohci_hc_status,
+
+        .device_enumerate = ohci_device_enumerate,
 
         .endpoint_destroy = ohci_endpoint_destroy,
@@ -183 +189 @@
         assert(bus);
 
-        usb2_bus_t *usb2_bus = (usb2_bus_t *) bus;
         bus_t *bus_base = (bus_t *) bus;
-
-        usb2_bus_init(usb2_bus, &bandwidth_accounting_usb11);
+        bus_init(bus_base, sizeof(device_t));
         bus_base->ops = &ohci_bus_ops;
+
+        usb2_bus_helper_init(&bus->helper, &bandwidth_accounting_usb11);
 
         bus->hc = hc;

uspace/drv/bus/usb/ohci/ohci_bus.h

@@ -60 +60 @@
 
 typedef struct {
-        usb2_bus_t base;
+        bus_t base;
+        usb2_bus_helper_t helper;
         hc_t *hc;
 } ohci_bus_t;