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

Changeset 32aef25b in mainline for uspace/drv/ohci/root_hub.c


Ignore:
Timestamp:
2011-04-22T12:51:10Z (11 years ago)
Author:
Matus Dekanek <smekideki@…>
Branches:
lfn, master
Children:
564a2b3, 9bff1ea
Parents:
c7d19d84 (diff), 9014dcd (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:

fix for usbhub

File:
1 edited

Legend:

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

    rc7d19d84 r32aef25b  
    217217        instance->registers->rh_desc_a |= RHDA_NPS_FLAG;
    218218        instance->unfinished_interrupt_transfer = NULL;
     219        instance->interrupt_buffer = malloc((instance->port_count + 8)/8);
    219220        usb_log_info("OHCI root hub with %d ports.\n", instance->port_count);
    220221        return EOK;
     
    471472        size_t * buffer_size) {
    472473        int bit_count = instance->port_count + 1;
    473         (*buffer_size) = (bit_count / 8) + ((bit_count % 8 == 0) ? 0 : 1);
    474 
    475         (*buffer) = malloc(*buffer_size);
     474        (*buffer_size) = (bit_count+7 / 8);
     475
     476        (*buffer) = instance->interrupt_buffer;//malloc(*buffer_size);
    476477        uint8_t * bitmap = (uint8_t*) (*buffer);
    477478        uint32_t mask = (1 << (USB_HUB_FEATURE_C_HUB_LOCAL_POWER + 16))
Note: See TracChangeset for help on using the changeset viewer.