Index: uspace/lib/drv/generic/dev_iface.c =================================================================== --- uspace/lib/drv/generic/dev_iface.c (revision b77ce846fff6014d76b815421e18b3d5a97d502d) +++ uspace/lib/drv/generic/dev_iface.c (revision 5ab4a48d32c23df2eb23375a41e3ba2eec2706e0) @@ -43,4 +43,5 @@ #include "remote_usb.h" #include "remote_usbhc.h" +#include "remote_usbhid.h" #include "remote_pci.h" @@ -51,5 +52,6 @@ &remote_pci_iface, &remote_usb_iface, - &remote_usbhc_iface + &remote_usbhc_iface, + &remote_usbhid_iface } }; Index: uspace/lib/drv/generic/remote_usbhid.c =================================================================== --- uspace/lib/drv/generic/remote_usbhid.c (revision 5ab4a48d32c23df2eb23375a41e3ba2eec2706e0) +++ uspace/lib/drv/generic/remote_usbhid.c (revision 5ab4a48d32c23df2eb23375a41e3ba2eec2706e0) @@ -0,0 +1,144 @@ +/* + * Copyright (c) 2010-2011 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libdrv + * @{ + */ +/** @file + */ + +#include +#include +#include + +#include "usbhid_iface.h" +#include "ddf/driver.h" + +static void remote_usbhid_get_event_length(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); +static void remote_usbhid_get_event(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); +// static void remote_usbhid_(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); + +/** Remote USB HID interface operations. */ +static remote_iface_func_ptr_t remote_usbhid_iface_ops [] = { + remote_usbhid_get_event_length, + remote_usbhid_get_event +}; + +/** Remote USB HID interface structure. + */ +remote_iface_t remote_usbhid_iface = { + .method_count = sizeof(remote_usbhid_iface_ops) / + sizeof(remote_usbhid_iface_ops[0]), + .methods = remote_usbhid_iface_ops +}; + +usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface; + + +void remote_usbhid_get_event_length(ddf_fun_t *fun, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + usbhid_iface_t *hid_iface = (usbhid_iface_t *) iface; + + if (!hid_iface->get_event_length) { + async_answer_0(callid, ENOTSUP); + return; + } + + int len = hid_iface->get_event_length(fun); + if (len == 0) { + len = EEMPTY; + } + if (len < 0) { + async_answer_0(callid, len); + } else { + async_answer_1(callid, EOK, len); + } +} + +void remote_usbhid_get_event(ddf_fun_t *fun, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + usbhid_iface_t *hid_iface = (usbhid_iface_t *) iface; + + if (!hid_iface->get_event) { + async_answer_0(callid, ENOTSUP); + return; + } + + unsigned int flags = DEV_IPC_GET_ARG1(*call); + + size_t len; + ipc_callid_t data_callid; + if (!async_data_read_receive(&data_callid, &len)) { + async_answer_0(callid, EPARTY); + return; + } + /* Check that length is even number. Truncate otherwise. */ + if ((len % 2) == 1) { + len--; + } + if (len == 0) { + async_answer_0(data_callid, EINVAL); + async_answer_0(callid, EINVAL); + } + + int rc; + + size_t items = len / 2; + uint16_t *usage_pages_and_usages = malloc(sizeof(uint16_t) * len); + if (usage_pages_and_usages == NULL) { + async_answer_0(data_callid, ENOMEM); + async_answer_0(callid, ENOMEM); + } + + size_t act_items; + int rc = hid_iface->get_event(fun, usage_pages_and_usages, + usage_pages_and_usages + items, items, &act_items, flags); + if (rc != EOK) { + free(usage_pages_and_usages); + async_answer_0(data_callid, rc); + async_answer_0(callid, rc); + } + if (act_items >= items) { + /* This shall not happen. */ + // FIXME: how about an assert here? + act_items = items; + } + + async_data_read_finalize(data_callid, usage_pages_and_usages, + act_items * 2 * sizeof(uint16_t)); + + free(usage_pages_and_usages); + + async_answer_0(callid, EOK); +} + +/** + * @} + */ Index: uspace/lib/drv/include/remote_usbhid.h =================================================================== --- uspace/lib/drv/include/remote_usbhid.h (revision 5ab4a48d32c23df2eb23375a41e3ba2eec2706e0) +++ uspace/lib/drv/include/remote_usbhid.h (revision 5ab4a48d32c23df2eb23375a41e3ba2eec2706e0) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libdrv + * @{ + */ +/** @file + */ + +#ifndef LIBDRV_REMOTE_USBHID_H_ +#define LIBDRV_REMOTE_USBHID_H_ + +remote_iface_t remote_usbhid_iface; + +#endif + +/** + * @} + */ Index: uspace/lib/drv/include/usbhid_iface.h =================================================================== --- uspace/lib/drv/include/usbhid_iface.h (revision 5ab4a48d32c23df2eb23375a41e3ba2eec2706e0) +++ uspace/lib/drv/include/usbhid_iface.h (revision 5ab4a48d32c23df2eb23375a41e3ba2eec2706e0) @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2010 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libdrv + * @{ + */ +/** @file + * USB HID interface definition. + */ + +#ifndef LIBDRV_USBHID_IFACE_H_ +#define LIBDRV_USBHID_IFACE_H_ + +#include "ddf/driver.h" +#include + +/** IPC methods for USB HID device interface. */ +typedef enum { + /** Get number of events reported in single burst. + * Parameters: none + * Answer: + * - EOK (expected always as long as device support USB HID interface) + * Parameters of the answer: + * - number of items + */ + IPC_M_USBHID_GET_EVENT_LENGTH, + /** Get single event from the HID device. + * The word single refers to set of individual events that were + * available at particular point in time. + * Parameters: + * - flags + * The call is followed by data read expecting two concatenated + * arrays. + * Answer: + * - EOK - events returned + * - EAGAIN - no event ready (only in non-blocking mode) + * + * It is okay if the client requests less data. Extra data must + * be truncated by the driver. + */ + IPC_M_USBHID_GET_EVENT +} usbhid_iface_funcs_t; + +/** USB HID interface flag - return immediately if no data are available. */ +#define USBHID_IFACE_FLAG_NON_BLOCKING (1 << 0) + +/** USB HID device communication interface. */ +typedef struct { + /** Get number of items in the event. + * + * @param[in] fun DDF function answering the request. + * @return Number of events or error code. + */ + int (*get_event_length)(ddf_fun_t *fun); + + /** Get single event from the HID device. + * + * @param[in] fun DDF function answering the request. + * @param[out] usage_page Array of usage pages and usages. + * @param[out] usage Array of data (1:1 with @p usage). + * @param[in] size Size of @p usage and @p data arrays. + * @param[out] act_size Actual number of returned events. + * @param[in] flags Flags (see USBHID_IFACE_FLAG_*). + * @return Error code. + */ + int (*get_event)(ddf_fun_t *fun, + uint16_t *usage_page, uint16_t *usage, size_t size, size_t *act_size, + unsigned int flags); +} usbhid_iface_t; + + +#endif +/** + * @} + */