Changeset 96b02eb9 in mainline for uspace/lib/c/include/ipc


Ignore:
Timestamp:
2010-12-14T12:52:38Z (15 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)

Location:
uspace/lib/c/include/ipc
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/include/ipc/devman.h

    r554debd r96b02eb9  
    4242#define DEVMAN_NAME_MAXLEN 256
    4343
    44 typedef ipcarg_t devman_handle_t;
     44typedef sysarg_t devman_handle_t;
    4545
    4646/** Ids of device models used for device-to-driver matching.

  • uspace/lib/c/include/ipc/devmap.h

    r554debd r96b02eb9  
    4040#define DEVMAP_NAME_MAXLEN  255
    4141
    42 typedef ipcarg_t devmap_handle_t;
     42typedef sysarg_t devmap_handle_t;
    4343
    4444typedef enum {

  • uspace/lib/c/include/ipc/ip.h

    r554debd r96b02eb9  
    9393#define IP_SET_HEADERLEN(answer, value) \
    9494        do { \
    95                 ipcarg_t argument = (ipcarg_t) (value); \
     95                sysarg_t argument = (sysarg_t) (value); \
    9696                IPC_SET_ARG2(*answer, argument); \
    9797        } while (0)

  • uspace/lib/c/include/ipc/ipc.h

    r554debd r96b02eb9  
    4444#define IPC_FLAG_BLOCKING  0x01
    4545
    46 typedef sysarg_t ipcarg_t;
    47 
    4846typedef struct {
    49         ipcarg_t args[IPC_CALL_LEN];
    50         ipcarg_t in_phone_hash;
     47        sysarg_t args[IPC_CALL_LEN];
     48        sysarg_t in_phone_hash;
    5149} ipc_call_t;
    5250
    … …  
    183181            (arg4), (arg5), (res1), (res2), (res3), (res4), (res5))
    184182
    185 extern int ipc_call_sync_fast(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
    186     ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *);
    187 
    188 extern int ipc_call_sync_slow(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
    189     ipcarg_t, ipcarg_t, ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *,
    190     ipcarg_t *);
     183extern int ipc_call_sync_fast(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
     184    sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *);
     185
     186extern int ipc_call_sync_slow(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
     187    sysarg_t, sysarg_t, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *,
     188    sysarg_t *);
    191189
    192190extern ipc_callid_t ipc_wait_cycle(ipc_call_t *, uint32_t, int);
    … …  
    220218        ipc_answer_slow((callid), (retval), (arg1), (arg2), (arg3), (arg4), (arg5))
    221219
    222 extern ipcarg_t ipc_answer_fast(ipc_callid_t, ipcarg_t, ipcarg_t, ipcarg_t,
    223     ipcarg_t, ipcarg_t);
    224 extern ipcarg_t ipc_answer_slow(ipc_callid_t, ipcarg_t, ipcarg_t, ipcarg_t,
    225     ipcarg_t, ipcarg_t, ipcarg_t);
     220extern sysarg_t ipc_answer_fast(ipc_callid_t, sysarg_t, sysarg_t, sysarg_t,
     221    sysarg_t, sysarg_t);
     222extern sysarg_t ipc_answer_slow(ipc_callid_t, sysarg_t, sysarg_t, sysarg_t,
     223    sysarg_t, sysarg_t, sysarg_t);
    226224
    227225/*
    … …  
    255253            (arg4), (arg5), (private), (callback), (can_preempt))
    256254
    257 extern void ipc_call_async_fast(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
    258     ipcarg_t, void *, ipc_async_callback_t, int);
    259 extern void ipc_call_async_slow(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
    260     ipcarg_t, ipcarg_t, void *, ipc_async_callback_t, int);
    261 
    262 extern int ipc_connect_to_me(int, int, int, int, ipcarg_t *);
     255extern void ipc_call_async_fast(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
     256    sysarg_t, void *, ipc_async_callback_t, int);
     257extern void ipc_call_async_slow(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
     258    sysarg_t, sysarg_t, void *, ipc_async_callback_t, int);
     259
     260extern int ipc_connect_to_me(int, int, int, int, sysarg_t *);
    263261extern int ipc_connect_me_to(int, int, int, int);
    264262extern int ipc_connect_me_to_blocking(int, int, int, int);
    … …  
    266264extern int ipc_register_irq(int, int, int, irq_code_t *);
    267265extern int ipc_unregister_irq(int, int);
    268 extern int ipc_forward_fast(ipc_callid_t, int, int, ipcarg_t, ipcarg_t, int);
    269 extern int ipc_forward_slow(ipc_callid_t, int, int, ipcarg_t, ipcarg_t,
    270     ipcarg_t, ipcarg_t, ipcarg_t, int);
     266extern int ipc_forward_fast(ipc_callid_t, int, int, sysarg_t, sysarg_t, int);
     267extern int ipc_forward_slow(ipc_callid_t, int, int, sysarg_t, sysarg_t,
     268    sysarg_t, sysarg_t, sysarg_t, int);
    271269
    272270/*
    … …  
    282280        ipc_share_in_start((phoneid), (dst), (size), (arg), (flags))
    283281
    284 extern int ipc_share_in_start(int, void *, size_t, ipcarg_t, int *);
     282extern int ipc_share_in_start(int, void *, size_t, sysarg_t, int *);
    285283extern int ipc_share_in_finalize(ipc_callid_t, void *, int );
    286284extern int ipc_share_out_start(int, void *, int);

  • uspace/lib/c/include/ipc/net.h

    r554debd r96b02eb9  
    370370#define IPC_SET_DEVICE(answer, value) \
    371371        do { \
    372                 ipcarg_t argument = (ipcarg_t) (value); \
     372                sysarg_t argument = (sysarg_t) (value); \
    373373                IPC_SET_ARG1(*answer, argument); \
    374374        } while (0)
    … …  
    379379#define IPC_SET_ADDR(answer, value) \
    380380        do { \
    381                 ipcarg_t argument = (ipcarg_t) (value); \
     381                sysarg_t argument = (sysarg_t) (value); \
    382382                IPC_SET_ARG1(*answer, argument); \
    383383        } while (0)
    … …  
    388388#define IPC_SET_PREFIX(answer, value) \
    389389        do { \
    390                 ipcarg_t argument = (ipcarg_t) (value); \
     390                sysarg_t argument = (sysarg_t) (value); \
    391391                IPC_SET_ARG2(*answer, argument); \
    392392        } while (0)
    … …  
    397397#define IPC_SET_CONTENT(answer, value) \
    398398        do { \
    399                 ipcarg_t argument = (ipcarg_t) (value); \
     399                sysarg_t argument = (sysarg_t) (value); \
    400400                IPC_SET_ARG3(*answer, argument); \
    401401        } while (0)
    … …  
    406406#define IPC_SET_SUFFIX(answer, value) \
    407407        do { \
    408                 ipcarg_t argument = (ipcarg_t) (value); \
     408                sysarg_t argument = (sysarg_t) (value); \
    409409                IPC_SET_ARG4(*answer, argument); \
    410410        } while (0)

  • uspace/lib/c/include/ipc/socket.h

    r554debd r96b02eb9  
    8484#define SOCKET_SET_SOCKET_ID(answer, value) \
    8585        do { \
    86                 ipcarg_t argument = (ipcarg_t) (value); \
     86                sysarg_t argument = (sysarg_t) (value); \
    8787                IPC_SET_ARG1(answer, argument); \
    8888        } while (0)
    … …  
    102102#define SOCKET_SET_READ_DATA_LENGTH(answer, value) \
    103103        do { \
    104                 ipcarg_t argument = (ipcarg_t) (value); \
     104                sysarg_t argument = (sysarg_t) (value); \
    105105                IPC_SET_ARG1(answer, argument); \
    106106        } while (0)
    … …  
    147147#define SOCKET_SET_DATA_FRAGMENT_SIZE(answer, value) \
    148148        do { \
    149                 ipcarg_t argument = (ipcarg_t) (value); \
     149                sysarg_t argument = (sysarg_t) (value); \
    150150                IPC_SET_ARG2(answer, argument); \
    151151        } while (0)
    … …  
    156156#define SOCKET_SET_ADDRESS_LENGTH(answer, value) \
    157157        do { \
    158                 ipcarg_t argument = (ipcarg_t) (value); \
     158                sysarg_t argument = (sysarg_t) (value); \
    159159                IPC_SET_ARG3(answer, argument);\
    160160        } while (0)
    … …  
    174174#define SOCKET_SET_HEADER_SIZE(answer, value) \
    175175        do { \
    176                 ipcarg_t argument = (ipcarg_t) (value); \
     176                sysarg_t argument = (sysarg_t) (value); \
    177177                IPC_SET_ARG3(answer, argument); \
    178178        } while (0)
Note: See TracChangeset for help on using the changeset viewer.