Changeset 357b5f5 in mainline for contrib/arch/uspace/srv/ns/ns.adl

Timestamp:

2011-01-23T20:09:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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 mainline changes.

File:

• contrib/arch/uspace/srv/ns/ns.adl (modified) (1 diff)

contrib/arch/uspace/srv/ns/ns.adl

@@ -1 +1 @@
 interface ns {
                 /* Register a clonable service or a generic service */
-                ipcarg_t ipc_m_connect_to_me(in ipcarg_t service);
+                sysarg_t ipc_m_connect_to_me(in sysarg_t service);
                 
                 /* Connect to a clonable service or a generic service */
-                ipcarg_t ipc_m_connect_me_to(in ipcarg_t service, in ipcarg_t arg2, in ipcarg_t arg3, in ipcarg_t flags);
+                sysarg_t ipc_m_connect_me_to(in sysarg_t service, in sysarg_t arg2, in sysarg_t arg3, in sysarg_t flags);
                 
                 /* Share real-time clock page or klog page */
-                ipcarg_t ipc_m_share_in(in ipcarg_t as_area_base, in ipcarg_t as_area_size, in ipcarg_t service);
+                sysarg_t ipc_m_share_in(in sysarg_t as_area_base, in sysarg_t as_area_size, in sysarg_t service);
                 
                 /* For IPC testing purposes */
-                ipcarg_t ping(void);
+                sysarg_t ping(void);
                 
                 /* Wait for task exit and get exit status and return value */
-                ipcarg_t task_wait(in ipcarg_t id_lower, in ipcarg_t id_upper, out ipcarg_t status, out ipcarg_t retval);
+                sysarg_t task_wait(in sysarg_t id_lower, in sysarg_t id_upper, out sysarg_t status, out sysarg_t retval);
                 
                 /* Introduce a new loader task id in such a way it cannot be spoofed */
-                ipcarg_t id_intro(in ipcarg_t id_lower, in ipcarg_t id_upper);
+                sysarg_t id_intro(in sysarg_t id_lower, in sysarg_t id_upper);
                 
                 /* Set task return value */
-                ipcarg_t retval(in ipcarg_t retval);
+                sysarg_t retval(in sysarg_t retval);
                 
                 /* Implicit connection close */
-                ipcarg_t ipc_m_phone_hungup(void);
+                sysarg_t ipc_m_phone_hungup(void);
         protocol:
                 [ns.bp]