Changeset 3f03199 in mainline for uspace/srv/hid/input/port/niagara.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/hid/input/port/niagara.c

    rdd7078c r3f03199  
    9797                return -1;
    9898       
    99         int rc = physmem_map((void *) paddr, 1,
    100             AS_AREA_READ | AS_AREA_WRITE, (void *) &input_buffer);
     99        int rc = physmem_map(paddr, 1, AS_AREA_READ | AS_AREA_WRITE,
     100            (void *) &input_buffer);
    101101        if (rc != 0) {
    102102                printf("Niagara: uspace driver couldn't map physical memory: %d\n",
Note: See TracChangeset for help on using the changeset viewer.