Changeset 5acf533 in mainline

Timestamp:

2019-06-20T14:36:59Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

962c89af

Parents:

d7dfa05

Message:

Use a more concrete type in ddi syscalls

Files:

• abi/include/_bits/native.h (modified) (1 diff)
• kernel/generic/include/ddi/ddi.h (modified) (1 diff)
• kernel/generic/src/ddi/ddi.c (modified) (2 diffs)

abi/include/_bits/native.h

@@ -70 +70 @@
 #endif
 
+// TODO: Put this in a better location.
 #define uspace_ptr_as_area_info_t uspace_ptr(as_area_info_t)
 #define uspace_ptr_as_area_pager_info_t uspace_ptr(as_area_pager_info_t)

kernel/generic/include/ddi/ddi.h

@@ -63 +63 @@
 extern void pio_unmap(void *, void *, size_t);
 
-extern sys_errno_t sys_physmem_map(uintptr_t, size_t, unsigned int, uspace_addr_t,
+extern sys_errno_t sys_physmem_map(uintptr_t, size_t, unsigned int, uspace_ptr_uintptr_t,
     uintptr_t);
 extern sys_errno_t sys_physmem_unmap(uintptr_t);
 
-extern sys_errno_t sys_dmamem_map(size_t, unsigned int, unsigned int, uspace_addr_t,
-    uspace_addr_t, uintptr_t);
+extern sys_errno_t sys_dmamem_map(size_t, unsigned int, unsigned int, uspace_ptr_uintptr_t,
+    uspace_ptr_uintptr_t, uintptr_t);
 extern sys_errno_t sys_dmamem_unmap(uintptr_t, size_t, unsigned int);
 

kernel/generic/src/ddi/ddi.c

@@ -248 +248 @@
  */
 sys_errno_t sys_physmem_map(uintptr_t phys, size_t pages, unsigned int flags,
-    uspace_addr_t virt_ptr, uintptr_t bound)
+    uspace_ptr_uintptr_t virt_ptr, uintptr_t bound)
 {
         uintptr_t virt;
@@ -465 +465 @@
 
 sys_errno_t sys_dmamem_map(size_t size, unsigned int map_flags, unsigned int flags,
-    uspace_addr_t phys_ptr, uspace_addr_t virt_ptr, uintptr_t bound)
+    uspace_ptr_uintptr_t phys_ptr, uspace_ptr_uintptr_t virt_ptr, uintptr_t bound)
 {
         if ((flags & DMAMEM_FLAGS_ANONYMOUS) == 0) {