Changeset e779bd3c in mainline for uspace/drv/bus/usb/vhc/connhost.c

Timestamp:

2011-09-13T14:17:20Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e3f6304

Parents:

7eb32a8

Message:

vhc: Use new interface for virtual host controller

File:

• uspace/drv/bus/usb/vhc/connhost.c (modified) (4 diffs)

uspace/drv/bus/usb/vhc/connhost.c

@@ -172 +172 @@
         VHC_DATA(vhc, fun);
 
-        endpoint_t *ep = usb_endpoint_manager_get_ep(&vhc->ep_manager,
-            address, endpoint, direction, NULL);
-        if (ep == NULL) {
-                return ENOENT;
-        }
-
         int rc = usb_endpoint_manager_unregister_ep(&vhc->ep_manager,
             address, endpoint, direction);
@@ -183 +177 @@
         return rc;
 }
-
+#if 0
 /** Schedule interrupt out transfer.
  *
@@ -413 +407 @@
         return EOK;
 }
+#endif
+static int usb_read(ddf_fun_t *fun, usb_target_t target, uint64_t setup_buffer,
+    uint8_t *data_buffer, size_t data_buffer_size,
+    usbhc_iface_transfer_in_callback_t callback, void *arg)
+{
+        VHC_DATA(vhc, fun);
+
+        endpoint_t *ep = usb_endpoint_manager_get_ep(&vhc->ep_manager,
+            target.address, target.endpoint, USB_DIRECTION_IN, NULL);
+        if (ep == NULL) {
+                return ENOENT;
+        }
+        const usb_transfer_type_t transfer_type = ep->transfer_type;
+
+
+        vhc_transfer_t *transfer = vhc_transfer_create(target.address,
+            target.endpoint, USB_DIRECTION_IN, transfer_type,
+            fun, arg);
+        if (transfer == NULL) {
+                return ENOMEM;
+        }
+        if (transfer_type == USB_TRANSFER_CONTROL) {
+                transfer->setup_buffer = malloc(sizeof(uint64_t));
+                assert(transfer->setup_buffer);
+                memcpy(transfer->setup_buffer, &setup_buffer, sizeof(uint64_t));
+                transfer->setup_buffer_size = sizeof(uint64_t);
+        }
+        transfer->data_buffer = data_buffer;
+        transfer->data_buffer_size = data_buffer_size;
+        transfer->callback_in = callback;
+
+        int rc = vhc_virtdev_add_transfer(vhc, transfer);
+        if (rc != EOK) {
+                free(transfer);
+                return rc;
+        }
+
+        return EOK;
+}
+
+static int usb_write(ddf_fun_t *fun, usb_target_t target, uint64_t setup_buffer,
+    const uint8_t *data_buffer, size_t data_buffer_size,
+    usbhc_iface_transfer_out_callback_t callback, void *arg)
+{
+        VHC_DATA(vhc, fun);
+
+        endpoint_t *ep = usb_endpoint_manager_get_ep(&vhc->ep_manager,
+            target.address, target.endpoint, USB_DIRECTION_OUT, NULL);
+        if (ep == NULL) {
+                return ENOENT;
+        }
+        const usb_transfer_type_t transfer_type = ep->transfer_type;
+
+
+        vhc_transfer_t *transfer = vhc_transfer_create(target.address,
+            target.endpoint, USB_DIRECTION_OUT, transfer_type,
+            fun, arg);
+        if (transfer == NULL) {
+                return ENOMEM;
+        }
+        if (transfer_type == USB_TRANSFER_CONTROL) {
+                transfer->setup_buffer = malloc(sizeof(uint64_t));
+                assert(transfer->setup_buffer);
+                memcpy(transfer->setup_buffer, &setup_buffer, sizeof(uint64_t));
+                transfer->setup_buffer_size = sizeof(uint64_t);
+        }
+        transfer->data_buffer = (void*)data_buffer;
+        transfer->data_buffer_size = data_buffer_size;
+        transfer->callback_out = callback;
+
+        int rc = vhc_virtdev_add_transfer(vhc, transfer);
+        if (rc != EOK) {
+                free(transfer);
+                return rc;
+        }
+
+        return EOK;
+}
 
 static int tell_address(ddf_fun_t *fun, devman_handle_t handle,
@@ -460 +532 @@
         .unregister_endpoint = unregister_endpoint,
 
-        .interrupt_out = interrupt_out,
-        .interrupt_in = interrupt_in,
-
-        .bulk_in = bulk_in,
-        .bulk_out = bulk_out,
-
-        .control_write = control_write,
-        .control_read = control_read
+        .write = usb_write,
+        .read = usb_read,
 };