Changeset 96b02eb9 in mainline for uspace/lib/c/generic/ipc.c


Ignore:
Timestamp:
2010-12-14T12:52:38Z (13 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6b10dab
Parents:
554debd
Message:

more unification of basic types

  • use sysarg_t and native_t (unsigned and signed variant) in both kernel and uspace
  • remove ipcarg_t in favour of sysarg_t

(no change in functionality)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/generic/ipc.c

    r554debd r96b02eb9  
    104104 */
    105105int
    106 ipc_call_sync_fast(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2,
    107     ipcarg_t arg3, ipcarg_t *result1, ipcarg_t *result2, ipcarg_t *result3,
    108     ipcarg_t *result4, ipcarg_t *result5)
     106ipc_call_sync_fast(int phoneid, sysarg_t method, sysarg_t arg1, sysarg_t arg2,
     107    sysarg_t arg3, sysarg_t *result1, sysarg_t *result2, sysarg_t *result3,
     108    sysarg_t *result4, sysarg_t *result5)
    109109{
    110110        ipc_call_t resdata;
    … …  
    148148 */
    149149int
    150 ipc_call_sync_slow(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2,
    151     ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5, ipcarg_t *result1,
    152     ipcarg_t *result2, ipcarg_t *result3, ipcarg_t *result4, ipcarg_t *result5)
     150ipc_call_sync_slow(int phoneid, sysarg_t method, sysarg_t arg1, sysarg_t arg2,
     151    sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, sysarg_t *result1,
     152    sysarg_t *result2, sysarg_t *result3, sysarg_t *result4, sysarg_t *result5)
    153153{
    154154        ipc_call_t data;
    … …  
    289289 *                      asynchronous calls.
    290290 */
    291 void ipc_call_async_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
    292     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, void *private,
     291void ipc_call_async_fast(int phoneid, sysarg_t method, sysarg_t arg1,
     292    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, void *private,
    293293    ipc_async_callback_t callback, int can_preempt)
    294294{
    … …  
    351351 *
    352352 */
    353 void ipc_call_async_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
    354     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5, void *private,
     353void ipc_call_async_slow(int phoneid, sysarg_t method, sysarg_t arg1,
     354    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, void *private,
    355355    ipc_async_callback_t callback, int can_preempt)
    356356{
    … …  
    393393 * @return              Zero on success or a value from @ref errno.h on failure.
    394394 */
    395 ipcarg_t ipc_answer_fast(ipc_callid_t callid, ipcarg_t retval, ipcarg_t arg1,
    396     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4)
     395sysarg_t ipc_answer_fast(ipc_callid_t callid, sysarg_t retval, sysarg_t arg1,
     396    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
    397397{
    398398        return __SYSCALL6(SYS_IPC_ANSWER_FAST, callid, retval, arg1, arg2, arg3,
    … …  
    412412 * @return              Zero on success or a value from @ref errno.h on failure.
    413413 */
    414 ipcarg_t ipc_answer_slow(ipc_callid_t callid, ipcarg_t retval, ipcarg_t arg1,
    415     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5)
     414sysarg_t ipc_answer_slow(ipc_callid_t callid, sysarg_t retval, sysarg_t arg1,
     415    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5)
    416416{
    417417        ipc_call_t data;
    … …  
    585585 */
    586586int ipc_connect_to_me(int phoneid, int arg1, int arg2, int arg3,
    587     ipcarg_t *phonehash)
     587    sysarg_t *phonehash)
    588588{
    589589        return ipc_call_sync_3_5(phoneid, IPC_M_CONNECT_TO_ME, arg1, arg2,
    … …  
    602602int ipc_connect_me_to(int phoneid, int arg1, int arg2, int arg3)
    603603{
    604         ipcarg_t newphid;
     604        sysarg_t newphid;
    605605        int res;
    606606
    … …  
    626626int ipc_connect_me_to_blocking(int phoneid, int arg1, int arg2, int arg3)
    627627{
    628         ipcarg_t newphid;
     628        sysarg_t newphid;
    629629        int res;
    630630
    … …  
    691691 */
    692692int ipc_forward_fast(ipc_callid_t callid, int phoneid, int method,
    693     ipcarg_t arg1, ipcarg_t arg2, int mode)
     693    sysarg_t arg1, sysarg_t arg2, int mode)
    694694{
    695695        return __SYSCALL6(SYS_IPC_FORWARD_FAST, callid, phoneid, method, arg1,
    … …  
    699699
    700700int ipc_forward_slow(ipc_callid_t callid, int phoneid, int method,
    701     ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5,
     701    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5,
    702702    int mode)
    703703{
    … …  
    725725 * @return              Zero on success or a negative error code from errno.h.
    726726 */
    727 int ipc_share_in_start(int phoneid, void *dst, size_t size, ipcarg_t arg,
     727int ipc_share_in_start(int phoneid, void *dst, size_t size, sysarg_t arg,
    728728    int *flags)
    729729{
    730730        sysarg_t tmp_flags = 0;
    731         int res = ipc_call_sync_3_2(phoneid, IPC_M_SHARE_IN, (ipcarg_t) dst,
    732             (ipcarg_t) size, arg, NULL, &tmp_flags);
     731        int res = ipc_call_sync_3_2(phoneid, IPC_M_SHARE_IN, (sysarg_t) dst,
     732            (sysarg_t) size, arg, NULL, &tmp_flags);
    733733       
    734734        if (flags)
    … …  
    751751int ipc_share_in_finalize(ipc_callid_t callid, void *src, int flags)
    752752{
    753         return ipc_answer_2(callid, EOK, (ipcarg_t) src, (ipcarg_t) flags);
     753        return ipc_answer_2(callid, EOK, (sysarg_t) src, (sysarg_t) flags);
    754754}
    755755
    … …  
    764764int ipc_share_out_start(int phoneid, void *src, int flags)
    765765{
    766         return ipc_call_sync_3_0(phoneid, IPC_M_SHARE_OUT, (ipcarg_t) src, 0,
    767             (ipcarg_t) flags);
     766        return ipc_call_sync_3_0(phoneid, IPC_M_SHARE_OUT, (sysarg_t) src, 0,
     767            (sysarg_t) flags);
    768768}
    769769
    … …  
    780780int ipc_share_out_finalize(ipc_callid_t callid, void *dst)
    781781{
    782         return ipc_answer_1(callid, EOK, (ipcarg_t) dst);
     782        return ipc_answer_1(callid, EOK, (sysarg_t) dst);
    783783}
    784784
    … …  
    794794int ipc_data_read_start(int phoneid, void *dst, size_t size)
    795795{
    796         return ipc_call_sync_2_0(phoneid, IPC_M_DATA_READ, (ipcarg_t) dst,
    797             (ipcarg_t) size);
     796        return ipc_call_sync_2_0(phoneid, IPC_M_DATA_READ, (sysarg_t) dst,
     797            (sysarg_t) size);
    798798}
    799799
    … …  
    812812int ipc_data_read_finalize(ipc_callid_t callid, const void *src, size_t size)
    813813{
    814         return ipc_answer_2(callid, EOK, (ipcarg_t) src, (ipcarg_t) size);
     814        return ipc_answer_2(callid, EOK, (sysarg_t) src, (sysarg_t) size);
    815815}
    816816
    … …  
    825825int ipc_data_write_start(int phoneid, const void *src, size_t size)
    826826{
    827         return ipc_call_sync_2_0(phoneid, IPC_M_DATA_WRITE, (ipcarg_t) src,
    828             (ipcarg_t) size);
     827        return ipc_call_sync_2_0(phoneid, IPC_M_DATA_WRITE, (sysarg_t) src,
     828            (sysarg_t) size);
    829829}
    830830
    … …  
    842842int ipc_data_write_finalize(ipc_callid_t callid, void *dst, size_t size)
    843843{
    844         return ipc_answer_2(callid, EOK, (ipcarg_t) dst, (ipcarg_t) size);
     844        return ipc_answer_2(callid, EOK, (sysarg_t) dst, (sysarg_t) size);
    845845}
    846846
Note: See TracChangeset for help on using the changeset viewer.