Changeset 3f03199 in mainline for uspace/srv/bd/rd/rd.c


Ignore:
Timestamp:
2013-09-15T06:33:53Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9348862
Parents:
dd7078c (diff), 1c0cef0 (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 mainline changes.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/bd/rd/rd.c

    rdd7078c r3f03199  
    165165            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE;
    166166       
    167         ret = physmem_map((void *) addr_phys,
     167        ret = physmem_map(addr_phys,
    168168            ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, flags, &rd_addr);
    169169        if (ret != EOK) {
Note: See TracChangeset for help on using the changeset viewer.