Changeset bc73be3 in mainline for kernel/generic/include/ddi/ddi.h

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:

• kernel/generic/include/ddi/ddi.h (modified) (1 diff)

kernel/generic/include/ddi/ddi.h

@@ -60 +60 @@
 extern void ddi_parea_register(parea_t *);
 
+extern void *pio_map(void *, size_t);
+extern void pio_unmap(void *, void *, size_t);
+
 extern sys_errno_t sys_physmem_map(uintptr_t, size_t, unsigned int, void *,
     uintptr_t);