Changeset 3be9d10 in mainline for uspace/srv/ns


Ignore:
Timestamp:
2018-03-21T21:29:31Z (8 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3e242d2
Parents:
eadaeae8
Message:

Get rid of ipc_callid_t

Location:
uspace/srv/ns
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/ns/clonable.c

    readaeae8 r3be9d10  
    4848        service_t service;
    4949        iface_t iface;
    50         ipc_callid_t callid;
     50        cap_call_handle_t callid;
    5151        sysarg_t arg3;
    5252} cs_req_t;
    … …  
    7575 */
    7676void register_clonable(service_t service, sysarg_t phone, ipc_call_t *call,
    77     ipc_callid_t callid)
     77    cap_call_handle_t callid)
    7878{
    7979        link_t *req_link = list_first(&cs_req);
    … …  
    117117 */
    118118void connect_to_clonable(service_t service, iface_t iface, ipc_call_t *call,
    119     ipc_callid_t callid)
     119    cap_call_handle_t callid)
    120120{
    121121        assert(service == SERVICE_LOADER);

  • uspace/srv/ns/clonable.h

    readaeae8 r3be9d10  
    4343extern bool service_clonable(service_t);
    4444extern void register_clonable(service_t, sysarg_t, ipc_call_t *,
    45     ipc_callid_t);
    46 extern void connect_to_clonable(service_t, iface_t, ipc_call_t *, ipc_callid_t);
     45    cap_call_handle_t);
     46extern void connect_to_clonable(service_t, iface_t, ipc_call_t *, cap_call_handle_t);
    4747
    4848#endif

  • uspace/srv/ns/ns.c

    readaeae8 r3be9d10  
    4949#include "task.h"
    5050
    51 static void ns_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
     51static void ns_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
    5252{
    5353        ipc_call_t call;
    54         ipc_callid_t callid;
     54        cap_call_handle_t callid;
    5555        iface_t iface;
    5656        service_t service;

  • uspace/srv/ns/service.c

    readaeae8 r3be9d10  
    8989        service_t service;    /**< Service ID */
    9090        iface_t iface;        /**< Interface ID */
    91         ipc_callid_t callid;  /**< Call ID waiting for the connection */
     91        cap_call_handle_t callid;  /**< Call ID waiting for the connection */
    9292        sysarg_t arg3;        /**< Third argument */
    9393} pending_conn_t;
    … …  
    169169 */
    170170void connect_to_service(service_t service, iface_t iface, ipc_call_t *call,
    171     ipc_callid_t callid)
     171    cap_call_handle_t callid)
    172172{
    173173        sysarg_t arg3 = IPC_GET_ARG3(*call);

  • uspace/srv/ns/service.h

    readaeae8 r3be9d10  
    4242
    4343extern errno_t register_service(service_t, sysarg_t, ipc_call_t *);
    44 extern void connect_to_service(service_t, iface_t, ipc_call_t *, ipc_callid_t);
     44extern void connect_to_service(service_t, iface_t, ipc_call_t *, cap_call_handle_t);
    4545
    4646#endif

  • uspace/srv/ns/task.c

    readaeae8 r3be9d10  
    146146        link_t link;
    147147        task_id_t id;         /**< Task ID. */
    148         ipc_callid_t callid;  /**< Call ID waiting for the connection */
     148        cap_call_handle_t callid;  /**< Call ID waiting for the connection */
    149149} pending_wait_t;
    150150
    … …  
    192192}
    193193
    194 void wait_for_task(task_id_t id, ipc_call_t *call, ipc_callid_t callid)
     194void wait_for_task(task_id_t id, ipc_call_t *call, cap_call_handle_t callid)
    195195{
    196196        ht_link_t *link = hash_table_find(&task_hash_table, &id);

  • uspace/srv/ns/task.h

    readaeae8 r3be9d10  
    4040extern void process_pending_wait(void);
    4141
    42 extern void wait_for_task(task_id_t, ipc_call_t *, ipc_callid_t);
     42extern void wait_for_task(task_id_t, ipc_call_t *, cap_call_handle_t);
    4343
    4444extern errno_t ns_task_id_intro(ipc_call_t *);
Note: See TracChangeset for help on using the changeset viewer.