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

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/vhc

Files:

• transfer.c (modified) (2 diffs)
• vhcd.h (modified) (1 diff)

uspace/drv/bus/usb/vhc/transfer.c

@@ -163 +163 @@
 }
 
+static int device_enumerate(device_t *device)
+{
+        vhc_data_t *vhc = bus_to_vhc(device->bus);
+        return usb2_bus_device_enumerate(&vhc->bus_helper, device);
+}
+
+static int endpoint_register(endpoint_t *endpoint)
+{
+        vhc_data_t *vhc = bus_to_vhc(endpoint->device->bus);
+        return usb2_bus_endpoint_register(&vhc->bus_helper, endpoint);
+}
+
+static void endpoint_unregister(endpoint_t *endpoint)
+{
+        vhc_data_t *vhc = bus_to_vhc(endpoint->device->bus);
+        usb2_bus_endpoint_unregister(&vhc->bus_helper, endpoint);
+
+        // TODO: abort transfer?
+}
+
 static const bus_ops_t vhc_bus_ops = {
-        .parent = &usb2_bus_ops,
-
         .batch_create = batch_create,
         .batch_schedule = vhc_schedule,
+
+        .device_enumerate = device_enumerate,
+        .endpoint_register = endpoint_register,
+        .endpoint_unregister = endpoint_unregister,
 };
 
@@ -175 +197 @@
         list_initialize(&instance->devices);
         fibril_mutex_initialize(&instance->guard);
-        usb2_bus_init(&instance->bus, &bandwidth_accounting_usb11);
-        instance->bus.base.ops = &vhc_bus_ops;
+        bus_init(&instance->bus, sizeof(device_t));
+        usb2_bus_helper_init(&instance->bus_helper, &bandwidth_accounting_usb11);
+        instance->bus.ops = &vhc_bus_ops;
         return virthub_init(&instance->hub, "root hub");
 }

uspace/drv/bus/usb/vhc/vhcd.h

@@ -60 +60 @@
         hc_device_t base;
 
-        usb2_bus_t bus;
+        bus_t bus;
+        usb2_bus_helper_t bus_helper;
+
         ddf_fun_t *virtual_fun;
         list_t devices;