Changeset 80fdffe in mainline for uspace/drv/uhci-hcd/iface.c

Timestamp:

2011-03-04T23:32:21Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

474d08e

Parents:

03f7952 (diff), 0e06a14 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Support for bulk transfers, minor refactoring

File:

• uspace/drv/uhci-hcd/iface.c (modified) (3 diffs)

uspace/drv/uhci-hcd/iface.c

@@ -140 +140 @@
 }
 /*----------------------------------------------------------------------------*/
+static int bulk_out(ddf_fun_t *fun, usb_target_t target,
+    size_t max_packet_size, void *data, size_t size,
+    usbhc_iface_transfer_out_callback_t callback, void *arg)
+{
+        assert(fun);
+        uhci_t *hc = fun_to_uhci(fun);
+        assert(hc);
+        usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
+
+        usb_log_debug("Bulk OUT %d:%d %zu(%zu).\n",
+            target.address, target.endpoint, size, max_packet_size);
+
+        batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
+            max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg);
+        if (!batch)
+                return ENOMEM;
+        batch_bulk_out(batch);
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
+static int bulk_in(ddf_fun_t *fun, usb_target_t target,
+    size_t max_packet_size, void *data, size_t size,
+    usbhc_iface_transfer_in_callback_t callback, void *arg)
+{
+        assert(fun);
+        uhci_t *hc = fun_to_uhci(fun);
+        assert(hc);
+        usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
+        usb_log_debug("Bulk IN %d:%d %zu(%zu).\n",
+            target.address, target.endpoint, size, max_packet_size);
+
+        batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
+            max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg);
+        if (!batch)
+                return ENOMEM;
+        batch_bulk_in(batch);
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
 static int control_write(ddf_fun_t *fun, usb_target_t target,
     size_t max_packet_size,
@@ -181 +220 @@
         return EOK;
 }
-
-
 /*----------------------------------------------------------------------------*/
 usbhc_iface_t uhci_iface = {
@@ -194 +231 @@
         .interrupt_in = interrupt_in,
 
+        .bulk_in = bulk_in,
+        .bulk_out = bulk_out,
+
         .control_read = control_read,
         .control_write = control_write,