Changeset e3c762cd in mainline for generic/src/ddi/ddi.c

Timestamp:

2006-05-05T11:59:19Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

de07bcf

Parents:

22cf454d

Message:

Complete implementation of copy_from_uspace() and copy_to_uspace()
for amd64 and ia32. Other architectures still compile and run,
but need to implement their own assembly-only memcpy(), memcpy_from_uspace(),
memcpy_to_uspace() and their failover parts. For these architectures
only dummy implementations are provided.

File:

• generic/src/ddi/ddi.c (modified) (3 diffs)

generic/src/ddi/ddi.c

@@ -41 +41 @@
 #include <security/cap.h>
 #include <mm/frame.h>
-#include <mm/page.h>
 #include <mm/as.h>
 #include <synch/spinlock.h>
+#include <syscall/copy.h>
 #include <arch.h>
 #include <align.h>
@@ -184 +184 @@
 {
         ddi_memarg_t arg;
-        
-        copy_from_uspace(&arg, uspace_mem_arg, sizeof(ddi_memarg_t));
+        int rc;
+        
+        rc = copy_from_uspace(&arg, uspace_mem_arg, sizeof(ddi_memarg_t));
+        if (rc != 0)
+                return (__native) rc;
+                
         return (__native) ddi_physmem_map((task_id_t) arg.task_id, ALIGN_DOWN((__address) arg.phys_base, FRAME_SIZE),
                                           ALIGN_DOWN((__address) arg.virt_base, PAGE_SIZE), (count_t) arg.pages,
@@ -200 +204 @@
 {
         ddi_ioarg_t arg;
-        
-        copy_from_uspace(&arg, uspace_io_arg, sizeof(ddi_ioarg_t));
+        int rc;
+        
+        rc = copy_from_uspace(&arg, uspace_io_arg, sizeof(ddi_ioarg_t));
+        if (rc != 0)
+                return (__native) rc;
+                
         return (__native) ddi_iospace_enable((task_id_t) arg.task_id, (__address) arg.ioaddr, (size_t) arg.size);
 }