Changeset 9a7e5b4 in mainline for uspace/drv/uhci-hcd/iface.c

Timestamp:

2011-04-07T08:19:03Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

41c1f7b

Parents:

dcaf819 (diff), 506d330 (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:

More OHCI structures and refactoring. Add per endpoint toggle reset

File:

• uspace/drv/uhci-hcd/iface.c (modified) (2 diffs)

uspace/drv/uhci-hcd/iface.c

@@ -168 +168 @@
         if (ep == NULL)
                 return ENOMEM;
-        ret = endpoint_init(ep, transfer_type, speed, max_packet_size);
+        ret = endpoint_init(ep, address, endpoint, direction,
+            transfer_type, speed, max_packet_size);
         if (ret != EOK) {
                 free(ep);
@@ -178 +179 @@
             usb_str_speed(speed), direction, size, max_packet_size, interval);
 
-        ret = usb_endpoint_manager_register_ep(&hc->ep_manager,
-            address, endpoint, direction, ep, size);
+        ret = usb_endpoint_manager_register_ep(&hc->ep_manager, ep, size);
         if (ret != EOK) {
                 endpoint_destroy(ep);