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

Changeset a9b6bec in mainline for uspace/lib/c/include/async.h


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/lib/c/include/async.h

    r37f7cfe ra9b6bec  
    8484            (arg5), (dataptr))
    8585
    86 extern aid_t async_send_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
    87     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipc_call_t *dataptr);
    88 extern aid_t async_send_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
    89     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5,
     86extern aid_t async_send_fast(int phoneid, sysarg_t method, sysarg_t arg1,
     87    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, ipc_call_t *dataptr);
     88extern aid_t async_send_slow(int phoneid, sysarg_t method, sysarg_t arg1,
     89    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5,
    9090    ipc_call_t *dataptr);
    91 extern void async_wait_for(aid_t amsgid, ipcarg_t *result);
    92 extern int async_wait_timeout(aid_t amsgid, ipcarg_t *retval,
     91extern void async_wait_for(aid_t amsgid, sysarg_t *result);
     92extern int async_wait_timeout(aid_t amsgid, sysarg_t *retval,
    9393    suseconds_t timeout);
    9494
    95 extern fid_t async_new_connection(ipcarg_t in_phone_hash, ipc_callid_t callid,
     95extern fid_t async_new_connection(sysarg_t in_phone_hash, ipc_callid_t callid,
    9696    ipc_call_t *call, void (*cthread)(ipc_callid_t, ipc_call_t *));
    9797extern void async_usleep(suseconds_t timeout);
     
    242242            (arg5), (rc1), (rc2), (rc3), (rc4), (rc5))
    243243
    244 extern ipcarg_t async_req_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
    245     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t *r1, ipcarg_t *r2,
    246     ipcarg_t *r3, ipcarg_t *r4, ipcarg_t *r5);
    247 extern ipcarg_t async_req_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
    248     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5, ipcarg_t *r1,
    249     ipcarg_t *r2, ipcarg_t *r3, ipcarg_t *r4, ipcarg_t *r5);
     244extern sysarg_t async_req_fast(int phoneid, sysarg_t method, sysarg_t arg1,
     245    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t *r1, sysarg_t *r2,
     246    sysarg_t *r3, sysarg_t *r4, sysarg_t *r5);
     247extern sysarg_t async_req_slow(int phoneid, sysarg_t method, sysarg_t arg1,
     248    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, sysarg_t *r1,
     249    sysarg_t *r2, sysarg_t *r3, sysarg_t *r4, sysarg_t *r5);
    250250
    251251static inline void async_serialize_start(void)
     
    259259}
    260260
    261 extern int async_connect_me_to(int, ipcarg_t, ipcarg_t, ipcarg_t);
    262 extern int async_connect_me_to_blocking(int, ipcarg_t, ipcarg_t, ipcarg_t);
     261extern int async_connect_me_to(int, sysarg_t, sysarg_t, sysarg_t);
     262extern int async_connect_me_to_blocking(int, sysarg_t, sysarg_t, sysarg_t);
    263263
    264264/*
     
    274274        async_share_in_start((phoneid), (dst), (size), (arg), (flags))
    275275
    276 extern int async_share_in_start(int, void *, size_t, ipcarg_t, int *);
     276extern int async_share_in_start(int, void *, size_t, sysarg_t, int *);
    277277extern int async_share_in_receive(ipc_callid_t *, size_t *);
    278278extern int async_share_in_finalize(ipc_callid_t, void *, int );
     
    314314extern int async_data_read_finalize(ipc_callid_t, const void *, size_t);
    315315
    316 extern int async_data_read_forward_fast(int, ipcarg_t, ipcarg_t, ipcarg_t,
    317     ipcarg_t, ipcarg_t, ipc_call_t *);
     316extern int async_data_read_forward_fast(int, sysarg_t, sysarg_t, sysarg_t,
     317    sysarg_t, sysarg_t, ipc_call_t *);
    318318
    319319/*
     
    356356extern void async_data_write_void(const int);
    357357
    358 extern int async_data_write_forward_fast(int, ipcarg_t, ipcarg_t, ipcarg_t,
    359     ipcarg_t, ipcarg_t, ipc_call_t *);
     358extern int async_data_write_forward_fast(int, sysarg_t, sysarg_t, sysarg_t,
     359    sysarg_t, sysarg_t, ipc_call_t *);
    360360
    361361#endif
Note: See TracChangeset for help on using the changeset viewer.