Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 6fb003e in mainline for uspace/drv/ohci/ohci.c


Ignore:
Timestamp:
2011-05-07T13:40:03Z (11 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master
Children:
02804e1, 1866945
Parents:
bc02b83 (diff), 7ab7c7f6 (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:

Fixed: OHCI: use devices are not detected at startup time

File:
1 edited

Legend:

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

    rbc02b83 r6fb003e  
    5454{
    5555        assert(dev);
     56        assert(dev->driver_data);
    5657        hc_t *hc = &((ohci_t*)dev->driver_data)->hc;
    5758        uint16_t status = IPC_GET_ARG1(*call);
     
    152153        usb_log_debug("Memory mapped regs at %p (size %zu), IRQ %d.\n",
    153154            (void *) mem_reg_base, mem_reg_size, irq);
    154 
    155         ret = pci_disable_legacy(device);
    156         CHECK_RET_DEST_FUN_RETURN(ret,
    157             "Failed(%d) to disable legacy USB: %s.\n", ret, str_error(ret));
    158155
    159156        bool interrupts = false;
     
    212209            "Failed(%d) to create root hub function.\n", ret);
    213210
    214         hc_register_hub(&instance->hc, instance->rh_fun);
    215211
    216212        instance->rh_fun->ops = &rh_ops;
    217213        instance->rh_fun->driver_data = NULL;
    218         ret = ddf_fun_bind(instance->rh_fun);
    219         CHECK_RET_FINI_RETURN(ret,
    220             "Failed(%d) to register OHCI root hub.\n", ret);
    221 
     214       
     215        device->driver_data = instance;
     216
     217        hc_start_hw(&instance->hc);
    222218        return EOK;
    223219#undef CHECK_RET_FINI_RETURN
Note: See TracChangeset for help on using the changeset viewer.