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

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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 mainline changes.

File:

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

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

@@ -57 +57 @@
  * @return Error code.
  */
-static int request_address(ddf_fun_t *fun, usb_speed_t speed,
-    usb_address_t *address)
-{
-        VHC_DATA(vhc, fun);
-
-        usb_address_t addr = device_keeper_get_free_address(&vhc->dev_keeper,
-            USB_SPEED_HIGH);
-        if (addr < 0) {
-                return addr;
-        }
-
-        if (address != NULL) {
-                *address = addr;
-        }
-
-        return EOK;
+static int request_address(ddf_fun_t *fun, usb_address_t *address, bool strict,
+    usb_speed_t speed)
+{
+        VHC_DATA(vhc, fun);
+
+        assert(address);
+        return usb_device_manager_request_address(
+            &vhc->dev_manager, address, strict, speed);
 }
 
@@ -88 +80 @@
         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_address(&vhc->dev_manager, address, handle);
 
         return EOK;
@@ -104 +96 @@
 {
         VHC_DATA(vhc, fun);
-        bool found =
-            usb_device_keeper_find_by_address(&vhc->dev_keeper, address, handle);
-        return found ? EOK : ENOENT;
+        return usb_device_manager_get_info_by_address(
+            &vhc->dev_manager, address, handle, NULL);
 }
 
@@ -119 +110 @@
         VHC_DATA(vhc, fun);
         usb_log_debug("Releasing address %d...\n", address);
-        usb_device_keeper_release(&vhc->dev_keeper, address);
+        usb_device_manager_release_address(&vhc->dev_manager, address);
 
         return ENOTSUP;
@@ -137 +128 @@
  */
 static int register_endpoint(ddf_fun_t *fun,
-    usb_address_t address, usb_speed_t speed, usb_endpoint_t endpoint,
+    usb_address_t address, usb_endpoint_t endpoint,
     usb_transfer_type_t transfer_type, usb_direction_t direction,
     size_t max_packet_size, unsigned int interval)
 {
-        /* TODO: Use usb_endpoint_manager_add_ep */
-        VHC_DATA(vhc, fun);
-
-        endpoint_t *ep = endpoint_get(
-            address, endpoint, direction, transfer_type, USB_SPEED_FULL, 1);
-        if (ep == NULL) {
-                return ENOMEM;
-        }
-
-        int rc = usb_endpoint_manager_register_ep(&vhc->ep_manager, ep, 1);
-        if (rc != EOK) {
-                endpoint_destroy(ep);
-                return rc;
-        }
-
-        return EOK;
+        VHC_DATA(vhc, fun);
+
+        return usb_endpoint_manager_add_ep(&vhc->ep_manager,
+            address, endpoint, direction, transfer_type, USB_SPEED_FULL, 1, 0,
+            NULL, NULL);
+
 }
 
@@ -172 +153 @@
         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);
+        int rc = usb_endpoint_manager_remove_ep(&vhc->ep_manager,
+            address, endpoint, direction, NULL, NULL);
 
         return rc;
 }
-
+#if 0
 /** Schedule interrupt out transfer.
  *
@@ -413 +388 @@
         return EOK;
 }
-
-static int tell_address(ddf_fun_t *fun, devman_handle_t handle,
-    usb_address_t *address)
+#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_find_ep(&vhc->ep_manager,
+            target.address, target.endpoint, USB_DIRECTION_IN);
+        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) {
+                if (transfer->setup_buffer != NULL) {
+                        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_find_ep(&vhc->ep_manager,
+            target.address, target.endpoint, USB_DIRECTION_OUT);
+        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, usb_address_t *address)
 {
         UNSUPPORTED("tell_address");
@@ -432 +488 @@
 }
 
-static int tell_address_rh(ddf_fun_t *root_hub_fun, devman_handle_t handle,
-    usb_address_t *address)
+static int tell_address_rh(ddf_fun_t *root_hub_fun, usb_address_t *address)
 {
         VHC_DATA(vhc, root_hub_fun);
 
-        if (handle == 0) {
-                handle = root_hub_fun->handle;
-        }
+        devman_handle_t handle = root_hub_fun->handle;
 
         usb_log_debug("tell_address_rh(handle=%" PRIun ")\n", handle);
-        usb_address_t addr = usb_device_keeper_find(&vhc->dev_keeper, handle);
+        const usb_address_t addr =
+            usb_device_manager_find_address(&vhc->dev_manager, handle);
         if (addr < 0) {
                 return addr;
@@ -454 +508 @@
         .request_address = request_address,
         .bind_address = bind_address,
-        .find_by_address = find_by_address,
+        .get_handle = find_by_address,
         .release_address = release_address,
 
@@ -460 +514 @@
         .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,
 };
 
 usb_iface_t vhc_usb_iface = {
         .get_hc_handle = usb_iface_get_hc_handle_hc_impl,
-        .get_address = tell_address
+        .get_my_address = tell_address
 };
 
 usb_iface_t rh_usb_iface = {
         .get_hc_handle = usb_iface_get_hc_handle_rh_impl,
-        .get_address = tell_address_rh
+        .get_my_address = tell_address_rh
 };