Changeset 984a9ba in mainline for uspace/drv/hid/usbhid


Ignore:
Timestamp:
2018-07-05T09:34:09Z (8 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
63d46341
Parents:
76f566d
Message:

do not expose the call capability handler from the async framework

Keep the call capability handler encapsulated within the async framework
and do not expose it explicitly via its API. Use the pointer to
ipc_call_t as the sole object identifying an IPC call in the code that
uses the async framework.

This plugs a major leak in the abstraction and also simplifies both the
async framework (slightly) and all IPC servers.

Location:
uspace/drv/hid/usbhid
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r76f566d r984a9ba  
    7272#include "../usbhid.h"
    7373
    74 static void default_connection_handler(ddf_fun_t *, cap_call_handle_t, ipc_call_t *);
     74static void default_connection_handler(ddf_fun_t *, ipc_call_t *);
    7575static ddf_dev_ops_t kbdops = { .default_handler = default_connection_handler };
    7676
    … …  
    148148/* IPC method handler                                                         */
    149149
    150 /**
    151  * Default handler for IPC methods not handled by DDF.
     150/** Default handler for IPC methods not handled by DDF.
    152151 *
    153152 * Currently recognizes only two methods (IPC_M_CONNECT_TO_ME and KBDEV_SET_IND)
    … …  
    156155 * KBDEV_SET_IND sets LED keyboard indicators.
    157156 *
    158  * @param fun           Device function handling the call.
    159  * @param icall_handle  Call handle.
    160  * @param icall         Call data.
    161  */
    162 static void
    163 default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icall_handle,
    164     ipc_call_t *icall)
     157 * @param fun   Device function handling the call.
     158 * @param icall Call data.
     159 *
     160 */
     161static void default_connection_handler(ddf_fun_t *fun, ipc_call_t *icall)
    165162{
    166163        const sysarg_t method = IPC_GET_IMETHOD(*icall);
    … …  
    172169                kbd_dev->mods = IPC_GET_ARG1(*icall);
    173170                usb_kbd_set_led(kbd_dev->hid_dev, kbd_dev);
    174                 async_answer_0(icall_handle, EOK);
     171                async_answer_0(icall, EOK);
    175172                break;
    176173                /*
    … …  
    184181                        usb_log_warning(
    185182                            "Failed to create start console session.\n");
    186                         async_answer_0(icall_handle, EAGAIN);
     183                        async_answer_0(icall, EAGAIN);
    187184                        break;
    188185                }
    … …  
    190187                        kbd_dev->client_sess = sess;
    191188                        usb_log_debug("%s: OK", __FUNCTION__);
    192                         async_answer_0(icall_handle, EOK);
     189                        async_answer_0(icall, EOK);
    193190                } else {
    194191                        usb_log_error("%s: console session already set",
    195192                            __FUNCTION__);
    196                         async_answer_0(icall_handle, ELIMIT);
     193                        async_answer_0(icall, ELIMIT);
    197194                }
    198195                break;
    … …  
    200197                usb_log_error("%s: Unknown method: %d.",
    201198                    __FUNCTION__, (int) method);
    202                 async_answer_0(icall_handle, EINVAL);
     199                async_answer_0(icall, EINVAL);
    203200                break;
    204201        }

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

    r76f566d r984a9ba  
    5656#define NAME "mouse"
    5757
    58 static void default_connection_handler(ddf_fun_t *, cap_call_handle_t, ipc_call_t *);
     58static void default_connection_handler(ddf_fun_t *, ipc_call_t *);
    5959
    6060static ddf_dev_ops_t ops = { .default_handler = default_connection_handler };
    … …  
    110110/** Default handler for IPC methods not handled by DDF.
    111111 *
    112  * @param fun           Device function handling the call.
    113  * @param icall_handle  Call handle.
    114  * @param icall         Call data.
    115  */
    116 static void
    117 default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icall_handle,
    118     ipc_call_t *icall)
     112 * @param fun   Device function handling the call.
     113 * @param icall Call data.
     114 *
     115 */
     116static void default_connection_handler(ddf_fun_t *fun, ipc_call_t *icall)
    119117{
    120118        usb_mouse_t *mouse_dev = ddf_fun_data_get(fun);
    … …  
    122120        if (mouse_dev == NULL) {
    123121                usb_log_debug("%s: Missing parameters.", __FUNCTION__);
    124                 async_answer_0(icall_handle, EINVAL);
     122                async_answer_0(icall, EINVAL);
    125123                return;
    126124        }
    … …  
    137135                        usb_log_debug("Console session to %s set ok (%p).",
    138136                            ddf_fun_get_name(fun), sess);
    139                         async_answer_0(icall_handle, EOK);
     137                        async_answer_0(icall, EOK);
    140138                } else {
    141139                        usb_log_error("Console session to %s already set.",
    142140                            ddf_fun_get_name(fun));
    143                         async_answer_0(icall_handle, ELIMIT);
     141                        async_answer_0(icall, ELIMIT);
    144142                        async_hangup(sess);
    145143                }
    146144        } else {
    147145                usb_log_debug("%s: Invalid function.", __FUNCTION__);
    148                 async_answer_0(icall_handle, EINVAL);
     146                async_answer_0(icall, EINVAL);
    149147        }
    150148}

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

    r76f566d r984a9ba  
    7373
    7474
    75 /**
    76  * Default handler for IPC methods not handled by DDF.
     75/** Default handler for IPC methods not handled by DDF.
    7776 *
    7877 * Currently recognizes only one method (IPC_M_CONNECT_TO_ME), in which case it
    … …  
    8079 * later use by the driver to notify about key events.
    8180 *
    82  * @param fun           Device function handling the call.
    83  * @param icall_handle  Call handle.
    84  * @param icall         Call data.
    85  */
    86 static void
    87 default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icall_handle,
    88     ipc_call_t *icall)
     81 * @param fun   Device function handling the call.
     82 * @param icall Call data.
     83 *
     84 */
     85static void default_connection_handler(ddf_fun_t *fun, ipc_call_t *icall)
    8986{
    9087        usb_log_debug(NAME " default_connection_handler()");
    … …  
    9996                        usb_log_debug(NAME " Saved session to console: %p",
    10097                            sess);
    101                         async_answer_0(icall_handle, EOK);
     98                        async_answer_0(icall, EOK);
    10299                } else
    103                         async_answer_0(icall_handle, ELIMIT);
     100                        async_answer_0(icall, ELIMIT);
    104101        } else
    105                 async_answer_0(icall_handle, EINVAL);
     102                async_answer_0(icall, EINVAL);
    106103}
    107104
Note: See TracChangeset for help on using the changeset viewer.