Changes in contrib/arch/kernel/kernel.adl [6d4c549:8c52f66] in mainline

File:

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

contrib/arch/kernel/kernel.adl

@@ -3 +3 @@
  *****************************/
 
-interface sys_klog {
+interface kernel_klog {
                 /* Print using kernel facility */
                 unative_t sys_klog(int fd, const void *buf, size_t size);
@@ -10 +10 @@
 };
 
-interface sys_console {
+interface kernel_console {
                 /* Enable kernel console */
-                unative_t sys_debug_enable_console(void);
+                uintptr_t sys_debug_enable_console(void);
                 
                 /* Disable kernel console */
-                unative_t sys_debug_disable_console(void);
-        protocol:
-                (
-                        ?sys_debug_enable_console +
-                        ?sys_debug_disable_console
-                )*
-};
-
-interface sys_tls {
+                uintptr_t sys_debug_disable_console(void);
+        protocol:
+                (?sys_debug_enable_console + ?sys_debug_disable_console)*
+};
+
+interface kernel_tls {
                 /* Set thread-local storage pointer (on architectures where kernel mode is required) */
                 unative_t sys_tls_set(unative_t addr);
@@ -30 +27 @@
 };
 
-interface sys_thread {
+interface kernel_thread {
                 /* Create new thread */
                 unative_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name, size_t name_len, thread_id_t *uspace_thread_id);
@@ -40 +37 @@
                 unative_t sys_thread_get_id(thread_id_t *uspace_thread_id);
         protocol:
-                (
-                        ?sys_thread_create +
-                        ?sys_thread_get_id +
-                        ?sys_thread_exit
-                )*
-};
-
-interface sys_task {
+                (?sys_thread_create + ?sys_thread_get_id)* ; ?sys_thread_exit
+};
+
+interface kernel_task {
                 /* Set name fo the current task */
                 unative_t sys_task_set_name(const char *uspace_name, size_t name_len);
@@ -54 +47 @@
                 unative_t sys_task_get_id(task_id_t *uspace_task_id);
         protocol:
-                (
-                        ?sys_task_set_name +
-                        ?sys_task_get_id
-                )*
-};
-
-interface sys_program {
+                (?sys_task_set_name + ?sys_task_get_id)*
+};
+
+interface kernel_program {
                 /* Spawn a new instance of clonable loader service */
                 unative_t sys_program_spawn_loader(char *uspace_name, size_t name_len);
@@ -67 +57 @@
 };
 
-interface sys_futex {
+interface kernel_futex {
                 /* Sleep in a futex wait queue */
                 unative_t sys_futex_sleep_timeout(uintptr_t uaddr, uint32_t usec, int flags);
@@ -74 +64 @@
                 unative_t sys_futex_wakeup(uintptr_t uaddr);
         protocol:
-                (
-                        ?sys_futex_sleep_timeout +
-                        ?sys_futex_wakeup
-                )*
-};
-
-interface sys_smc {
+                (?sys_futex_sleep_timeout + ?sys_futex_wakeup)*
+};
+
+interface kernel_smc {
                 /* Enforce self-modifying code cache coherency */
                 unative_t sys_smc_coherence(uintptr_t va, size_t size);
@@ -87 +74 @@
 };
 
-interface sys_as {
+interface kernel_as {
                 /* Create new address space area */
                 unative_t sys_as_area_create(uintptr_t address, size_t size, int flags);
@@ -100 +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
-                )*
-};
-
-interface sys_ipc {
+                (?sys_as_area_create + ?sys_as_area_resize + ?sys_as_area_change_flags + ?sys_as_area_destroy)*
+};
+
+interface kernel_ipc {
                 /* Fast synchronous IPC call */
                 unative_t sys_ipc_call_sync_fast(unative_t phoneid, unative_t method, unative_t arg1, unative_t arg2, unative_t arg3, ipc_data_t *data);
@@ -142 +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
-                )*
-};
-
-interface sys_event {
+                (?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)*
+};
+
+interface kernel_event {
                 /* Subscribe to kernel event notifications */
                 unative_t sys_event_subscribe(unative_t evno, unative_t method);
@@ -164 +134 @@
 };
 
-interface sys_cap {
+interface kernel_cap {
                 /* Grant capabilities to a task */
                 unative_t sys_cap_grant(sysarg64_t *uspace_taskid_arg, cap_t caps);
@@ -171 +141 @@
                 unative_t sys_cap_revoke(sysarg64_t *uspace_taskid_arg, cap_t caps);
         protocol:
-                (
-                        ?sys_cap_grant +
-                        ?sys_cap_rewoke
-                )*
-};
-
-interface sys_ddi {
+                (?sys_cap_grant + ?sys_cap_rewoke)*
+};
+
+interface kernel_ddi {
                 /* Enable access I/O address space for the current task */
                 unative_t sys_enable_iospace(ddi_ioarg_t *uspace_io_arg);
@@ -196 +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
-                )*
-};
-
-interface sys_sysinfo {
+                (?sys_enable_iospace + ?sys_physmem_map + ?sys_device_assign_devno + ?sys_preempt_control + ?sys_ipc_register_irq + ?sys_ipc_unregister_irq)*
+};
+
+interface kernel_sysinfo {
                 /* Check for sysinfo key validity */
                 unative_t sys_sysinfo_valid(unative_t ptr, unative_t len);
@@ -213 +173 @@
                 unative_t sys_sysinfo_value(unatice_t ptr, unative_t len);
         protocol:
-                (
-                        ?sys_sysinfo_valid +
-                        ?sys_sysinfo_value
-                )*
-};
-
-interface sys_debug {
+                (?sys_sysinfo_valid + ?sys_sysinfo_value)*
+};
+
+interface kernel_debug {
                 /* Connect to the kernel debugging answerbox of a given task */
                 unative_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid_arg);
@@ -231 +188 @@
  *****************************************************/
 
-frame sys_console {
-        provides:
-                sys_klog sys_klog;
-                sys_console sys_console;
-};
-
-frame sys_proc {
-        provides:
-                sys_tls sys_tls;
-                sys_thread sys_thread;
-                sys_task sys_task;
-                sys_program sys_program;
-};
-
-frame sys_synch {
-        provides:
-                sys_futex sys_futex;
-                sys_smc sys_smc;
-};
-
-frame sys_mm {
-        provides:
-                sys_as sys_as;
-};
-
-frame sys_ipc {
-        provides:
-                sys_ipc sys_ipc;
-                sys_event sys_event;
-};
-
-frame sys_security {
-        provides:
-                sys_cap sys_cap;
-};
-
-frame sys_ddi {
-        provides:
-                sys_ddi sys_ddi;
-};
-
-frame sys_sysinfo {
-        provides:
-                sys_sysinfo sys_sysinfo;
-};
-
-frame sys_debug {
-        provides:
-                sys_debug sys_debug;
+frame kernel_console {
+        provides:
+                kernel_klog kernel_klog;
+                kernel_console kernel_console;
+};
+
+frame kernel_proc {
+        provides:
+                kernel_tls kernel_tls;
+                kernel_thread kernel_thread;
+                kernel_task kernel_task;
+                kernel_program kernel_program;
+};
+
+frame kernel_synch {
+        provides:
+                kernel_futex kernel_futex;
+                kernel_smc kernel_smc;
+};
+
+frame kernel_mm {
+        provides:
+                kernel_as kernel_as;
+};
+
+frame kernel_ipc {
+        provides:
+                kernel_ipc kernel_ipc;
+                kernel_event kernel_event;
+};
+
+frame kernel_security {
+        provides:
+                kernel_cap kernel_cap;
+};
+
+frame kernel_ddi {
+        provides:
+                kernel_ddi kernel_ddi;
+};
+
+frame kernel_sysinfo {
+        provides:
+                kernel_sysinfo kernel_sysinfo;
+};
+
+frame kernel_debug {
+        provides:
+                kernel_debug kernel_debug;
 };
 
@@ -288 +245 @@
 
 architecture kernel {
-        inst sys_console sys_console;
-        inst sys_proc sys_proc;
-        inst sys_synch sys_synch;
-        inst sys_mm sys_mm;
-        inst sys_ipc sys_ipc;
-        inst sys_security sys_security;
-        inst sys_ddi sys_ddi;
-        inst sys_sysinfo sys_sysinfo;
-        inst sys_debug sys_debug;
+        inst kernel_console kernel_console;
+        inst kernel_proc kernel_proc;
+        inst kernel_synch kernel_synch;
+        inst kernel_mm kernel_mm;
+        inst kernel_ipc kernel_ipc;
+        inst kernel_security kernel_security;
+        inst kernel_ddi kernel_ddi;
+        inst kernel_sysinfo kernel_sysinfo;
+        inst kernel_debug kernel_debug;
         
-        delegate sys_klog to sys_console:sys_klog;
-        delegate sys_console to sys_console:sys_console;
-        delegate sys_tls to sys_proc:sys_tls;
-        delegate sys_thread to sys_proc:sys_thread;
-        delegate sys_task to sys_proc:sys_task;
-        delegate sys_program to sys_proc:sys_program;
-        delegate sys_futex to sys_synch:sys_futex;
-        delegate sys_smc to sys_synch:sys_smc;
-        delegate sys_as to sys_mm:sys_as;
-        delegate sys_ipc to sys_ipc:sys_ipc;
-        delegate sys_event to sys_ipc:sys_event;
-        delegate sys_cap to sys_security:sys_cap;
-        delegate sys_ddi to sys_ddi:sys_ddi;
-        delegate sys_sysinfo to sys_sysinfo:sys_sysinfo;
-        delegate sys_debug to sys_debug:sys_debug;
-};
+        delegate kernel_klog to kernel_console:kernel_klog;
+        delegate kernel_console to kernel_console:kernel_console;
+        delegate kernel_tls to kernel_proc:kernel_tls;
+        delegate kernel_thread to kernel_proc:kernel_thread;
+        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;
+        delegate kernel_event to kernel_ipc:kernel_event;
+        delegate kernel_cap to kernel_security:kernel_cap;
+        delegate kernel_ddi to kernel_ddi:kernel_ddi;
+        delegate kernel_sysinfo to kernel_sysinfo:kernel_sysinfo;
+        delegate kernel_debug to kernel_debug:kernel_debug;
+};