Changeset 7bdcc45 in mainline for uspace/srv/ns/task.c

Timestamp:

2010-12-16T16:38:49Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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/task.c (modified) (5 diffs)

uspace/srv/ns/task.c

@@ -45 +45 @@
 #define P2I_HASH_TABLE_CHAINS  256
 
-static int get_id_by_phone(ipcarg_t phone_hash, task_id_t *id);
+static int get_id_by_phone(sysarg_t phone_hash, task_id_t *id);
 
 /* TODO:
@@ -124 +124 @@
 typedef struct {
         link_t link;
-        ipcarg_t phash;    /**< Task ID. */
+        sysarg_t phash;    /**< Task ID. */
         task_id_t id;    /**< Task ID. */
 } p2i_entry_t;
@@ -248 +248 @@
 void wait_for_task(task_id_t id, ipc_call_t *call, ipc_callid_t callid)
 {
-        ipcarg_t retval;
+        sysarg_t retval;
         task_exit_t texit;
 
@@ -262 +262 @@
         if (ht == NULL) {
                 /* No such task exists. */
-                retval = ENOENT;
-                goto out;
+                ipc_answer_0(callid, ENOENT);
+                return;
         }
 
@@ -393 +393 @@
 }
 
-static int get_id_by_phone(ipcarg_t phone_hash, task_id_t *id)
+static int get_id_by_phone(sysarg_t phone_hash, task_id_t *id)
 {
         unsigned long keys[1];