Changeset bbdf09e in mainline for uspace/drv/vhc/connhost.c

Timestamp:

2011-04-22T16:35:45Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c709eb0

Parents:

4125b7d

Message:

Virtual host controller works again

Added dummy implementation of endpoint registration and fixed
problem with tell_device_address callback.

File:

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

uspace/drv/vhc/connhost.c

@@ -313 +313 @@
     usb_address_t *address)
 {
-        usb_log_debug("tell_address(fun \"%s\", handle %zu)\n",
-            fun->name, (size_t) fun->handle);
+        usb_log_debug(
+            "tell_address(fun=`%s' (%" PRIun"), dev_handle=%" PRIun ")\n",
+            fun->name, fun->handle, handle);
         usb_address_t addr = usb_address_keeping_find(&addresses, handle);
         if (addr < 0) {
@@ -341 +342 @@
 }
 
+static int register_endpoint(ddf_fun_t *fun,
+    usb_address_t address, usb_speed_t speed, usb_endpoint_t endpoint,
+    usb_transfer_type_t transfer_type, usb_direction_t direction,
+    size_t max_packet_size, unsigned int interval)
+{
+        if ((address == USB_ADDRESS_DEFAULT)
+            && (endpoint == 0)) {
+                usb_address_keeping_reserve_default(&addresses);
+        }
+
+        return EOK;
+}
+
+static int unregister_endpoint(ddf_fun_t *fun, usb_address_t address,
+    usb_endpoint_t endpoint, usb_direction_t direction)
+{
+        if ((address == USB_ADDRESS_DEFAULT)
+            && (endpoint == 0)) {
+                usb_address_keeping_release_default(&addresses);
+        }
+
+        return EOK;
+}
+
+
 static int bind_address(ddf_fun_t *fun, usb_address_t address,
     devman_handle_t handle)
@@ -367 +393 @@
         assert(hc_fun != NULL);
 
-        return tell_address(hc_fun, root_hub_fun->handle, address);
+        if (handle == 0) {
+                handle = root_hub_fun->handle;
+        }
+
+        return tell_address(hc_fun, handle, address);
 }
 
@@ -380 +410 @@
         .release_address = release_address,
 
+        .register_endpoint = register_endpoint,
+        .unregister_endpoint = unregister_endpoint,
+
         .interrupt_out = interrupt_out,
         .interrupt_in = interrupt_in,