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

File:

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

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

@@ -35 +35 @@
  */
 
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
-
 #include <usb/debug.h>
 #include <usb/classes/classes.h>
@@ -57 +54 @@
 #define NAME "mouse"
 
-static void default_connection_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *);
-
-static ddf_dev_ops_t ops = { .default_handler = default_connection_handler };
-
+/*----------------------------------------------------------------------------*/
 
 const usb_endpoint_description_t usb_hid_mouse_poll_endpoint_description = {
@@ -77 +71 @@
 static const uint8_t IDLE_RATE = 0;
 
-
+/*----------------------------------------------------------------------------*/
 static const uint8_t USB_MOUSE_BOOT_REPORT_DESCRIPTOR[] = {
         0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)
@@ -107 +101 @@
 };
 
-
+/*----------------------------------------------------------------------------*/
 
 /** Default handler for IPC methods not handled by DDF.
@@ -118 +112 @@
     ipc_callid_t icallid, ipc_call_t *icall)
 {
-        usb_mouse_t *mouse_dev = ddf_fun_data_get(fun);
+        usb_mouse_t *mouse_dev = fun->driver_data;
 
         if (mouse_dev == NULL) {
@@ -126 +120 @@
         }
 
-        usb_log_debug("%s: fun->name: %s\n", __FUNCTION__, ddf_fun_get_name(fun));
+        usb_log_debug("%s: fun->name: %s\n", __FUNCTION__, fun->name);
         usb_log_debug("%s: mouse_sess: %p\n",
             __FUNCTION__, mouse_dev->mouse_sess);
@@ -136 +130 @@
                         mouse_dev->mouse_sess = sess;
                         usb_log_debug("Console session to %s set ok (%p).\n",
-                            ddf_fun_get_name(fun), sess);
+                            fun->name, sess);
                         async_answer_0(icallid, EOK);
                 } else {
                         usb_log_error("Console session to %s already set.\n",
-                            ddf_fun_get_name(fun));
+                            fun->name);
                         async_answer_0(icallid, ELIMIT);
                         async_hangup(sess);
@@ -149 +143 @@
         }
 }
-
+/*----------------------------------------------------------------------------*/
 static int get_mouse_axis_move_value(uint8_t rid, usb_hid_report_t *report,
     int32_t usage)
@@ -227 +221 @@
                 assert(index < mouse_dev->buttons_count);
 
-                if (mouse_dev->buttons[index] != field->value) {
+                if (mouse_dev->buttons[index] == 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, (field->value != 0) ? 1 : 0);
+                                    field->usage, 1);
+                                async_exchange_end(exch);
+                                mouse_dev->buttons[index] = field->value;
+                        }
+
+                } else if (mouse_dev->buttons[index] != 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;
@@ -248 +252 @@
         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", ddf_fun_get_name(fun)); \
+                    "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)
 {
@@ -274 +279 @@
         }
 
-        ddf_fun_set_ops(fun, &ops);
-        ddf_fun_data_implant(fun, mouse);
+        fun->ops = &mouse->ops;
+        fun->driver_data = mouse;
 
         int rc = ddf_fun_bind(fun);
         if (rc != EOK) {
                 usb_log_error("Could not bind DDF function `%s': %s.\n",
-                    ddf_fun_get_name(fun), str_error(rc));
+                    fun->name, str_error(rc));
+                fun->driver_data = NULL;
                 ddf_fun_destroy(fun);
                 return rc;
@@ -286 +292 @@
 
         usb_log_debug("Adding DDF function `%s' to category %s...\n",
-            ddf_fun_get_name(fun), HID_MOUSE_CATEGORY);
+            fun->name, HID_MOUSE_CATEGORY);
         rc = ddf_fun_add_to_category(fun, HID_MOUSE_CATEGORY);
         if (rc != EOK) {
@@ -296 +302 @@
         }
         mouse->mouse_fun = fun;
+
         return EOK;
 }
@@ -338 +345 @@
         return highest_button;
 }
-
+/*----------------------------------------------------------------------------*/
 int usb_mouse_init(usb_hid_dev_t *hid_dev, void **data)
 {
@@ -372 +379 @@
         }
 
+        // 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,
@@ -388 +398 @@
         return EOK;
 }
-
+/*----------------------------------------------------------------------------*/
 bool usb_mouse_polling_callback(usb_hid_dev_t *hid_dev, void *data)
 {
@@ -401 +411 @@
         return usb_mouse_process_report(hid_dev, mouse_dev);
 }
-
+/*----------------------------------------------------------------------------*/
 void usb_mouse_deinit(usb_hid_dev_t *hid_dev, void *data)
 {
@@ -420 +430 @@
 
         free(mouse_dev->buttons);
-}
-
+        free(mouse_dev);
+}
+/*----------------------------------------------------------------------------*/
 int usb_mouse_set_boot_protocol(usb_hid_dev_t *hid_dev)
 {