Changeset 5a6cc679 in mainline for uspace/lib/c/include/ddi.h


Ignore:
Timestamp:
2018-01-31T02:21:24Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a0a9cc2
Parents:
132ab5d1
Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works :)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/include/ddi.h

    r132ab5d1 r5a6cc679  
    5454typedef volatile uint64_t ioport64_t;
    5555
    56 extern int physmem_map(uintptr_t, size_t, unsigned int, void **);
    57 extern int physmem_unmap(void *);
     56extern errno_t physmem_map(uintptr_t, size_t, unsigned int, void **);
     57extern errno_t physmem_unmap(void *);
    5858
    59 extern int dmamem_map(void *, size_t, unsigned int, unsigned int, uintptr_t *);
    60 extern int dmamem_map_anonymous(size_t, uintptr_t, unsigned int, unsigned int,
     59extern errno_t dmamem_map(void *, size_t, unsigned int, unsigned int, uintptr_t *);
     60extern errno_t dmamem_map_anonymous(size_t, uintptr_t, unsigned int, unsigned int,
    6161    uintptr_t *, void **);
    62 extern int dmamem_unmap(void *, size_t);
    63 extern int dmamem_unmap_anonymous(void *);
     62extern errno_t dmamem_unmap(void *, size_t);
     63extern errno_t dmamem_unmap_anonymous(void *);
    6464
    65 extern int pio_enable_range(addr_range_t *, void **);
    66 extern int pio_enable_resource(pio_window_t *, hw_resource_t *, void **);
    67 extern int pio_enable(void *, size_t, void **);
    68 extern int pio_disable(void *, size_t);
     65extern errno_t pio_enable_range(addr_range_t *, void **);
     66extern errno_t pio_enable_resource(pio_window_t *, hw_resource_t *, void **);
     67extern errno_t pio_enable(void *, size_t, void **);
     68extern errno_t pio_disable(void *, size_t);
    6969
    7070typedef void (*trace_fnc)(const volatile void *place, uint64_t val,
    7171    volatile void* base, size_t size, void *data, bool write);
    7272
    73 extern int pio_trace_enable(void *, size_t, trace_fnc, void *);
     73extern errno_t pio_trace_enable(void *, size_t, trace_fnc, void *);
    7474extern void pio_trace_log(const volatile void *, uint64_t val, bool write);
    7575extern void pio_trace_disable(void *);
Note: See TracChangeset for help on using the changeset viewer.