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

Changeset a9b6bec in mainline for uspace/srv/ns/service.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/service.c

    r37f7cfe ra9b6bec  
    4343typedef struct {
    4444        link_t link;
    45         ipcarg_t service;        /**< Number of the service. */
    46         ipcarg_t phone;          /**< Phone registered with the service. */
    47         ipcarg_t in_phone_hash;  /**< Incoming phone hash. */
     45        sysarg_t service;        /**< Number of the service. */
     46        sysarg_t phone;          /**< Phone registered with the service. */
     47        sysarg_t in_phone_hash;  /**< Incoming phone hash. */
    4848} hashed_service_t;
    4949
     
    115115typedef struct {
    116116        link_t link;
    117         ipcarg_t service;        /**< Number of the service. */
     117        sysarg_t service;        /**< Number of the service. */
    118118        ipc_callid_t callid;     /**< Call ID waiting for the connection */
    119         ipcarg_t arg2;           /**< Second argument */
    120         ipcarg_t arg3;           /**< Third argument */
     119        sysarg_t arg2;           /**< Second argument */
     120        sysarg_t arg3;           /**< Third argument */
    121121} pending_conn_t;
    122122
     
    174174 *
    175175 */
    176 int register_service(ipcarg_t service, ipcarg_t phone, ipc_call_t *call)
     176int register_service(sysarg_t service, sysarg_t phone, ipc_call_t *call)
    177177{
    178178        unsigned long keys[3] = {
     
    207207 *
    208208 */
    209 void connect_to_service(ipcarg_t service, ipc_call_t *call, ipc_callid_t callid)
    210 {
    211         ipcarg_t retval;
     209void connect_to_service(sysarg_t service, ipc_call_t *call, ipc_callid_t callid)
     210{
     211        sysarg_t retval;
    212212        unsigned long keys[3] = {
    213213                service,
Note: See TracChangeset for help on using the changeset viewer.