Changeset e28175d in mainline for kernel/generic/src/ddi/ddi.c

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (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.

git-author:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

File:

• kernel/generic/src/ddi/ddi.c (modified) (9 diffs)

kernel/generic/src/ddi/ddi.c

@@ -248 +248 @@
  */
 sys_errno_t sys_physmem_map(uintptr_t phys, size_t pages, unsigned int flags,
-    void *virt_ptr, uintptr_t bound)
+    uspace_ptr_uintptr_t virt_ptr, uintptr_t bound)
 {
         uintptr_t virt;
@@ -262 +262 @@
         rc = copy_to_uspace(virt_ptr, &virt, sizeof(virt));
         if (rc != EOK) {
-                physmem_unmap((uintptr_t) virt);
+                physmem_unmap(virt);
                 return rc;
         }
@@ -393 +393 @@
  *
  */
-sys_errno_t sys_iospace_enable(ddi_ioarg_t *uspace_io_arg)
+sys_errno_t sys_iospace_enable(uspace_ptr_ddi_ioarg_t uspace_io_arg)
 {
         ddi_ioarg_t arg;
@@ -404 +404 @@
 }
 
-sys_errno_t sys_iospace_disable(ddi_ioarg_t *uspace_io_arg)
+sys_errno_t sys_iospace_disable(uspace_ptr_ddi_ioarg_t uspace_io_arg)
 {
         ddi_ioarg_t arg;
@@ -465 +465 @@
 
 sys_errno_t sys_dmamem_map(size_t size, unsigned int map_flags, unsigned int flags,
-    void *phys_ptr, void *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) {
@@ -473 +473 @@
 
                 uintptr_t phys;
-                errno_t rc = dmamem_map((uintptr_t) virt_ptr, size, map_flags,
+                errno_t rc = dmamem_map(virt_ptr, size, map_flags,
                     flags, &phys);
 
@@ -481 +481 @@
                 rc = copy_to_uspace(phys_ptr, &phys, sizeof(phys));
                 if (rc != EOK) {
-                        dmamem_unmap((uintptr_t) virt_ptr, size);
+                        dmamem_unmap(virt_ptr, size);
                         return rc;
                 }
@@ -508 +508 @@
                 rc = copy_to_uspace(phys_ptr, &phys, sizeof(phys));
                 if (rc != EOK) {
-                        dmamem_unmap_anonymous((uintptr_t) virt);
+                        dmamem_unmap_anonymous(virt);
                         return rc;
                 }
@@ -514 +514 @@
                 rc = copy_to_uspace(virt_ptr, &virt, sizeof(virt));
                 if (rc != EOK) {
-                        dmamem_unmap_anonymous((uintptr_t) virt);
+                        dmamem_unmap_anonymous(virt);
                         return rc;
                 }