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

Timestamp:

2012-08-14T18:16:39Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

669f5cae

Parents:

76d92db1 (diff), 4802dd7 (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) (14 diffs)

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

@@ -54 +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 = {
@@ -71 +74 @@
 static const uint8_t IDLE_RATE = 0;
 
-/*----------------------------------------------------------------------------*/
+
 static const uint8_t USB_MOUSE_BOOT_REPORT_DESCRIPTOR[] = {
         0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)
@@ -101 +104 @@
 };
 
-/*----------------------------------------------------------------------------*/
+
 
 /** Default handler for IPC methods not handled by DDF.
@@ -143 +146 @@
         }
 }
-/*----------------------------------------------------------------------------*/
+
 static int get_mouse_axis_move_value(uint8_t rid, usb_hid_report_t *report,
     int32_t usage)
@@ -221 +224 @@
                 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 +245 @@
         return true;
 }
-/*----------------------------------------------------------------------------*/
+
 #define FUN_UNBIND_DESTROY(fun) \
 if (fun) { \
@@ -263 +256 @@
         } \
 } else (void)0
-/*----------------------------------------------------------------------------*/
+
 static int usb_mouse_create_function(usb_hid_dev_t *hid_dev, usb_mouse_t *mouse)
 {
@@ -279 +272 @@
         }
 
-        fun->ops = &mouse->ops;
+        fun->ops = &ops;
         fun->driver_data = mouse;
 
@@ -302 +295 @@
         }
         mouse->mouse_fun = fun;
-
         return EOK;
 }
@@ -345 +337 @@
         return highest_button;
 }
-/*----------------------------------------------------------------------------*/
+
 int usb_mouse_init(usb_hid_dev_t *hid_dev, void **data)
 {
@@ -379 +371 @@
         }
 
-        // 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 +387 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 bool usb_mouse_polling_callback(usb_hid_dev_t *hid_dev, void *data)
 {
@@ -411 +400 @@
         return usb_mouse_process_report(hid_dev, mouse_dev);
 }
-/*----------------------------------------------------------------------------*/
+
 void usb_mouse_deinit(usb_hid_dev_t *hid_dev, void *data)
 {
@@ -432 +421 @@
         free(mouse_dev);
 }
-/*----------------------------------------------------------------------------*/
+
 int usb_mouse_set_boot_protocol(usb_hid_dev_t *hid_dev)
 {