Changeset 6832245 in mainline for uspace/lib/usbhost/src/usb_transfer_batch.c

Timestamp:

2017-12-14T23:01: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:

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/usb_transfer_batch.c (modified) (4 diffs)

uspace/lib/usbhost/src/usb_transfer_batch.c

@@ -49 +49 @@
 {
         assert(ep);
-        assert(ep->bus);
 
-        usb_transfer_batch_t *batch;
-        if (ep->bus->ops.create_batch)
-                batch = ep->bus->ops.create_batch(ep->bus, ep);
-        else
-                batch = calloc(1, sizeof(usb_transfer_batch_t));
+        bus_t *bus = endpoint_get_bus(ep);
+        const bus_ops_t *ops = BUS_OPS_LOOKUP(bus->ops, batch_create);
 
-        return batch;
+        if (!ops) {
+                usb_transfer_batch_t *batch = calloc(1, sizeof(usb_transfer_batch_t));
+                usb_transfer_batch_init(batch, ep);
+                return batch;
+        }
+
+        return ops->batch_create(ep);
 }
 
@@ -64 +66 @@
 void usb_transfer_batch_init(usb_transfer_batch_t *batch, endpoint_t *ep)
 {
+        assert(ep);
+        endpoint_add_ref(ep);
         batch->ep = ep;
 }
@@ -82 +86 @@
             batch->toggle_reset_mode == RESET_ALL ? "all EPs toggle" : "EP toggle");
 
-        return bus_reset_toggle(batch->ep->bus, batch->target, batch->toggle_reset_mode);
+        return bus_reset_toggle(endpoint_get_bus(batch->ep), batch->target, batch->toggle_reset_mode);
 }
 
@@ -93 +97 @@
         assert(batch);
         assert(batch->ep);
-        assert(batch->ep->bus);
 
-        bus_t *bus = batch->ep->bus;
-        if (bus->ops.destroy_batch) {
+        bus_t *bus = endpoint_get_bus(batch->ep);
+        const bus_ops_t *ops = BUS_OPS_LOOKUP(bus->ops, batch_destroy);
+
+        endpoint_del_ref(batch->ep);
+
+        if (ops) {
                 usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " destroying.\n",
                     batch, USB_TRANSFER_BATCH_ARGS(*batch));
-                bus->ops.destroy_batch(batch);
+                ops->batch_destroy(batch);
         }
         else {