Changeset 961c29e8 in mainline


Ignore:
Timestamp:
2011-08-25T14:40:35Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cc34f5f0
Parents:
620c710
Message:

ohci: hub switched to generic hcd

Location:
uspace/drv/bus/usb/ohci
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/usb/ohci/hc.c

    r620c710 r961c29e8  
    133133
    134134        const usb_address_t hub_address =
    135             device_keeper_get_free_address(&instance->manager, USB_SPEED_FULL);
     135            device_keeper_get_free_address(
     136                &instance->generic.dev_manager, USB_SPEED_FULL);
    136137        if (hub_address <= 0) {
    137138                usb_log_error("Failed to get OHCI root hub address: %s\n",
     
    141142        instance->rh.address = hub_address;
    142143        usb_device_keeper_bind(
    143             &instance->manager, hub_address, hub_fun->handle);
     144            &instance->generic.dev_manager, hub_address, hub_fun->handle);
    144145
    145146#define CHECK_RET_RELEASE(ret, message...) \
     
    200201
    201202        ret = hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11);
     203        CHECK_RET_RETURN(ret, "Failed to initialize endpoint manager: %s.\n",
     204            str_error(ret));
    202205        instance->generic.private_data = instance;
    203206        instance->generic.schedule = schedule;
  • uspace/drv/bus/usb/ohci/ohci.c

    r620c710 r961c29e8  
    8989{
    9090        assert(fun);
    91         usb_device_keeper_t *manager = &dev_to_ohci(fun->dev)->hc.generic.dev_manager;
     91        usb_device_keeper_t *manager =
     92            &dev_to_ohci(fun->dev)->hc.generic.dev_manager;
    9293
    9394        usb_address_t addr = usb_device_keeper_find(manager, handle);
Note: See TracChangeset for help on using the changeset viewer.