Changeset 32fb6bce in mainline for uspace/lib/usbhost/src/usb2_bus.c

Timestamp:

2017-12-18T22:50:21Z (8 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/lib/usbhost/src/usb2_bus.c (modified) (5 diffs)

uspace/lib/usbhost/src/usb2_bus.c

@@ -205 +205 @@
 
         usb2_bus_t *bus = (usb2_bus_t *) dev->bus;
-        hcd_t *hcd = (hcd_t *) bus->base.hcd;
 
         /* The default address is currently reserved for this device */
@@ -231 +230 @@
 
         uint16_t max_packet_size;
-        if ((err = hcd_get_ep0_max_packet_size(&max_packet_size, hcd, dev)))
+        if ((err = hcd_get_ep0_max_packet_size(&max_packet_size, &bus->base, dev)))
                 goto err_address;
 
@@ -238 +237 @@
 
         usb_log_debug("Device(%d): Setting USB address.", address);
-        err = hcd_send_batch_sync(hcd, dev, usb2_default_target, USB_DIRECTION_OUT,
+        err = bus_device_send_batch_sync(dev, usb2_default_target, USB_DIRECTION_OUT,
             NULL, 0, *(uint64_t *)&set_address, "set address");
         if (err != 0) {
@@ -315 +314 @@
 
         /* 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));
                 release_address(bus, dev->address);
@@ -463 +462 @@
  * @return Error code.
  */
-int usb2_bus_init(usb2_bus_t *bus, hcd_t *hcd, size_t available_bandwidth)
+int usb2_bus_init(usb2_bus_t *bus, size_t available_bandwidth)
 {
         assert(bus);
 
-        bus_init(&bus->base, hcd, sizeof(device_t));
+        bus_init(&bus->base, sizeof(device_t));
         bus->base.ops = &usb2_bus_ops;