Changeset fefc27d in mainline for uspace/drv/ohci/iface.c

Timestamp:

2011-04-03T10:15:39Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

6c399765

Parents:

4fbcd2a (diff), b8f7a0d2 (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 with usb/development

File:

• uspace/drv/ohci/iface.c (modified) (2 diffs)

uspace/drv/ohci/iface.c

@@ -151 +151 @@
     size_t max_packet_size, unsigned int interval)
 {
-        UNSUPPORTED("register_endpoint");
-
-        return ENOTSUP;
+        assert(fun);
+        hc_t *hc = fun_to_hc(fun);
+        assert(hc);
+        if (address == hc->rh.address)
+                return EOK;
+        const usb_speed_t speed =
+                usb_device_keeper_get_speed(&hc->manager, address);
+        const size_t size = max_packet_size;
+        usb_log_debug("Register endpoint %d:%d %s %s(%d) %zu(%zu) %u.\n",
+            address, endpoint, usb_str_transfer_type(transfer_type),
+            usb_str_speed(speed), direction, size, max_packet_size, interval);
+        return bandwidth_reserve(&hc->bandwidth, address, endpoint, direction,
+            speed, transfer_type, max_packet_size, size, interval);
 }
 /*----------------------------------------------------------------------------*/
@@ -168 +178 @@
     usb_endpoint_t endpoint, usb_direction_t direction)
 {
-        UNSUPPORTED("unregister_endpoint");
+        assert(fun);
+        hc_t *hc = fun_to_hc(fun);
+        assert(hc);
+        usb_log_debug("Unregister endpoint %d:%d %d.\n",
+            address, endpoint, direction);
+        return bandwidth_release(&hc->bandwidth, address, endpoint, direction);
 
         return ENOTSUP;