Changeset 00aece0 in mainline for kernel/generic/include/ddi/ddi.h


Ignore:
Timestamp:
2012-02-18T16:47:38Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4449c6c
Parents:
bd5f3b7 (diff), f943dd3 (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

    rbd5f3b7 r00aece0  
    5555extern void ddi_parea_register(parea_t *);
    5656
    57 extern sysarg_t sys_physmem_map(sysarg_t, sysarg_t, sysarg_t, sysarg_t);
     57extern sysarg_t sys_physmem_map(uintptr_t, size_t, unsigned int, void *,
     58    uintptr_t);
     59extern sysarg_t sys_physmem_unmap(uintptr_t);
     60
     61extern sysarg_t sys_dmamem_map(size_t, unsigned int, unsigned int, void *,
     62    void *, uintptr_t);
     63extern sysarg_t sys_dmamem_unmap(uintptr_t, size_t, unsigned int);
     64
    5865extern sysarg_t sys_iospace_enable(ddi_ioarg_t *);
     66extern sysarg_t sys_iospace_disable(ddi_ioarg_t *);
    5967
    6068/*
Note: See TracChangeset for help on using the changeset viewer.