Changeset 8c52f66 in mainline for contrib/arch/kernel/kernel.adl

Timestamp:

2009-09-11T16:21:29Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

2ac62cf

Parents:

e8e2ae1

Message:

simplify and add missing protocols

File:

• contrib/arch/kernel/kernel.adl (modified) (16 diffs)

contrib/arch/kernel/kernel.adl

@@ -7 +7 @@
                 unative_t sys_klog(int fd, const void *buf, size_t size);
         protocol:
-                sys_klog*
+                ?sys_klog*
 };
 
@@ -17 +17 @@
                 uintptr_t sys_debug_disable_console(void);
         protocol:
-                (sys_debug_enable_console + sys_debug_disable_console)*
+                (?sys_debug_enable_console + ?sys_debug_disable_console)*
 };
 
@@ -24 +24 @@
                 unative_t sys_tls_set(unative_t addr);
         protocol:
-                sys_tls_set*
+                ?sys_tls_set*
 };
 
@@ -37 +37 @@
                 unative_t sys_thread_get_id(thread_id_t *uspace_thread_id);
         protocol:
-                (sys_thread_create + sys_thread_get_id)* ; sys_thread_exit
+                (?sys_thread_create + ?sys_thread_get_id)* ; ?sys_thread_exit
 };
 
@@ -47 +47 @@
                 unative_t sys_task_get_id(task_id_t *uspace_task_id);
         protocol:
-                (sys_task_set_name + sys_task_get_id)*
+                (?sys_task_set_name + ?sys_task_get_id)*
 };
 
@@ -54 +54 @@
                 unative_t sys_program_spawn_loader(char *uspace_name, size_t name_len);
         protocol:
-                sys_program_spawn_loader*
+                ?sys_program_spawn_loader*
 };
 
@@ -64 +64 @@
                 unative_t sys_futex_wakeup(uintptr_t uaddr);
         protocol:
-                (sys_futex_sleep_timeout + sys_futex_wakeup)*
+                (?sys_futex_sleep_timeout + ?sys_futex_wakeup)*
 };
 
@@ -71 +71 @@
                 unative_t sys_smc_coherence(uintptr_t va, size_t size);
         protocol:
-                sys_smc_coherence*
+                ?sys_smc_coherence*
 };
 
@@ -87 +87 @@
                 unative_t sys_as_area_destroy(uintptr_t address);
         protocol:
-                (sys_as_area_create + sys_as_area_resize + sys_as_area_change_flags + sys_as_area_destroy)*
+                (?sys_as_area_create + ?sys_as_area_resize + ?sys_as_area_change_flags + ?sys_as_area_destroy)*
 };
 
@@ -124 +124 @@
                 unative_t sys_ipc_poke(void);
         protocol:
-                (sys_ipc_call_sync_fast + sys_ipc_call_sync_slow + sys_ipc_call_async_fast + sys_ipc_call_async_slow + sys_ipc_forward_fast + sys_ipc_forward_slow + sys_ipc_answer_fast + sys_ipc_answer_slow + sys_ipc_hangup + sys_ipc_wait_for_call + sys_ipc_poke)*
+                (?sys_ipc_call_sync_fast + ?sys_ipc_call_sync_slow + ?sys_ipc_call_async_fast + ?sys_ipc_call_async_slow + ?sys_ipc_forward_fast + ?sys_ipc_forward_slow + ?sys_ipc_answer_fast + ?sys_ipc_answer_slow + ?sys_ipc_hangup + ?sys_ipc_wait_for_call + ?sys_ipc_poke)*
 };
 
@@ -131 +131 @@
                 unative_t sys_event_subscribe(unative_t evno, unative_t method);
         protocol:
-                sys_event_subscribe*
+                ?sys_event_subscribe*
 };
 
@@ -141 +141 @@
                 unative_t sys_cap_revoke(sysarg64_t *uspace_taskid_arg, cap_t caps);
         protocol:
-                (sys_cap_grant + sys_cap_rewoke)*
+                (?sys_cap_grant + ?sys_cap_rewoke)*
 };
 
@@ -163 +163 @@
                 unative_t sys_ipc_unregister_irq(inr_t inr, devno_t devno);
         protocol:
-                (sys_enable_iospace + sys_physmem_map + sys_device_assign_devno + sys_preempt_control + sys_ipc_register_irq + sys_ipc_unregister_irq)*
+                (?sys_enable_iospace + ?sys_physmem_map + ?sys_device_assign_devno + ?sys_preempt_control + ?sys_ipc_register_irq + ?sys_ipc_unregister_irq)*
 };
 
@@ -173 +173 @@
                 unative_t sys_sysinfo_value(unatice_t ptr, unative_t len);
         protocol:
-                (sys_sysinfo_valid + sys_sysinfo_value)*
+                (?sys_sysinfo_valid + ?sys_sysinfo_value)*
 };
 
@@ -180 +180 @@
                 unative_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid_arg);
         protocol:
-                sys_ipc_connect_kbox*
+                ?sys_ipc_connect_kbox*
 };
 
@@ -261 +261 @@
         delegate kernel_task to kernel_proc:kernel_task;
         delegate kernel_program to kernel_proc:kernel_program;
+        delegate kernel_futex to kernel_synch:kernel_futex;
+        delegate kernel_smc to kernel_synch:kernel_smc;
         delegate kernel_as to kernel_mm:kernel_as;
         delegate kernel_ipc to kernel_ipc:kernel_sys;