Changes in uspace/drv/bus/usb/usbhid/mouse/mousedev.c [9d58539:b803845] in mainline

File:

• uspace/drv/bus/usb/usbhid/mouse/mousedev.c (modified) (13 diffs)

uspace/drv/bus/usb/usbhid/mouse/mousedev.c

@@ -52 +52 @@
 #include "../usbhid.h"
 
-#define NAME "mouse"
+/** Number of simulated arrow-key presses for singel wheel step. */
+#define ARROWS_PER_SINGLE_WHEEL 3
+
+#define NAME  "mouse"
 
 /*----------------------------------------------------------------------------*/
@@ -66 +69 @@
 
 const char *HID_MOUSE_FUN_NAME = "mouse";
+const char *HID_MOUSE_WHEEL_FUN_NAME = "mouse-wheel";
 const char *HID_MOUSE_CATEGORY = "mouse";
+const char *HID_MOUSE_WHEEL_CATEGORY = "keyboard";
 
 /** Default idle rate for mouses. */
@@ -72 +77 @@
 
 /*----------------------------------------------------------------------------*/
-static const uint8_t USB_MOUSE_BOOT_REPORT_DESCRIPTOR[] = {
+
+enum {
+        USB_MOUSE_BOOT_REPORT_DESCRIPTOR_SIZE = 63
+};
+
+static const uint8_t USB_MOUSE_BOOT_REPORT_DESCRIPTOR[
+    USB_MOUSE_BOOT_REPORT_DESCRIPTOR_SIZE] = {
         0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)
         0x09, 0x02,                    // USAGE (Mouse)
@@ -112 +123 @@
     ipc_callid_t icallid, ipc_call_t *icall)
 {
-        usb_mouse_t *mouse_dev = fun->driver_data;
+        usb_mouse_t *mouse_dev = (usb_mouse_t *) fun->driver_data;
 
         if (mouse_dev == NULL) {
-                usb_log_debug("%s: Missing parameters.\n", __FUNCTION__);
+                usb_log_debug("default_connection_handler: Missing "
+                    "parameters.\n");
                 async_answer_0(icallid, EINVAL);
                 return;
         }
 
-        usb_log_debug("%s: fun->name: %s\n", __FUNCTION__, fun->name);
-        usb_log_debug("%s: mouse_sess: %p\n",
-            __FUNCTION__, mouse_dev->mouse_sess);
+        usb_log_debug("default_connection_handler: fun->name: %s\n",
+                      fun->name);
+        usb_log_debug("default_connection_handler: mouse_sess: %p, "
+            "wheel_sess: %p\n", mouse_dev->mouse_sess, mouse_dev->wheel_sess);
+
+        async_sess_t **sess_ptr =
+            (str_cmp(fun->name, HID_MOUSE_FUN_NAME) == 0) ?
+            &mouse_dev->mouse_sess : &mouse_dev->wheel_sess;
 
         async_sess_t *sess =
             async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
         if (sess != NULL) {
-                if (mouse_dev->mouse_sess == NULL) {
-                        mouse_dev->mouse_sess = sess;
-                        usb_log_debug("Console session to %s set ok (%p).\n",
-                            fun->name, sess);
+                if (*sess_ptr == NULL) {
+                        *sess_ptr = sess;
+                        usb_log_debug("Console session to mouse set ok (%p).\n",
+                            sess);
                         async_answer_0(icallid, EOK);
                 } else {
-                        usb_log_error("Console session to %s already set.\n",
-                            fun->name);
+                        usb_log_debug("default_connection_handler: Console "
+                            "session to mouse already set.\n");
                         async_answer_0(icallid, ELIMIT);
-                        async_hangup(sess);
                 }
         } else {
-                usb_log_debug("%s: Invalid function.\n", __FUNCTION__);
+                usb_log_debug("default_connection_handler: Invalid function.\n");
                 async_answer_0(icallid, EINVAL);
         }
 }
-/*----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*/
+
+static usb_mouse_t *usb_mouse_new(void)
+{
+        usb_mouse_t *mouse = calloc(1, sizeof(usb_mouse_t));
+        if (mouse == NULL) {
+                return NULL;
+        }
+        mouse->mouse_sess = NULL;
+        mouse->wheel_sess = NULL;
+
+        return mouse;
+}
+
+/*----------------------------------------------------------------------------*/
+
+static void usb_mouse_destroy(usb_mouse_t *mouse_dev)
+{
+        assert(mouse_dev != NULL);
+
+        // hangup session to the console
+        if (mouse_dev->mouse_sess != NULL)
+                async_hangup(mouse_dev->mouse_sess);
+
+        if (mouse_dev->wheel_sess != NULL)
+                async_hangup(mouse_dev->wheel_sess);
+        int ret = ddf_fun_unbind(mouse_dev->mouse_fun);
+        if (ret != EOK) {
+                usb_log_error("Failed to unbind mouse function.\n");
+        } else {
+                ddf_fun_destroy(mouse_dev->mouse_fun);
+                /* Prevent double free */
+                mouse_dev->wheel_fun->driver_data = NULL;
+        }
+
+        ret = ddf_fun_unbind(mouse_dev->wheel_fun);
+        if (ret != EOK) {
+                usb_log_error("Failed to unbind wheel function.\n");
+        } else {
+                ddf_fun_destroy(mouse_dev->wheel_fun);
+        }
+}
+
+/*----------------------------------------------------------------------------*/
+
+static void usb_mouse_send_wheel(const usb_mouse_t *mouse_dev, int wheel)
+{
+        unsigned int key = (wheel > 0) ? KC_UP : KC_DOWN;
+
+        if (mouse_dev->wheel_sess == NULL) {
+                usb_log_warning(
+                    "Connection to console not ready, wheel roll discarded.\n");
+                return;
+        }
+
+        int count = ((wheel < 0) ? -wheel : wheel) * ARROWS_PER_SINGLE_WHEEL;
+        int i;
+
+        for (i = 0; i < count; i++) {
+                /* Send arrow press and release. */
+                usb_log_debug2("Sending key %d to the console\n", key);
+                
+                async_exch_t *exch = async_exchange_begin(mouse_dev->wheel_sess);
+                
+                async_msg_4(exch, KBDEV_EVENT, KEY_PRESS, key, 0, 0);
+                async_msg_4(exch, KBDEV_EVENT, KEY_RELEASE, key, 0, 0);
+                
+                async_exchange_end(exch);
+        }
+}
+
+/*----------------------------------------------------------------------------*/
+
 static int get_mouse_axis_move_value(uint8_t rid, usb_hid_report_t *report,
     int32_t usage)
@@ -178 +267 @@
         }
 
