Changeset 6832245 in mainline for uspace/lib/usbhost/src/ddf_helpers.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/lib/usbhost/src/ddf_helpers.c (modified) (15 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -101 +101 @@
                 endpoint_desc->max_packet_size, endpoint_desc->usb2.polling_interval);
 
-        return bus_add_endpoint(hcd->bus, dev, endpoint_desc, NULL);
+        return bus_endpoint_add(dev, endpoint_desc, NULL);
 }
 
@@ -128 +128 @@
                 usb_str_direction(endpoint_desc->direction));
 
-        endpoint_t *ep = bus_find_endpoint(hcd->bus, dev, target, endpoint_desc->direction);
+        endpoint_t *ep = bus_find_endpoint(dev, target, endpoint_desc->direction);
         if (!ep)
                 return ENOENT;
 
-        return bus_remove_endpoint(hcd->bus, ep);
+        return bus_endpoint_remove(ep);
 }
 
@@ -362 +362 @@
                 const int ret = ddf_fun_unbind(victim->fun);
                 if (ret == EOK) {
-                        bus_remove_device(hcd->bus, hcd, victim);
+                        bus_device_remove(victim);
                         ddf_fun_destroy(victim->fun);
                 } else {
@@ -374 +374 @@
 }
 
-device_t *hcd_ddf_device_create(ddf_dev_t *hc, size_t device_size)
+device_t *hcd_ddf_device_create(ddf_dev_t *hc, bus_t *bus)
 {
         /* Create DDF function for the new device */
@@ -384 +384 @@
 
         /* Create USB device node for the new device */
-        device_t *dev = ddf_fun_data_alloc(fun, device_size);
+        device_t *dev = ddf_fun_data_alloc(fun, bus->device_size);
         if (!dev) {
                 ddf_fun_destroy(fun);
@@ -390 +390 @@
         }
 
-        device_init(dev);
+        bus_device_init(dev, bus);
         dev->fun = fun;
         return dev;
@@ -402 +402 @@
 }
 
-int hcd_ddf_device_explore(hcd_t *hcd, device_t *device)
+int hcd_ddf_device_explore(device_t *device)
 {
         int err;
@@ -421 +421 @@
         usb_log_debug("Device(%d): Requesting full device descriptor.",
             device->address);
-        ssize_t got = hcd_send_batch_sync(hcd, device, control_ep, USB_DIRECTION_IN,
+        ssize_t got = hcd_send_batch_sync(device->bus->hcd, device, control_ep, USB_DIRECTION_IN,
             (char *) &desc, sizeof(desc), *(uint64_t *)&get_device_desc,
             "read device descriptor");
@@ -458 +458 @@
         usb_log_info("Device(%d): Requested to be brought online.", dev->address);
 
-        return bus_online_device(hcd->bus, hcd, dev);
+        return bus_device_online(dev);
 }
 
@@ -472 +472 @@
         usb_log_info("Device(%d): Requested to be taken offline.", dev->address);
 
-        return bus_offline_device(hcd->bus, hcd, dev);
+        return bus_device_offline(dev);
 }
 
@@ -483 +483 @@
         assert(hc);
 
-        device_t *dev = hcd_ddf_device_create(hc, hcd->bus->device_size);
+        device_t *dev = hcd_ddf_device_create(hc, hcd->bus);
         if (!dev) {
                 usb_log_error("Failed to create USB device function.");
@@ -492 +492 @@
         dev->port = port;
 
-        if ((err = bus_enumerate_device(hcd->bus, hcd, dev))) {
+        if ((err = bus_device_enumerate(dev))) {
                 usb_log_error("Failed to initialize USB dev memory structures.");
                 return err;
@@ -501 +501 @@
          */
         if (!ddf_fun_get_name(dev->fun)) {
-                device_set_default_name(dev);
+                bus_device_set_default_name(dev);
         }
 
@@ -538 +538 @@
         }
 
-        device_t *dev = hcd_ddf_device_create(hc, hcd->bus->device_size);
+        device_t *dev = hcd_ddf_device_create(hc, hcd->bus);
         if (!dev) {
                 usb_log_error("Failed to create function for the root hub.");
@@ -547 +547 @@
 
         /* Assign an address to the device */
-        if ((err = bus_enumerate_device(hcd->bus, hcd, dev))) {
+        if ((err = bus_device_enumerate(dev))) {
                 usb_log_error("Failed to enumerate roothub device: %s", str_error(err));
                 goto err_usb_dev;