Changeset 2a7ba5e in mainline for uspace/lib/c/include/ipc/ipc.h


Ignore:
Timestamp:
2016-05-24T21:03:32Z (9 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
609f8d9c
Parents:
0a981e3 (diff), c170438 (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 async framework changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/include/ipc/ipc.h

    r0a981e3 r2a7ba5e  
    8989 */
    9090
    91 #define ipc_call_async_0(phoneid, method, private, callback, can_preempt) \
     91#define ipc_call_async_0(phoneid, method, private, callback) \
    9292        ipc_call_async_fast((phoneid), (method), 0, 0, 0, 0, (private), \
    93             (callback), (can_preempt))
    94 #define ipc_call_async_1(phoneid, method, arg1, private, callback, \
    95     can_preempt) \
     93            (callback))
     94#define ipc_call_async_1(phoneid, method, arg1, private, callback) \
    9695        ipc_call_async_fast((phoneid), (method), (arg1), 0, 0, 0, (private), \
    97             (callback), (can_preempt))
    98 #define ipc_call_async_2(phoneid, method, arg1, arg2, private, callback, \
    99     can_preempt) \
     96            (callback))
     97#define ipc_call_async_2(phoneid, method, arg1, arg2, private, callback) \
    10098        ipc_call_async_fast((phoneid), (method), (arg1), (arg2), 0, 0, \
    101             (private), (callback), (can_preempt))
    102 #define ipc_call_async_3(phoneid, method, arg1, arg2, arg3, private, callback, \
    103     can_preempt) \
     99            (private), (callback))
     100#define ipc_call_async_3(phoneid, method, arg1, arg2, arg3, private, callback) \
    104101        ipc_call_async_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, \
    105             (private), (callback), (can_preempt))
     102            (private), (callback))
    106103#define ipc_call_async_4(phoneid, method, arg1, arg2, arg3, arg4, private, \
    107     callback, can_preempt) \
     104    callback) \
    108105        ipc_call_async_fast((phoneid), (method), (arg1), (arg2), (arg3), \
    109             (arg4), (private), (callback), (can_preempt))
     106            (arg4), (private), (callback))
    110107#define ipc_call_async_5(phoneid, method, arg1, arg2, arg3, arg4, arg5, \
    111     private, callback, can_preempt) \
     108    private, callback) \
    112109        ipc_call_async_slow((phoneid), (method), (arg1), (arg2), (arg3), \
    113             (arg4), (arg5), (private), (callback), (can_preempt))
     110            (arg4), (arg5), (private), (callback))
    114111
    115112extern void ipc_call_async_fast(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
    116     sysarg_t, void *, ipc_async_callback_t, bool);
     113    sysarg_t, void *, ipc_async_callback_t);
    117114extern void ipc_call_async_slow(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
    118     sysarg_t, sysarg_t, void *, ipc_async_callback_t, bool);
     115    sysarg_t, sysarg_t, void *, ipc_async_callback_t);
    119116
    120117extern int ipc_hangup(int);
Note: See TracChangeset for help on using the changeset viewer.