Changeset 4f5dc18 in mainline for contrib/arch/kernel/kernel.adl

Timestamp:

2009-11-03T21:36:54Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1647323

Parents:

bbddafb (diff), b1c21c2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline.

File:

• contrib/arch/kernel/kernel.adl (modified) (15 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 @@
                 unative_t sys_debug_disable_console(void);
         protocol:
-                ?sys_debug_enable_console +
-                ?sys_debug_disable_console
+                (
+                        ?sys_debug_enable_console +
+                        ?sys_debug_disable_console
+                )*
 };
 
@@ -25 +27 @@
                 unative_t sys_tls_set(unative_t addr);
         protocol:
-                ?sys_tls_set
+                ?sys_tls_set*
 };
 
@@ -38 +40 @@
                 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
+                )*
 };
 
@@ -50 +54 @@
                 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
+                )*
 };
 
@@ -58 +64 @@
                 unative_t sys_program_spawn_loader(char *uspace_name, size_t name_len);
         protocol:
-                ?sys_program_spawn_loader
+                ?sys_program_spawn_loader*
 };
 
@@ -68 +74 @@
                 unative_t sys_futex_wakeup(uintptr_t uaddr);
         protocol:
-                ?sys_futex_sleep_timeout +
-                ?sys_futex_wakeup
+                (
+                        ?sys_futex_sleep_timeout +
+                        ?sys_futex_wakeup
+                )*
 };
 
@@ -76 +84 @@
                 unative_t sys_smc_coherence(uintptr_t va, size_t size);
         protocol:
-                ?sys_smc_coherence
+                ?sys_smc_coherence*
 };
 
@@ -92 +100 @@
                 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
+                )*
 };
 
@@ -132 +142 @@
                 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
+                )*
 };
 
@@ -149 +161 @@
                 unative_t sys_event_subscribe(unative_t evno, unative_t method);
         protocol:
-                ?sys_event_subscribe
+                ?sys_event_subscribe*
 };
 
@@ -159 +171 @@
                 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
+                )*
 };
 
@@ -182 +196 @@
                 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
+                )*
 };
 
@@ -197 +213 @@
                 unative_t sys_sysinfo_value(unatice_t ptr, unative_t len);
         protocol:
-                ?sys_sysinfo_valid +
-                ?sys_sysinfo_value
+                (
+                        ?sys_sysinfo_valid +
+                        ?sys_sysinfo_value
+                )*
 };
 
@@ -205 +223 @@
                 unative_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid_arg);
         protocol:
-                ?sys_ipc_connect_kbox
+                ?sys_ipc_connect_kbox*
 };