Changeset 6832245 in mainline for uspace/drv/bus/usb/xhci/rh.c

Timestamp:

2017-12-14T23:01:57Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

837d53d

Parents:

bd05140

git-author:

Ondřej Hlavatý <aearsis@…> (2017-12-14 23:01:54)

git-committer:

Ondřej Hlavatý <aearsis@…> (2017-12-14 23:01:57)

Message:

usbhost bus: refactor the bus ops

This way, method names better represent the entity it is working with.
Their semantics was shifted a bit.

Regarding the tree of structures:

bus ← device ← endpoint ← batch

Previously, devices were kept in DDF function nodes, and endpoints had
pointer to the bus and device. Now, devices have pointer to bus,
endpoints don't.

Pointer to hcd_t in bus is WIP, and will be removed.

File:

• uspace/drv/bus/usb/xhci/rh.c (modified) (5 diffs)

uspace/drv/bus/usb/xhci/rh.c

@@ -71 +71 @@
         rh->hc_device = device;
 
-        const int err = device_init(&rh->device.base);
+        const int err = bus_device_init(&rh->device.base, &rh->hc->bus.base);
         if (err)
                 return err;
@@ -94 +94 @@
         xhci_bus_t *bus = &rh->hc->bus;
 
-        device_t *dev = hcd_ddf_device_create(rh->hc_device, bus->base.device_size);
+        device_t *dev = hcd_ddf_device_create(rh->hc_device, &bus->base);
         if (!dev) {
                 usb_log_error("Failed to create USB device function.");
@@ -109 +109 @@
         dev->speed = port_speed->usb_speed;
 
-        if ((err = xhci_bus_enumerate_device(bus, rh->hc, dev))) {
+        if ((err = xhci_bus_enumerate_device(bus, dev))) {
                 usb_log_error("Failed to enumerate USB device: %s", str_error(err));
                 return err;
@@ -115 +115 @@
 
         if (!ddf_fun_get_name(dev->fun)) {
-                device_set_default_name(dev);
+                bus_device_set_default_name(dev);
         }
 
@@ -196 +196 @@
 
         /* Remove device from XHCI bus. */
-        if ((err = xhci_bus_remove_device(&rh->hc->bus, rh->hc, &dev->base))) {
+        if ((err = xhci_bus_remove_device(&rh->hc->bus, &dev->base))) {
                 usb_log_warning("Failed to remove device " XHCI_DEV_FMT " from XHCI bus: %s",
                     XHCI_DEV_ARGS(*dev), str_error(err));