Changeset 32fb6bce in mainline for uspace/drv/bus/usb/xhci/bus.c

Timestamp:

2017-12-18T22:50:21Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

7f70d1c

Parents:

1ea0bbf

git-author:

Ondřej Hlavatý <aearsis@…> (2017-12-18 22:04:50)

git-committer:

Ondřej Hlavatý <aearsis@…> (2017-12-18 22:50:21)

Message:

usbhost: refactoring

This commit moves interrupt, status and schedule to bus
operations. Then the purpose of hcd_t is better defined, and split into
hc_driver_t and hc_device_t. hc_driver_t is used to wrap driver
implementation by the library (similar to how usb_driver_t is used to
wrap usb device drivers). hc_device_t is used as a parent for hc_t
inside drivers, and is allocated inside the DDF device node.

To support these changes, some local identifiers were renamed, some
functions were moved and/or renamed and their arguments changed. The
most notable one being hcd_send_batch → bus_device_send_batch.

File:

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

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

@@ -111 +111 @@
 
         uint16_t max_packet_size;
-        if ((err = hcd_get_ep0_max_packet_size(&max_packet_size, hc->hcd, &dev->base)))
+        if ((err = hcd_get_ep0_max_packet_size(&max_packet_size, (bus_t *) &hc->bus, &dev->base)))
                 return err;
 
@@ -168 +168 @@
 
         /* Read the device descriptor, derive the match ids */
-        if ((err = hcd_ddf_device_explore(dev))) {
+        if ((err = hcd_device_explore(dev))) {
                 usb_log_error("Device(%d): Failed to explore device: %s", dev->address, str_error(err));
                 goto err_address;
@@ -233 +233 @@
         /* Destroy DDF device. */
         /* XXX: Not a good idea, this method should not destroy devices. */
-        hcd_ddf_device_destroy(dev);
+        hcd_ddf_fun_destroy(dev);
 
         return EOK;
@@ -501 +501 @@
         BIND_OP(batch_destroy)
 #undef BIND_OP
+
+        .interrupt = hc_interrupt,
+        .status = hc_status,
+        .batch_schedule = hc_schedule,
 };
 
@@ -507 +511 @@
         assert(bus);
 
-        bus_init(&bus->base, hc->hcd, sizeof(xhci_device_t));
+        bus_init(&bus->base, sizeof(xhci_device_t));
 
         bus->devices_by_slot = calloc(hc->max_slots, sizeof(xhci_device_t *));