Changeset 8da51ad in mainline

Timestamp:

2006-06-02T00:28:19Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

f8d069e8

Parents:

3f31742

Message:

Removes unnecessary parameter for map_physmem syscall.

Location:

generic

Files:

• include/ddi/ddi.h (modified) (1 diff)
• src/ddi/ddi.c (modified) (5 diffs)

generic/include/ddi/ddi.h

@@ -34 +34 @@
 #include <typedefs.h>
 
-extern __native sys_physmem_map(ddi_memarg_t *uspace_mem_arg);
+__native sys_physmem_map(__native phys_base, __native virt_base, __native pages, 
+                         __native flags);
 extern __native sys_iospace_enable(ddi_ioarg_t *uspace_io_arg);
 extern __native sys_preempt_control(int enable);

generic/src/ddi/ddi.c

@@ -48 +48 @@
 #include <errno.h>
 
-/** Map piece of physical memory into virtual address space of specified task.
- *
- * @param id Task ID of the destination task.
+/** Map piece of physical memory into virtual address space of current task.
+ *
  * @param pf Physical frame address of the starting frame.
  * @param vp Virtual page address of the starting page.
@@ -60 +59 @@
  *         there was a problem in creating address space area.
  */
-static int ddi_physmem_map(task_id_t id, __address pf, __address vp, count_t pages, int flags)
+static int ddi_physmem_map(__address pf, __address vp, count_t pages, int flags)
+{
+        ipl_t ipl;
+        cap_t caps;
+        mem_backend_data_t backend_data;
+
+        backend_data.base = pf;
+        backend_data.frames = pages;
+        
+        /*
+         * Make sure the caller is authorised to make this syscall.
+         */
+        caps = cap_get(TASK);
+        if (!(caps & CAP_MEM_MANAGER))
+                return EPERM;
+
+        ipl = interrupts_disable();
+        /* Lock the task and release the lock protecting tasks_btree. */
+        spinlock_lock(&TASK->lock);
+        
+        if (!as_area_create(TASK->as, flags, pages * PAGE_SIZE, vp, AS_AREA_ATTR_NONE,
+                &phys_backend, &backend_data)) {
+                /*
+                 * The address space area could not have been created.
+                 * We report it using ENOMEM.
+                 */
+                spinlock_unlock(&TASK->lock);
+                interrupts_restore(ipl);
+                return ENOMEM;
+        }
+        
+        /*
+         * Mapping is created on-demand during page fault.
+         */
+        
+        spinlock_unlock(&TASK->lock);
+        interrupts_restore(ipl);
+        return 0;
+}
+
+/** Enable range of I/O space for task.
+ *
+ * @param id Task ID of the destination task.
+ * @param ioaddr Starting I/O address.
+ * @param size Size of the enabled I/O space..
+ *
+ * @return 0 on success, EPERM if the caller lacks capabilities to use this syscall,
+ *         ENOENT if there is no task matching the specified ID.
+ */
+static int ddi_iospace_enable(task_id_t id, __address ioaddr, size_t size)
 {
         ipl_t ipl;
         cap_t caps;
         task_t *t;
-        mem_backend_data_t backend_data;
-
-        backend_data.base = pf;
-        backend_data.frames = pages;
+        int rc;
         
         /*
@@ -74 +119 @@
          */
         caps = cap_get(TASK);
-        if (!(caps & CAP_MEM_MANAGER))
+        if (!(caps & CAP_IO_MANAGER))
                 return EPERM;
         
@@ -100 +145 @@
         spinlock_lock(&t->lock);
         spinlock_unlock(&tasks_lock);
-        
-        if (!as_area_create(t->as, flags, pages * PAGE_SIZE, vp, AS_AREA_ATTR_NONE,
-                &phys_backend, &backend_data)) {
-                /*
-                 * The address space area could not have been created.
-                 * We report it using ENOMEM.
-                 */
-                spinlock_unlock(&t->lock);
-                interrupts_restore(ipl);
-                return ENOMEM;
-        }
-        
-        /*
-         * Mapping is created on-demand during page fault.
-         */
-        
-        spinlock_unlock(&t->lock);
-        interrupts_restore(ipl);
-        return 0;
-}
-
-/** Enable range of I/O space for task.
- *
- * @param id Task ID of the destination task.
- * @param ioaddr Starting I/O address.
- * @param size Size of the enabled I/O space..
- *
- * @return 0 on success, EPERM if the caller lacks capabilities to use this syscall,
- *         ENOENT if there is no task matching the specified ID.
- */
-static int ddi_iospace_enable(task_id_t id, __address ioaddr, size_t size)
-{
-        ipl_t ipl;
-        cap_t caps;
-        task_t *t;
-        int rc;
-        
-        /*
-         * Make sure the caller is authorised to make this syscall.
-         */
-        caps = cap_get(TASK);
-        if (!(caps & CAP_IO_MANAGER))
-                return EPERM;
-        
-        ipl = interrupts_disable();
-        spinlock_lock(&tasks_lock);
-        
-        t = task_find_by_id(id);
-        
-        if (!t) {
-                /*
-                 * There is no task with the specified ID.
-                 */
-                spinlock_unlock(&tasks_lock);
-                interrupts_restore(ipl);
-                return ENOENT;
-        }
-
-        /*
-         * TODO: We are currently lacking support for task destroying.
-         * Once it is added to the kernel, we must take care to
-         * synchronize in a way that prevents race conditions here.
-         */
-        
-        /* Lock the task and release the lock protecting tasks_btree. */
-        spinlock_lock(&t->lock);
-        spinlock_unlock(&tasks_lock);
 
         rc = ddi_iospace_enable_arch(t, ioaddr, size);
@@ -177 +155 @@
 /** Wrapper for SYS_MAP_PHYSMEM syscall.
  *
- * @param User space address of memory DDI argument structure.
+ * @param phys_base Physical base address to map
+ * @param virt_base Destination virtual address
+ * @param pages Number of pages
+ * @param flags Flags of newly mapped pages
  *
  * @return 0 on success, otherwise it returns error code found in errno.h
  */ 
-__native sys_physmem_map(ddi_memarg_t *uspace_mem_arg)
-{
-        ddi_memarg_t arg;
-        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,
-                                          (int) arg.flags);
+__native sys_physmem_map(__native phys_base, __native virt_base, __native pages, 
+                         __native flags)
+{
+        return (__native) ddi_physmem_map(ALIGN_DOWN((__address) phys_base, FRAME_SIZE),
+                                          ALIGN_DOWN((__address) virt_base, PAGE_SIZE), (count_t) pages,
+                                          (int) flags);
 }