Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset a9b6bec in mainline for uspace/srv/ns/task.c


Ignore:
Timestamp:
2010-12-14T20:19:41Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
11658b64
Parents:
37f7cfe (diff), 228e490 (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

Extra changes: ipcarg_t is sysarg_t and
IPC_GET_METHOD is IPC_GET_IMETHOD.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/ns/task.c

    r37f7cfe ra9b6bec  
    4545#define P2I_HASH_TABLE_CHAINS  256
    4646
    47 static int get_id_by_phone(ipcarg_t phone_hash, task_id_t *id);
     47static int get_id_by_phone(sysarg_t phone_hash, task_id_t *id);
    4848
    4949/* TODO:
     
    124124typedef struct {
    125125        link_t link;
    126         ipcarg_t phash;    /**< Task ID. */
     126        sysarg_t phash;    /**< Task ID. */
    127127        task_id_t id;    /**< Task ID. */
    128128} p2i_entry_t;
     
    248248void wait_for_task(task_id_t id, ipc_call_t *call, ipc_callid_t callid)
    249249{
    250         ipcarg_t retval;
     250        sysarg_t retval;
    251251        task_exit_t texit;
    252252
     
    393393}
    394394
    395 static int get_id_by_phone(ipcarg_t phone_hash, task_id_t *id)
     395static int get_id_by_phone(sysarg_t phone_hash, task_id_t *id)
    396396{
    397397        unsigned long keys[1];
Note: See TracChangeset for help on using the changeset viewer.