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

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• uspace/srv/ns/service.c (modified) (8 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;        /**< Service ID. */
+        sysarg_t phone;          /**< Phone registered with the service. */
+        sysarg_t in_phone_hash;  /**< Incoming phone hash. */
 } hashed_service_t;
 
@@ -56 +56 @@
  *
  */
-static hash_index_t service_hash(unsigned long *key)
+static hash_index_t service_hash(unsigned long key[])
 {
         assert(key);
-        return (*key % SERVICE_HASH_TABLE_CHAINS);
+        return (key[0] % SERVICE_HASH_TABLE_CHAINS);
 }
 
@@ -86 +86 @@
         
         if (keys == 2)
-                return (key[1] == hs->in_phone_hash);
+                return ((key[0] == hs->service) && (key[1] == hs->in_phone_hash));
         else
                 return (key[0] == hs->service);
@@ -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] = {
@@ -195 +195 @@
         hash_table_insert(&service_hash_table, keys, &hs->link);
         
-        return 0;
+        return EOK;
 }
 
@@ -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,
@@ -227 +227 @@
                         }
                         
+                        link_initialize(&pr->link);
                         pr->service = service;
                         pr->callid = callid;