Changeset fefc27d in mainline for uspace/drv/ohci/root_hub.c


Ignore:
Timestamp:
2011-04-03T10:15:39Z (14 years ago)
Author:
Matus Dekanek <smekideki@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6c399765
Parents:
4fbcd2a (diff), b8f7a0d2 (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:

merge with usb/development

File:
1 edited

Legend:

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

    r4fbcd2a rfefc27d  
    252252
    253253
    254         usb_log_info("OHCI root hub with %d ports.\n", regs->rh_desc_a & 0xff);
     254        usb_log_info("OHCI root hub with %d ports.\n", instance->port_count);
    255255
    256256        //start generic usb hub driver
     
    275275        if(port<1 || port>instance->port_count)
    276276                return EINVAL;
    277         uint32_t * uint32_buffer = (uint32_t*)request->buffer;
     277        uint32_t * uint32_buffer = (uint32_t*)request->transport_buffer;
    278278        request->transfered_size = 4;
    279279        uint32_buffer[0] = instance->registers->rh_port_status[port -1];
     
    292292static int process_get_hub_status_request(rh_t *instance,
    293293                usb_transfer_batch_t * request){
    294         uint32_t * uint32_buffer = (uint32_t*)request->buffer;
     294        uint32_t * uint32_buffer = (uint32_t*)request->transport_buffer;
    295295        //bits, 0,1,16,17
    296296        request->transfered_size = 4;
     
    457457        if(request->buffer_size != 1)
    458458                return EINVAL;
    459         request->buffer[0] = 1;
     459        request->transport_buffer[0] = 1;
    460460        request->transfered_size = 1;
    461461        return EOK;
Note: See TracChangeset for help on using the changeset viewer.