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

Changeset bba0dc20 in mainline


Ignore:
Timestamp:
2011-05-07T10:25:36Z (11 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master
Children:
5d07f54
Parents:
f1d16663
Message:

Minor initialization fixes

File:
1 edited

Legend:

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

    rf1d16663 rbba0dc20  
    110110            ret, str_error(ret));
    111111
     112        list_initialize(&instance->pending_batches);
    112113        usb_device_keeper_init(&instance->manager);
    113114        ret = usb_endpoint_manager_init(&instance->ep_manager,
     
    116117            str_error(ret));
    117118
    118         hc_gain_control(instance);
    119119        ret = hc_init_memory(instance);
    120120        CHECK_RET_RETURN(ret, "Failed to create OHCI memory structures: %s.\n",
    121121            str_error(ret));
     122#undef CHECK_RET_RETURN
     123
     124
    122125//      hc_init_hw(instance);
     126        hc_gain_control(instance);
    123127        fibril_mutex_initialize(&instance->guard);
    124128
     
    131135        }
    132136
    133         list_initialize(&instance->pending_batches);
    134 #undef CHECK_RET_RETURN
    135137        return EOK;
    136138}
     
    338340            (uint32_t*)((char*)instance->registers + 0x100);
    339341        usb_log_debug("OHCI legacy register %p: %x.\n",
    340                 ohci_emulation_reg, *ohci_emulation_reg);
    341         *ohci_emulation_reg &= ~0x1;
     342            ohci_emulation_reg, *ohci_emulation_reg);
     343        /* Do not change A20 state */
     344        *ohci_emulation_reg &= 0x100;
     345        usb_log_debug("OHCI legacy register %p: %x.\n",
     346            ohci_emulation_reg, *ohci_emulation_reg);
    342347
    343348        /* Interrupt routing enabled => smm driver is active */
Note: See TracChangeset for help on using the changeset viewer.