Changeset efdfebc in mainline for uspace/drv/bus/usb/usbhid/mouse/mousedev.c

Timestamp:

2012-11-06T21:03:44Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

338810f

Parents:

de73242 (diff), 94795812 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

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