Changeset 7943c43 in mainline for kernel/generic/include/ddi/ddi.h


Ignore:
Timestamp:
2012-01-16T22:45:38Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
32817cc, 3fe58d3c
Parents:
9117ef9b (diff), 3ea725e (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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/ddi/ddi.h

    r9117ef9b r7943c43  
    5555extern void ddi_parea_register(parea_t *);
    5656
    57 extern sysarg_t sys_physmem_map(uintptr_t, uintptr_t, size_t, unsigned int);
     57extern sysarg_t sys_physmem_map(uintptr_t, size_t, unsigned int, void *,
     58    uintptr_t);
     59extern sysarg_t sys_physmem_unmap(uintptr_t);
    5860
    59 extern sysarg_t sys_dmamem_map(uintptr_t, size_t, unsigned int, unsigned int,
    60     void *);
     61extern sysarg_t sys_dmamem_map(size_t, unsigned int, unsigned int, void *,
     62    void *, uintptr_t);
    6163extern sysarg_t sys_dmamem_unmap(uintptr_t, size_t, unsigned int);
    6264
    6365extern sysarg_t sys_iospace_enable(ddi_ioarg_t *);
     66extern sysarg_t sys_iospace_disable(ddi_ioarg_t *);
    6467
    6568/*
Note: See TracChangeset for help on using the changeset viewer.