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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/ohci/iface.c

    r501e5df rba038f4  
    245245        if (ret != EOK) {
    246246                endpoint_destroy(ep);
    247         } else {
    248                 usb_device_keeper_add_ep(&hc->manager, address, ep);
    249247        }
    250248        return ret;
     
    259257        usb_log_debug("Unregister endpoint %d:%d %d.\n",
    260258            address, endpoint, direction);
    261         endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager,
    262             address, endpoint, direction, NULL);
    263         if (ep != NULL) {
    264                 usb_device_keeper_del_ep(&hc->manager, address, ep);
    265         }
    266259        return usb_endpoint_manager_unregister_ep(&hc->ep_manager, address,
    267260            endpoint, direction);
     
    435428        if (ret != EOK)
    436429                return ret;
    437         usb_device_keeper_reset_if_need(&hc->manager, target, setup_data);
     430        usb_endpoint_manager_reset_if_need(&hc->ep_manager, target, setup_data);
    438431        batch_control_write(batch);
    439432        ret = hc_schedule(hc, batch);
Note: See TracChangeset for help on using the changeset viewer.