Changeset 5fd9c30 in mainline for uspace/drv/bus/usb/uhci/hc.c

Timestamp:

2017-10-21T20:52:56Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

766043c

Parents:

74b852b

Message:

usbhost refactoring: let transfer_batch be initialized by bus

Currently makes older HCs fail, work in progress.

File:

• uspace/drv/bus/usb/uhci/hc.c (modified) (4 diffs)

uspace/drv/bus/usb/uhci/hc.c

@@ -177 +177 @@
                         uhci_transfer_batch_t *batch =
                             uhci_transfer_batch_from_link(current);
-                        uhci_transfer_batch_finish_dispose(batch);
+                        usb_transfer_batch_finish(&batch->base);
                 }
         }
@@ -309 +309 @@
 }
 
+static usb_transfer_batch_t *create_transfer_batch(bus_t *bus, endpoint_t *ep)
+{
+        uhci_transfer_batch_t *batch = uhci_transfer_batch_create(ep);
+        return &batch->base;
+}
+
+static void destroy_transfer_batch(usb_transfer_batch_t *batch)
+{
+        uhci_transfer_batch_destroy(uhci_transfer_batch_get(batch));
+}
+
 /** Initialize UHCI hc memory structures.
  *
@@ -326 +337 @@
         if ((err = usb2_bus_init(&instance->bus, BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11)))
                 return err;
+
+        instance->bus.base.ops.create_batch = create_transfer_batch;
+        instance->bus.base.ops.destroy_batch = destroy_transfer_batch;
 
         /* Init USB frame list page */
@@ -450 +464 @@
                 return uhci_rh_schedule(&instance->rh, batch);
 
-        uhci_transfer_batch_t *uhci_batch = uhci_transfer_batch_get(batch);
+        uhci_transfer_batch_t *uhci_batch = (uhci_transfer_batch_t *) batch;
         if (!uhci_batch) {
                 usb_log_error("Failed to create UHCI transfer structures.\n");
                 return ENOMEM;
         }
+
+        const int err = uhci_transfer_batch_prepare(uhci_batch);
+        if (err)
+                return err;
 
         transfer_list_t *list =