-        const int shift_x = get_mouse_axis_move_value(hid_dev->report_id,
+        int shift_x = get_mouse_axis_move_value(hid_dev->report_id,
             &hid_dev->report, USB_HIDUT_USAGE_GENERIC_DESKTOP_X);
-        const int shift_y = get_mouse_axis_move_value(hid_dev->report_id,
+        int shift_y = get_mouse_axis_move_value(hid_dev->report_id,
             &hid_dev->report, USB_HIDUT_USAGE_GENERIC_DESKTOP_Y);
-        const int wheel = get_mouse_axis_move_value(hid_dev->report_id,
+        int wheel = get_mouse_axis_move_value(hid_dev->report_id,
             &hid_dev->report, USB_HIDUT_USAGE_GENERIC_DESKTOP_WHEEL);
 
-        if (shift_x || shift_y || wheel) {
+        if ((shift_x != 0) || (shift_y != 0)) {
                 async_exch_t *exch =
                     async_exchange_begin(mouse_dev->mouse_sess);
-                if (exch != NULL) {
-                        async_msg_3(exch, MOUSEEV_MOVE_EVENT,
-                            shift_x, shift_y, wheel);
-                        async_exchange_end(exch);
-                }
-        }
-
-        /* Buttons */
+                async_req_2_0(exch, MOUSEEV_MOVE_EVENT, shift_x, shift_y);
+                async_exchange_end(exch);
+        }
+
+        if (wheel != 0)
+                usb_mouse_send_wheel(mouse_dev, wheel);
+
+        /*
+         * Buttons
+         */
         usb_hid_report_path_t *path = usb_hid_report_path();
-        if (path == NULL) {
-                usb_log_warning("Failed to create USB HID report path.\n");
-                return true;
-        }
-        int ret =
-           usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0);
-        if (ret != EOK) {
-                usb_hid_report_path_free(path);
-                usb_log_warning("Failed to add buttons to report path.\n");
-                return true;
-        }
+        usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0);
         usb_hid_report_path_set_report_id(path, hid_dev->report_id);
 
@@ -217 +298 @@
                 usb_log_debug2(NAME " VALUE(%X) USAGE(%X)\n", field->value,
                     field->usage);
-                assert(field->usage > field->usage_minimum);
-                const unsigned index = field->usage - field->usage_minimum;
-                assert(index < mouse_dev->buttons_count);
-
-                if (mouse_dev->buttons[index] == 0 && field->value != 0) {
+                
+                if (mouse_dev->buttons[field->usage - field->usage_minimum] == 0
+                    && field->value != 0) {
                         async_exch_t *exch =
                             async_exchange_begin(mouse_dev->mouse_sess);
-                        if (exch != NULL) {
-                                async_req_2_0(exch, MOUSEEV_BUTTON_EVENT,
-                                    field->usage, 1);
-                                async_exchange_end(exch);
-                                mouse_dev->buttons[index] = field->value;
-                        }
-
-                } else if (mouse_dev->buttons[index] != 0 && field->value == 0) {
+                        async_req_2_0(exch, MOUSEEV_BUTTON_EVENT, field->usage, 1);
+                        async_exchange_end(exch);
+                        
+                        mouse_dev->buttons[field->usage - field->usage_minimum]
+                            = field->value;
+                } else if (mouse_dev->buttons[field->usage - field->usage_minimum] != 0
+                    && field->value == 0) {
                         async_exch_t *exch =
                             async_exchange_begin(mouse_dev->mouse_sess);
-                        if (exch != NULL) {
-                                async_req_2_0(exch, MOUSEEV_BUTTON_EVENT,
-                                    field->usage, 0);
-                                async_exchange_end(exch);
-                                mouse_dev->buttons[index] = field->value;
-                        }
+                        async_req_2_0(exch, MOUSEEV_BUTTON_EVENT, field->usage, 0);
+                        async_exchange_end(exch);
+
+                        mouse_dev->buttons[field->usage - field->usage_minimum] =
+                           field->value;
                 }
 
@@ -252 +329 @@
         return true;
 }
-/*----------------------------------------------------------------------------*/
-#define FUN_UNBIND_DESTROY(fun) \
-if (fun) { \
-        if (ddf_fun_unbind((fun)) == EOK) { \
-                (fun)->driver_data = NULL; \
-                ddf_fun_destroy((fun)); \
-        } else { \
-                usb_log_error("Could not unbind function `%s', it " \
-                    "will not be destroyed.\n", (fun)->name); \
-        } \
-} else (void)0
-/*----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*/
+
 static int usb_mouse_create_function(usb_hid_dev_t *hid_dev, usb_mouse_t *mouse)
 {
@@ -271 +339 @@
         /* Create the exposed function. */
         usb_log_debug("Creating DDF function %s...\n", HID_MOUSE_FUN_NAME);
-        ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed,
+        ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 
             HID_MOUSE_FUN_NAME);
         if (fun == NULL) {
-                usb_log_error("Could not create DDF function node `%s'.\n",
-                    HID_MOUSE_FUN_NAME);
+                usb_log_error("Could not create DDF function node.\n");
                 return ENOMEM;
         }
@@ -284 +351 @@
         int rc = ddf_fun_bind(fun);
         if (rc != EOK) {
-                usb_log_error("Could not bind DDF function `%s': %s.\n",
-                    fun->name, str_error(rc));
-                fun->driver_data = NULL;
-                ddf_fun_destroy(fun);
-                return rc;
-        }
-
-        usb_log_debug("Adding DDF function `%s' to category %s...\n",
-            fun->name, HID_MOUSE_CATEGORY);
+                usb_log_error("Could not bind DDF function: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+
+        usb_log_debug("Adding DDF function to category %s...\n", 
+            HID_MOUSE_CATEGORY);
         rc = ddf_fun_add_to_category(fun, HID_MOUSE_CATEGORY);
         if (rc != EOK) {
@@ -298 +363 @@
                     "Could not add DDF function to category %s: %s.\n",
                     HID_MOUSE_CATEGORY, str_error(rc));
-                FUN_UNBIND_DESTROY(fun);
                 return rc;
         }
         mouse->mouse_fun = fun;
 
+        /*
+         * Special function for acting as keyboard (wheel)
+         */
+        usb_log_debug("Creating DDF function %s...\n", 
+                      HID_MOUSE_WHEEL_FUN_NAME);
+        fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 
+            HID_MOUSE_WHEEL_FUN_NAME);
+        if (fun == NULL) {
+                usb_log_error("Could not create DDF function node.\n");
+                return ENOMEM;
+        }
+
+        /*
+         * Store the initialized HID device and HID ops
+         * to the DDF function.
+         */
+        fun->ops = &mouse->ops;
+        fun->driver_data = mouse;
+
+        rc = ddf_fun_bind(fun);
+        if (rc != EOK) {
+                usb_log_error("Could not bind DDF function: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+
+        usb_log_debug("Adding DDF function to category %s...\n", 
+            HID_MOUSE_WHEEL_CATEGORY);
+        rc = ddf_fun_add_to_category(fun, HID_MOUSE_WHEEL_CATEGORY);
+        if (rc != EOK) {
+                usb_log_error(
+                    "Could not add DDF function to category %s: %s.\n",
+                    HID_MOUSE_WHEEL_CATEGORY, str_error(rc));
+                return rc;
+        }
+        mouse->wheel_fun = fun;
+
         return EOK;
 }
+
+/*----------------------------------------------------------------------------*/
 
 /** Get highest index of a button mentioned in given report.
@@ -345 +448 @@
         return highest_button;
 }
-/*----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*/
+
 int usb_mouse_init(usb_hid_dev_t *hid_dev, void **data)
 {
@@ -356 +461 @@
         }
 
-        usb_mouse_t *mouse_dev = calloc(1, sizeof(usb_mouse_t));
+        usb_mouse_t *mouse_dev = usb_mouse_new();
         if (mouse_dev == NULL) {
                 usb_log_error("Error while creating USB/HID Mouse device "
@@ -379 +484 @@
         }
 
+
+        // save the Mouse device structure into the HID device structure
+        *data = mouse_dev;
+
         // set handler for incoming calls
         mouse_dev->ops.default_handler = default_connection_handler;
 
         // TODO: how to know if the device supports the request???
-        usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe,
+        usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe, 
             hid_dev->usb_dev->interface_no, IDLE_RATE);
 
         int rc = usb_mouse_create_function(hid_dev, mouse_dev);
         if (rc != EOK) {
-                free(mouse_dev->buttons);
-                free(mouse_dev);
-                return rc;
-        }
-
-        /* Save the Mouse device structure into the HID device structure. */
-        *data = mouse_dev;
+                usb_mouse_destroy(mouse_dev);
+                return rc;
+        }
 
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*/
+
 bool usb_mouse_polling_callback(usb_hid_dev_t *hid_dev, void *data)
 {
         if (hid_dev == NULL || data == NULL) {
-                usb_log_error(
-                    "Missing argument to the mouse polling callback.\n");
+                usb_log_error("Missing argument to the mouse polling callback."
+                    "\n");
                 return false;
         }
 
-        usb_mouse_t *mouse_dev = data;
-
+        usb_mouse_t *mouse_dev = (usb_mouse_t *)data;
+                
         return usb_mouse_process_report(hid_dev, mouse_dev);
 }
