Changeset ea28272 in mainline for uspace/srv/ns/service.c

Timestamp:

2010-12-30T13:43:27Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d770deb

Parents:

d70d80ed (diff), f418e51 (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:

• uspace/srv/ns/service.c (modified) (4 diffs)

uspace/srv/ns/service.c

@@ -43 +43 @@
 typedef struct {
         link_t link;
-        ipcarg_t service;        /**< Number of the service. */
-        ipcarg_t phone;          /**< Phone registered with the service. */
-        ipcarg_t in_phone_hash;  /**< Incoming phone hash. */
+        sysarg_t service;        /**< Number of the service. */
+        sysarg_t phone;          /**< Phone registered with the service. */
+        sysarg_t in_phone_hash;  /**< Incoming phone hash. */
 } hashed_service_t;
 
@@ -115 +115 @@
 typedef struct {
         link_t link;
-        ipcarg_t service;        /**< Number of the service. */
+        sysarg_t service;        /**< Number of the service. */
         ipc_callid_t callid;     /**< Call ID waiting for the connection */
-        ipcarg_t arg2;           /**< Second argument */
-        ipcarg_t arg3;           /**< Third argument */
+        sysarg_t arg2;           /**< Second argument */
+        sysarg_t arg3;           /**< Third argument */
 } pending_conn_t;
 
@@ -174 +174 @@
  *
  */
-int register_service(ipcarg_t service, ipcarg_t phone, ipc_call_t *call)
+int register_service(sysarg_t service, sysarg_t phone, ipc_call_t *call)
 {
         unsigned long keys[3] = {
@@ -207 +207 @@
  *
  */
-void connect_to_service(ipcarg_t service, ipc_call_t *call, ipc_callid_t callid)
-{
-        ipcarg_t retval;
+void connect_to_service(sysarg_t service, ipc_call_t *call, ipc_callid_t callid)
+{
+        sysarg_t retval;
         unsigned long keys[3] = {
                 service,