Changeset fd07e526 in mainline for uspace/drv/bus/usb/vhc

Timestamp:

2011-09-16T14:50:20Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

432a269, d1e18573

Parents:

47fecbb (diff), 82a31261 (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:

Merge USB changes from bzr://krabicka.net/orome/helenos/usb/

• Move common HC code from uhci/ohci drivers to libusbhost
• Rewrite USB HC interface to have common read/write functions for all transfer types.
• Restructure hc drivers to avoid some hooks and void* casts
• Cleanup the code and remove unnecessary mallocs.

Location:

uspace/drv/bus/usb/vhc

Files:

• connhost.c (modified) (9 diffs)
• main.c (modified) (2 diffs)
• vhcd.h (modified) (2 diffs)

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

@@ -62 +62 @@
         VHC_DATA(vhc, fun);
 
-        usb_address_t addr = device_keeper_get_free_address(&vhc->dev_keeper,
-            USB_SPEED_HIGH);
+        usb_address_t addr = usb_device_manager_get_free_address(
+            &vhc->dev_manager, USB_SPEED_HIGH);
         if (addr < 0) {
                 return addr;
@@ -88 +88 @@
         usb_log_debug("Binding handle %" PRIun " to address %d.\n",
             handle, address);
-        usb_device_keeper_bind(&vhc->dev_keeper, address, handle);
+        usb_device_manager_bind(&vhc->dev_manager, address, handle);
 
         return EOK;
@@ -105 +105 @@
         VHC_DATA(vhc, fun);
         bool found =
-            usb_device_keeper_find_by_address(&vhc->dev_keeper, address, handle);
+            usb_device_manager_find_by_address(&vhc->dev_manager, address, handle);
         return found ? EOK : ENOENT;
 }
@@ -119 +119 @@
         VHC_DATA(vhc, fun);
         usb_log_debug("Releasing address %d...\n", address);
-        usb_device_keeper_release(&vhc->dev_keeper, address);
+        usb_device_manager_release(&vhc->dev_manager, address);
 
         return ENOTSUP;
@@ -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->setup_buffer);
+                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->setup_buffer);
+                free(transfer);
+                return rc;
+        }
+
+        return EOK;
+}
 
 static int tell_address(ddf_fun_t *fun, devman_handle_t handle,
@@ -442 +516 @@
 
         usb_log_debug("tell_address_rh(handle=%" PRIun ")\n", handle);
-        usb_address_t addr = usb_device_keeper_find(&vhc->dev_keeper, handle);
+        usb_address_t addr = usb_device_manager_find(&vhc->dev_manager, handle);
         if (addr < 0) {
                 return addr;
@@ -460 +534 @@
         .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,
 };
 

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

@@ -73 +73 @@
         }
         data->magic = 0xDEADBEEF;
-        rc = usb_endpoint_manager_init(&data->ep_manager, (size_t) -1);
+        rc = usb_endpoint_manager_init(&data->ep_manager, (size_t) -1,
+            bandwidth_count_usb11);
         if (rc != EOK) {
                 usb_log_fatal("Failed to initialize endpoint manager.\n");
@@ -79 +80 @@
                 return rc;
         }
-        usb_device_keeper_init(&data->dev_keeper);
+        usb_device_manager_init(&data->dev_manager);
 
         ddf_fun_t *hc = ddf_fun_create(dev, fun_exposed, "hc");

uspace/drv/bus/usb/vhc/vhcd.h

@@ -39 +39 @@
 #include <usbvirt/device.h>
 #include <usb/host/usb_endpoint_manager.h>
-#include <usb/host/device_keeper.h>
+#include <usb/host/usb_device_manager.h>
 #include <usbhc_iface.h>
 #include <async.h>
@@ -60 +60 @@
         fibril_mutex_t guard;
         usb_endpoint_manager_t ep_manager;
-        usb_device_keeper_t dev_keeper;
+        usb_device_manager_t dev_manager;
         usbvirt_device_t *hub;
         ddf_fun_t *hc_fun;