Changeset eed4139 in mainline


Ignore:
Timestamp:
2018-03-22T23:23:18Z (7 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cbb37b6
Parents:
77f0a1d
Message:

Fix some comments mentioning 'call IDs'

Files:
18 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/src/ipc/ipc.c

    r77f0a1d reed4139  
    967967
    968968#ifdef __32_BITS__
    969         printf("[call id ] [method] [arg1] [arg2] [arg3] [arg4] [arg5]"
     969        printf("[call adr] [method] [arg1] [arg2] [arg3] [arg4] [arg5]"
    970970            " [flags] [sender\n");
    971971#endif
    972972
    973973#ifdef __64_BITS__
    974         printf("[call id         ] [method] [arg1] [arg2] [arg3] [arg4]"
     974        printf("[call address    ] [method] [arg1] [arg2] [arg3] [arg4]"
    975975            " [arg5] [flags] [sender\n");
    976976#endif

  • uspace/app/trace/ipcp.c

    r77f0a1d reed4139  
    194194
    195195        if ((display_mask & DM_IPC) != 0) {
    196                 printf("Call ID: %p, phone: %p, proto: %s, method: ",
     196                printf("Call handle: %p, phone: %p, proto: %s, method: ",
    197197                    chandle, phandle, (proto ? proto->name : "n/a"));
    198198                ipc_m_print(proto, IPC_GET_IMETHOD(*call));

  • uspace/app/wavplay/drec.c

    r77f0a1d reed4139  
    9090 * Writes recorded data.
    9191 *
    92  * @param icall_handle  IPC call id.
     92 * @param icall_handle  IPC call handle.
    9393 * @param icall         Poitner to IPC call structure.
    9494 * @param arg           Argument. Poitner to recording helper structure.

  • uspace/drv/bus/usb/vhc/conndev.c

    r77f0a1d reed4139  
    8989/** Default handler for IPC methods not handled by DDF.
    9090 *
    91  * @param fun Device handling the call.
    92  * @param icall_handle Call id.
    93  * @param icall Call data.
     91 * @param fun           Device handling the call.
     92 * @param icall_handle  Call handle.
     93 * @param icall         Call data.
    9494 */
    9595void default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icall_handle,

  • uspace/drv/hid/atkbd/atkbd.c

    r77f0a1d reed4139  
    292292/** Default handler for IPC methods not handled by DDF.
    293293 *
    294  * @param fun     Device function handling the call.
    295  * @param icall_handle Call id.
    296  * @param icall   Call data.
    297  *
    298  */
    299 static void default_connection_handler(ddf_fun_t *fun,
    300     cap_call_handle_t icall_handle, ipc_call_t *icall)
     294 * @param fun           Device function handling the call.
     295 * @param icall_handle  Call handle.
     296 * @param icall         Call data.
     297 *
     298 */
     299static void
     300default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icall_handle,
     301    ipc_call_t *icall)
    301302{
    302303        const sysarg_t method = IPC_GET_IMETHOD(*icall);

  • uspace/drv/hid/ps2mouse/ps2mouse.c

    r77f0a1d reed4139  
    399399/** Default handler for IPC methods not handled by DDF.
    400400 *
    401  * @param fun Device function handling the call.
    402  * @param icall_handle Call id.
    403  * @param icall Call data.
    404  */
    405 void default_connection_handler(ddf_fun_t *fun,
    406     cap_call_handle_t icall_handle, ipc_call_t *icall)
     401 * @param fun           Device function handling the call.
     402 * @param icall_handle  Call handle.
     403 * @param icall         Call data.
     404 */
     405void default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icall_handle,
     406    ipc_call_t *icall)
    407407{
    408408        const sysarg_t method = IPC_GET_IMETHOD(*icall);

  • uspace/drv/hid/usbhid/kbd/kbddev.c

    r77f0a1d reed4139  
    156156 * KBDEV_SET_IND sets LED keyboard indicators.
    157157 *
    158  * @param fun Device function handling the call.
    159  * @param icall_handle Call id.
    160  * @param icall Call data.
    161  */
    162 static void default_connection_handler(ddf_fun_t *fun,
    163     cap_call_handle_t icall_handle, ipc_call_t *icall)
     158 * @param fun           Device function handling the call.
     159 * @param icall_handle  Call handle.
     160 * @param icall         Call data.
     161 */
     162static void
     163default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icall_handle,
     164    ipc_call_t *icall)
    164165{
    165166        const sysarg_t method = IPC_GET_IMETHOD(*icall);

  • uspace/drv/hid/usbhid/mouse/mousedev.c

    r77f0a1d reed4139  
    109109/** Default handler for IPC methods not handled by DDF.
    110110 *
    111  * @param fun Device function handling the call.
    112  * @param icall_handle Call id.
    113  * @param icall Call data.
    114  */
    115 static void default_connection_handler(ddf_fun_t *fun,
    116     cap_call_handle_t icall_handle, ipc_call_t *icall)
     111 * @param fun           Device function handling the call.
     112 * @param icall_handle  Call handle.
     113 * @param icall         Call data.
     114 */
     115static void
     116default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icall_handle,
     117    ipc_call_t *icall)
    117118{
    118119        usb_mouse_t *mouse_dev = ddf_fun_data_get(fun);

  • uspace/drv/hid/usbhid/multimedia/multimedia.c

    r77f0a1d reed4139  
    8080 * later use by the driver to notify about key events.
    8181 *
    82  * @param fun Device function handling the call.
    83  * @param icall_handle Call id.
    84  * @param icall Call data.
    85  */
    86 static void default_connection_handler(ddf_fun_t *fun,
    87     cap_call_handle_t icall_handle, ipc_call_t *icall)
     82 * @param fun           Device function handling the call.
     83 * @param icall_handle  Call handle.
     84 * @param icall         Call data.
     85 */
     86static void
     87default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icall_handle,
     88    ipc_call_t *icall)
    8889{
    8990        usb_log_debug(NAME " default_connection_handler()");

  • uspace/drv/hid/xtkbd/xtkbd.c

    r77f0a1d reed4139  
    328328/** Default handler for IPC methods not handled by DDF.
    329329 *
    330  * @param fun     Device function handling the call.
    331  * @param icall_handle Call id.
    332  * @param icall   Call data.
     330 * @param fun           Device function handling the call.
     331 * @param icall_handle  Call handle.
     332 * @param icall         Call data.
    333333 *
    334334 */

  • uspace/lib/c/generic/inet/tcp.c

    r77f0a1d reed4139  
    633633/** Connection established event.
    634634 *
    635  * @param tcp TCP client
    636  * @param iid Call ID
    637  * @param icall Call data
    638  */
    639 static void tcp_ev_connected(tcp_t *tcp, cap_call_handle_t icall_handle, ipc_call_t *icall)
     635 * @param tcp           TCP client
     636 * @param icall_handle  Call handle
     637 * @param icall         Call data
     638 */
     639static void
     640tcp_ev_connected(tcp_t *tcp, cap_call_handle_t icall_handle, ipc_call_t *icall)
    640641{
    641642        tcp_conn_t *conn;
    … …  
    661662/** Connection failed event.
    662663 *
    663  * @param tcp TCP client
    664  * @param iid Call ID
    665  * @param icall Call data
    666  */
    667 static void tcp_ev_conn_failed(tcp_t *tcp, cap_call_handle_t icall_handle, ipc_call_t *icall)
     664 * @param tcp           TCP client
     665 * @param icall_handle  Call handle
     666 * @param icall         Call data
     667 */
     668static void
     669tcp_ev_conn_failed(tcp_t *tcp, cap_call_handle_t icall_handle,
     670    ipc_call_t *icall)
    668671{
    669672        tcp_conn_t *conn;
    … …  
    689692/** Connection reset event.
    690693 *
    691  * @param tcp TCP client
    692  * @param iid Call ID
    693  * @param icall Call data
     694 * @param tcp           TCP client
     695 * @param icall_handle  Call handle
     696 * @param icall         Call data
    694697 */
    695698static void tcp_ev_conn_reset(tcp_t *tcp, cap_call_handle_t icall_handle, ipc_call_t *icall)
    … …  
    717720/** Data available event.
    718721 *
    719  * @param tcp TCP client
    720  * @param iid Call ID
    721  * @param icall Call data
    722  */
    723 static void tcp_ev_data(tcp_t *tcp, cap_call_handle_t icall_handle, ipc_call_t *icall)
     722 * @param tcp           TCP client
     723 * @param icall_handle  Call handle
     724 * @param icall         Call data
     725 */
     726static void
     727tcp_ev_data(tcp_t *tcp, cap_call_handle_t icall_handle, ipc_call_t *icall)
    724728{
    725729        tcp_conn_t *conn;
    … …  
    746750/** Urgent data event.
    747751 *
    748  * @param tcp TCP client
    749  * @param iid Call ID
    750  * @param icall Call data
    751  */
    752 static void tcp_ev_urg_data(tcp_t *tcp, cap_call_handle_t icall_handle, ipc_call_t *icall)
     752 * @param tcp           TCP client
     753 * @param icall_handle  Call handle
     754 * @param icall         Call data
     755 */
     756static void
     757tcp_ev_urg_data(tcp_t *tcp, cap_call_handle_t icall_handle, ipc_call_t *icall)
    753758{
    754759        async_answer_0(icall_handle, ENOTSUP);
    … …  
    757762/** New connection event.
    758763 *
    759  * @param tcp TCP client
    760  * @param iid Call ID
    761  * @param icall Call data
    762  */
    763 static void tcp_ev_new_conn(tcp_t *tcp, cap_call_handle_t icall_handle, ipc_call_t *icall)
     764 * @param tcp           TCP client
     765 * @param icall_handle  Call handle
     766 * @param icall         Call data
     767 */
     768static void
     769tcp_ev_new_conn(tcp_t *tcp, cap_call_handle_t icall_handle, ipc_call_t *icall)
    764770{
    765771        tcp_listener_t *lst;
    … …  
    809815/** Callback connection handler.
    810816 *
    811  * @param iid Connect call ID
    812  * @param icall Connect call data
    813  * @param arg Argument, TCP client
    814  */
    815 static void tcp_cb_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
     817 * @param icall_handle  Connect call handle
     818 * @param icall         Connect call data
     819 * @param arg           Argument, TCP client
     820 */
     821static void
     822tcp_cb_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
    816823{
    817824        tcp_t *tcp = (tcp_t *)arg;

  • uspace/lib/hound/src/protocol.c

    r77f0a1d reed4139  
    378378}
    379379
    380 /**
    381  * Server side implementation of the hound protocol. IPC connection handler.
    382  * @param iid initial call id
    383  * @param icall pointer to initial call structure.
    384  * @param arg (unused)
    385  */
    386 void hound_connection_handler(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
     380/** Server side implementation of the hound protocol. IPC connection handler.
     381 *
     382 * @param icall_handle   Initial call handle
     383 * @param icall          Pointer to initial call structure.
     384 * @param arg            (unused)
     385 */
     386void hound_connection_handler(cap_call_handle_t icall_handle, ipc_call_t *icall,
     387    void *arg)
    387388{
    388389        hound_context_id_t id;

  • uspace/lib/nic/src/nic_impl.c

    r77f0a1d reed4139  
    783783 * @return EINVAL       If the NIC is not in state where it allows on demand polling
    784784 */
    785 errno_t nic_poll_now_impl(ddf_fun_t *fun) {
     785errno_t nic_poll_now_impl(ddf_fun_t *fun)
     786{
    786787        nic_t *nic_data = nic_get_from_ddf_fun(fun);
    787788        fibril_rwlock_read_lock(&nic_data->main_lock);
    … …  
    804805 * Logs a warning message and returns ENOTSUP to the caller.
    805806 *
    806  * @param fun           The DDF function where the method should be called.
    807  * @param chandle       IPC call identifier
    808  * @param call          IPC call data
     807 * @param fun      The DDF function where the method should be called.
     808 * @param chandle  IPC call handle
     809 * @param call     IPC call data
    809810 */
    810811void nic_default_handler_impl(ddf_fun_t *fun, cap_call_handle_t chandle,

  • uspace/srv/audio/hound/audio_device.c

    r77f0a1d reed4139  
    255255}
    256256
    257 /**
    258  * Audio device event handler.
    259  * @param iid initial call id.
    260  * @param icall initial call structure.
    261  * @param arg (unused)
    262  */
    263 static void device_event_callback(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
     257/** Audio device event handler.
     258 *
     259 * @param icall_handle  Initial call handle.
     260 * @param icall         Initial call structure.
     261 * @param arg           (unused)
     262 */
     263static void device_event_callback(cap_call_handle_t icall_handle,
     264    ipc_call_t *icall, void *arg)
    264265{
    265266        struct timeval time1;

  • uspace/srv/net/udp/service.c

    r77f0a1d reed4139  
    670670/** Handle UDP client connection.
    671671 *
    672  * @param iid   Connect call ID
    673  * @param icall Connect call data
    674  * @param arg   Connection argument
    675  */
    676 static void udp_client_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
     672 * @param icall_handle  Connect call handle
     673 * @param icall         Connect call data
     674 * @param arg           Connection argument
     675 */
     676static void udp_client_conn(cap_call_handle_t icall_handle, ipc_call_t *icall,
     677    void *arg)
    677678{
    678679        udp_client_t client;

  • uspace/srv/ns/clonable.c

    r77f0a1d reed4139  
    108108/** Connect client to clonable service.
    109109 *
    110  * @param service Service to be connected to.
    111  * @param iface   Interface to be connected to.
    112  * @param call    Pointer to call structure.
    113  * @param chandle  Call ID of the request.
     110 * @param service  Service to be connected to.
     111 * @param iface    Interface to be connected to.
     112 * @param call     Pointer to call structure.
     113 * @param chandle  Call handle of the request.
    114114 *
    115115 * @return Zero on success or a value from @ref errno.h.

  • uspace/srv/ns/service.c

    r77f0a1d reed4139  
    160160/** Connect client to service.
    161161 *
    162  * @param service Service to be connected to.
    163  * @param iface   Interface to be connected to.
    164  * @param call    Pointer to call structure.
    165  * @param chandle  Call ID of the request.
     162 * @param service  Service to be connected to.
     163 * @param iface    Interface to be connected to.
     164 * @param call     Pointer to call structure.
     165 * @param chandle  Call handle of the request.
    166166 *
    167167 * @return Zero on success or a value from @ref errno.h.

  • uspace/srv/ns/task.c

    r77f0a1d reed4139  
    145145typedef struct {
    146146        link_t link;
    147         task_id_t id;         /**< Task ID. */
    148         cap_call_handle_t chandle;  /**< Call ID waiting for the connection */
     147        task_id_t id;               ///< Task ID
     148        cap_call_handle_t chandle;  ///< Call handle waiting for the connection
    149149} pending_wait_t;
    150150
Note: See TracChangeset for help on using the changeset viewer.