-/*----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*/
+
 void usb_mouse_deinit(usb_hid_dev_t *hid_dev, void *data)
 {
-        if (data == NULL)
-                return;
-
-        usb_mouse_t *mouse_dev = data;
-
-        /* Hangup session to the console */
-        if (mouse_dev->mouse_sess != NULL) {
-                const int ret = async_hangup(mouse_dev->mouse_sess);
-                if (ret != EOK)
-                        usb_log_warning("Failed to hang up mouse session: "
-                            "%p, %s.\n", mouse_dev->mouse_sess, str_error(ret));
-        }
-
-        FUN_UNBIND_DESTROY(mouse_dev->mouse_fun);
-
-        free(mouse_dev->buttons);
-        free(mouse_dev);
-}
-/*----------------------------------------------------------------------------*/
+        if (data != NULL) {
+                usb_mouse_destroy(data);
+        }
+}
+
+/*----------------------------------------------------------------------------*/
+
 int usb_mouse_set_boot_protocol(usb_hid_dev_t *hid_dev)
 {
         int rc = usb_hid_parse_report_descriptor(
             &hid_dev->report, USB_MOUSE_BOOT_REPORT_DESCRIPTOR,
-            sizeof(USB_MOUSE_BOOT_REPORT_DESCRIPTOR));
+            USB_MOUSE_BOOT_REPORT_DESCRIPTOR_SIZE);
 
         if (rc != EOK) {