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

Changeset 7a2f7ecd in mainline


Ignore:
Timestamp:
2011-08-19T16:17:49Z (10 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master
Children:
649f087
Parents:
9247c02c (diff), 36b16bc (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 from lp:~jakub/helenos/camp2011.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/ipc/sysipc.c

    r9247c02c r7a2f7ecd  
    253253                        /* The connection was accepted */
    254254                        phone_connect(phoneid, &answer->sender->answerbox);
    255                         /* Set 'task hash' as arg4 of response */
    256                         IPC_SET_ARG4(answer->data, (sysarg_t) TASK);
     255                        /* Set 'task ID' as arg3 and arg4 of response */
     256                        IPC_SET_ARG3(answer->data, LOWER32(TASK->taskid));
     257                        IPC_SET_ARG4(answer->data, UPPER32(TASK->taskid));
    257258                        /* Set 'phone hash' as arg5 of response */
    258259                        IPC_SET_ARG5(answer->data,
  • uspace/lib/c/generic/async.c

    r9247c02c r7a2f7ecd  
    14721472                return ENOENT;
    14731473       
    1474         sysarg_t task_hash;
     1474        task_id_t task_id;
     1475        sysarg_t task_id_lo;
     1476        sysarg_t task_id_hi;
    14751477        sysarg_t phone_hash;
    14761478        int rc = async_req_3_5(exch, IPC_M_CONNECT_TO_ME, arg1, arg2, arg3,
    1477             NULL, NULL, NULL, &task_hash, &phone_hash);
     1479            NULL, NULL, &task_id_lo, &task_id_hi, &phone_hash);
    14781480        if (rc != EOK)
    14791481                return rc;
     1482
     1483        task_id = (task_id_t) MERGE_LOUP32(task_id_lo, task_id_hi);
    14801484       
    14811485        if (client_receiver != NULL)
    1482                 async_new_connection(task_hash, phone_hash, 0, NULL,
     1486                async_new_connection(task_id, phone_hash, 0, NULL,
    14831487                    client_receiver, carg);
    14841488       
Note: See TracChangeset for help on using the changeset viewer.