Changeset 24f3874 in mainline for generic/src

Timestamp:

2006-04-23T16:09:15Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7f0837c

Parents:

1f41004e

Message:

Reorganize syscall names to better correspond to kernel architecture.
Add dummy placeholders for SYS_AS_AREA_SHARE_APPROVE and
SYS_AS_AREA_SHARE_PERFORM syscalls.

Location:

generic/src

Files:

• ddi/ddi.c (modified) (6 diffs)
• mm/as.c (modified) (1 diff)
• proc/task.c (modified) (1 diff)
• syscall/syscall.c (modified) (4 diffs)

generic/src/ddi/ddi.c

@@ -51 +51 @@
  *         there was a problem in creating address space area.
  */
-static int ddi_map_physmem(task_id_t id, __address pf, __address vp, count_t pages, bool writable)
+static int ddi_physmem_map(task_id_t id, __address pf, __address vp, count_t pages, bool writable)
 {
         ipl_t ipl;
@@ -121 +121 @@
  *         ENOENT if there is no task matching the specified ID.
  */
-static int ddi_enable_iospace(task_id_t id, __address ioaddr, size_t size)
+static int ddi_iospace_enable(task_id_t id, __address ioaddr, size_t size)
 {
         ipl_t ipl;
@@ -159 +159 @@
         spinlock_unlock(&tasks_lock);
 
-        rc = ddi_enable_iospace_arch(t, ioaddr, size);
+        rc = ddi_iospace_enable_arch(t, ioaddr, size);
         
         spinlock_unlock(&t->lock);
@@ -172 +172 @@
  * @return 0 on success, otherwise it returns error code found in errno.h
  */ 
-__native sys_map_physmem(ddi_memarg_t *uspace_mem_arg)
+__native sys_physmem_map(ddi_memarg_t *uspace_mem_arg)
 {
         ddi_memarg_t arg;
         
         copy_from_uspace(&arg, uspace_mem_arg, sizeof(ddi_memarg_t));
-        return (__native) ddi_map_physmem((task_id_t) arg.task_id, ALIGN_DOWN((__address) arg.phys_base, FRAME_SIZE),
+        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,
                                           (bool) arg.writable);
@@ -188 +188 @@
  * @return 0 on success, otherwise it returns error code found in errno.h
  */ 
-__native sys_enable_iospace(ddi_ioarg_t *uspace_io_arg)
+__native sys_iospace_enable(ddi_ioarg_t *uspace_io_arg)
 {
         ddi_ioarg_t arg;
         
         copy_from_uspace(&arg, uspace_io_arg, sizeof(ddi_ioarg_t));
-        return (__native) ddi_enable_iospace((task_id_t) arg.task_id, (__address) arg.ioaddr, (size_t) arg.size);
+        return (__native) ddi_iospace_enable((task_id_t) arg.task_id, (__address) arg.ioaddr, (size_t) arg.size);
 }
 
@@ -202 +202 @@
         return ddi_int_control_arch(enable, flags);
 }
-

generic/src/mm/as.c

@@ -431 +431 @@
  * @return address on success, (__address) -1 otherwise.
  */ 
-__address as_remap(as_t *as, __address address, size_t size, int flags)
+__address as_area_resize(as_t *as, __address address, size_t size, int flags)
 {
         as_area_t *area = NULL;

generic/src/proc/task.c

@@ -164 +164 @@
  * @return Always returns 0.
  */
-__native sys_get_task_id(task_id_t *uspace_task_id)
+__native sys_task_get_id(task_id_t *uspace_task_id)
 {
         /*

generic/src/syscall/syscall.c

@@ -52 +52 @@
 }
 
-static __native sys_mmap(void *address, size_t size, int flags)
+static __native sys_as_area_create(void *address, size_t size, int flags)
 {
         if (as_area_create(AS, flags, size, (__address) address))
@@ -60 +60 @@
 }
 
-static __native sys_mremap(void *address, size_t size, int flags)
+static __native sys_as_area_resize(void *address, size_t size, int flags)
 {
-        return as_remap(AS, (__address) address, size, 0);
+        return as_area_resize(AS, (__address) address, size, 0);
+}
+
+static __native sys_as_area_share_approve()
+{
+        return 0;
+}
+
+static __native sys_as_area_share_perform()
+{
+        return 0;
 }
 
@@ -86 +96 @@
         sys_thread_create,
         sys_thread_exit,
+        sys_task_get_id,
         sys_futex_sleep_timeout,
         sys_futex_wakeup,
-        sys_mmap,
-        sys_mremap,
-        sys_get_task_id,
+        sys_as_area_create,
+        sys_as_area_resize,
+        sys_as_area_share_approve,
+        sys_as_area_share_perform,
         sys_ipc_call_sync_fast,
         sys_ipc_call_sync,
@@ -100 +112 @@
         sys_ipc_wait_for_call,
         sys_ipc_hangup,
-        sys_map_physmem,
-        sys_enable_iospace
+        sys_physmem_map,
+        sys_iospace_enable
 };