Changeset 1a93bb0 in mainline for uspace/drv/uhci-hcd/uhci.c


Ignore:
Timestamp:
2011-02-25T23:27:26Z (14 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c3ae877
Parents:
5f183dc
Message:

Preperly support both low and full speed devices using device_keeper

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/uhci-hcd/uhci.c

    r5f183dc r1a93bb0  
    6969        assert(hc);
    7070
    71         usb_address_t addr = usb_address_keeping_find(&hc->address_manager,
     71//      usb_address_t addr = usb_address_keeping_find(&hc->address_manager,
     72//          handle);
     73        usb_address_t addr = device_keeper_find(&hc->device_manager,
    7274            handle);
    7375        if (addr < 0) {
     
    141143
    142144        instance->cleaner = fibril_create(uhci_interrupt_emulator, instance);
    143         fibril_add_ready(instance->cleaner);
     145//      fibril_add_ready(instance->cleaner);
    144146
    145147        instance->debug_checker = fibril_create(uhci_debug_checker, instance);
     
    161163
    162164        /* enable all interrupts, but resume interrupt */
    163 //      pio_write_16(&instance->registers->usbintr,
    164 //                UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET);
     165        pio_write_16(&instance->registers->usbintr,
     166                  UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET);
    165167
    166168        /* Start the hc with large(64B) packet FSBR */
     
    207209
    208210        /* init address keeper(libusb) */
    209         usb_address_keeping_init(&instance->address_manager, USB11_ADDRESS_MAX);
    210         usb_log_debug("Initialized address manager.\n");
     211        device_keeper_init(&instance->device_manager);
     212        usb_log_debug("Initialized device manager.\n");
    211213
    212214        return EOK;
     
    259261        assert(instance);
    260262        assert(batch);
    261         const int low_speed = (batch->speed == LOW_SPEED);
     263        const int low_speed = (batch->speed == USB_SPEED_LOW);
    262264        if (!allowed_usb_packet(
    263265            low_speed, batch->transfer_type, batch->max_packet_size)) {
Note: See TracChangeset for help on using the changeset viewer.