Changeset 1440eae in mainline for uspace/lib/c/include/ddi.h


Ignore:
Timestamp:
2011-12-22T12:04:54Z (12 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3819ce5
Parents:
65d7b0a (diff), a438de4 (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 mainline

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/include/ddi.h

    r65d7b0a r1440eae  
    4242extern int device_assign_devno(void);
    4343
    44 extern int physmem_map(void *, void *, size_t, unsigned int);
     44extern int physmem_map(void *, size_t, unsigned int, void **);
    4545
    4646extern int dmamem_map(void *, size_t, unsigned int, unsigned int, void **);
    4747extern int dmamem_map_anonymous(size_t, unsigned int, unsigned int, void **,
    4848    void **);
    49 extern int dmamem_unmap(void *, size_t, unsigned int);
     49extern int dmamem_unmap(void *, size_t);
    5050extern int dmamem_unmap_anonymous(void *);
    5151
    … …  
    5353extern int pio_enable(void *, size_t, void **);
    5454
    55 extern int register_irq(int, int, int, irq_code_t *);
    56 extern int unregister_irq(int, int);
     55extern int irq_register(int, int, int, irq_code_t *);
     56extern int irq_unregister(int, int);
    5757
    5858#endif
Note: See TracChangeset for help on using the changeset viewer.