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

Timestamp:

2011-04-09T22:03:23Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a19a2d7

Parents:

501e5df

Message:

Don't keep endpoints in two separate structures

Fixes crash "[HelenOS-USB-devel] uhci root hub" email
Move toggle resert testing ugliness to endpoint manager

File:

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

uspace/drv/uhci-hcd/iface.c

@@ -232 +232 @@
         if (ret != EOK) {
                 endpoint_destroy(ep);
-        } else {
-                usb_device_keeper_add_ep(&hc->manager, address, ep);
         }
         return ret;
@@ -246 +244 @@
         usb_log_debug("Unregister endpoint %d:%d %d.\n",
             address, endpoint, direction);
-        endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager,
-            address, endpoint, direction, NULL);
-        if (ep != NULL) {
-                usb_device_keeper_del_ep(&hc->manager, address, ep);
-        }
         return usb_endpoint_manager_unregister_ep(&hc->ep_manager, address,
             endpoint, direction);
@@ -391 +384 @@
         if (ret != EOK)
                 return ret;
-        usb_device_keeper_reset_if_need(&hc->manager, target, setup_data);
+        usb_endpoint_manager_reset_if_need(&hc->ep_manager, target, setup_data);
         batch_control_write(batch);
         ret = hc_schedule(hc, batch);