Changes in uspace/drv/bus/usb/usbhid/mouse/mousedev.c [4093b14:5f6e25e] in mainline

File:

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

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

@@ -42 +42 @@
 #include <errno.h>
 #include <async.h>
+#include <async_obsolete.h>
 #include <str_error.h>
 #include <ipc/mouseev.h>
@@ -55 +56 @@
 #define ARROWS_PER_SINGLE_WHEEL 3
 
-#define NAME  "mouse"
+// FIXME: remove this header
+#include <abi/ipc/methods.h>
+
+#define NAME "mouse"
 
 /*----------------------------------------------------------------------------*/
@@ -75 +79 @@
 /** Default idle rate for mouses. */
 static const uint8_t IDLE_RATE = 0;
+static const size_t USB_MOUSE_BUTTON_COUNT = 3;
 
 /*----------------------------------------------------------------------------*/
@@ -123 +128 @@
     ipc_callid_t icallid, ipc_call_t *icall)
 {
-        usb_mouse_t *mouse_dev = (usb_mouse_t *) fun->driver_data;
+        sysarg_t method = IPC_GET_IMETHOD(*icall);
+        
+        usb_mouse_t *mouse_dev = (usb_mouse_t *)fun->driver_data;
         
         if (mouse_dev == NULL) {
@@ -134 +141 @@
         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 (*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_debug("default_connection_handler: mouse_phone: %d, wheel "
+            "phone: %d\n", mouse_dev->mouse_phone, mouse_dev->wheel_phone);
+        
+        int *phone = (str_cmp(fun->name, HID_MOUSE_FUN_NAME) == 0) 
+                     ? &mouse_dev->mouse_phone : &mouse_dev->wheel_phone;
+        
+        if (method == IPC_M_CONNECT_TO_ME) {
+                int callback = IPC_GET_ARG5(*icall);
+
+                if (*phone != -1) {
                         usb_log_debug("default_connection_handler: Console "
-                            "session to mouse already set.\n");
+                            "phone to mouse already set.\n");
                         async_answer_0(icallid, ELIMIT);
+                        return;
                 }
-        } else {
-                usb_log_debug("default_connection_handler: Invalid function.\n");
-                async_answer_0(icallid, EINVAL);
-        }
+
+                *phone = callback;
+                usb_log_debug("Console phone to mouse set ok (%d).\n", *phone);
+                async_answer_0(icallid, EOK);
+                return;
+        }
+
+        usb_log_debug("default_connection_handler: Invalid function.\n");
+        async_answer_0(icallid, EINVAL);
 }
 
@@ -168 +175 @@
                 return NULL;
         }
-        mouse->mouse_sess = NULL;
-        mouse->wheel_sess = NULL;
+        mouse->mouse_phone = -1;
+        mouse->wheel_phone = -1;
         
         return mouse;
@@ -180 +187 @@
         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);
+        // hangup phone to the console
+        if (mouse_dev->mouse_phone >= 0) {
+                async_obsolete_hangup(mouse_dev->mouse_phone);
+        }
+        
+        if (mouse_dev->wheel_phone >= 0) {
+                async_obsolete_hangup(mouse_dev->wheel_phone);
+        }
 }
 
@@ -194 +203 @@
         unsigned int key = (wheel > 0) ? KC_UP : KC_DOWN;
 
-        if (mouse_dev->wheel_sess == NULL) {
+        if (mouse_dev->wheel_phone < 0) {
                 usb_log_warning(
                     "Connection to console not ready, wheel roll discarded.\n");
@@ -206 +215 @@
                 /* 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);
+                async_obsolete_msg_4(mouse_dev->wheel_phone, KBDEV_EVENT,
+                    KEY_PRESS, key, 0, 0);
+                async_obsolete_msg_4(mouse_dev->wheel_phone, KBDEV_EVENT,
+                    KEY_RELEASE, key, 0, 0);
         }
 }
@@ -247 +253 @@
         assert(mouse_dev != NULL);
         
-        if (mouse_dev->mouse_sess == NULL) {
-                usb_log_warning(NAME " No console session.\n");
+        if (mouse_dev->mouse_phone < 0) {
+                usb_log_warning(NAME " No console phone.\n");
                 return true;
         }
@@ -260 +266 @@
 
         if ((shift_x != 0) || (shift_y != 0)) {
-                async_exch_t *exch = async_exchange_begin(mouse_dev->mouse_sess);
-                async_req_2_0(exch, MOUSEEV_MOVE_EVENT, shift_x, shift_y);
-                async_exchange_end(exch);
-        }
-        
-        if (wheel != 0)
+                async_obsolete_req_2_0(mouse_dev->mouse_phone,
+                    MOUSEEV_MOVE_EVENT, shift_x, shift_y);
+        }
+
+        if (wheel != 0) {
                 usb_mouse_send_wheel(mouse_dev, wheel);
+        }
         
         /*
@@ -286 +292 @@
                 if (mouse_dev->buttons[field->usage - field->usage_minimum] == 0
                     && field->value != 0) {
-                        async_exch_t *exch =
-                            async_exchange_begin(mouse_dev->mouse_sess);
-                        async_req_2_0(exch, MOUSEEV_BUTTON_EVENT, field->usage, 1);
-                        async_exchange_end(exch);
-                        
+                        async_obsolete_req_2_0(mouse_dev->mouse_phone,
+                            MOUSEEV_BUTTON_EVENT, field->usage, 1);
                         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);
-                        async_req_2_0(exch, MOUSEEV_BUTTON_EVENT, field->usage, 0);
-                        async_exchange_end(exch);
-                        
+                        async_obsolete_req_2_0(mouse_dev->mouse_phone,
+                           MOUSEEV_BUTTON_EVENT, field->usage, 0);
                         mouse_dev->buttons[field->usage - field->usage_minimum] =
                            field->value;
@@ -396 +396 @@
 /*----------------------------------------------------------------------------*/
 
-/** Get highest index of a button mentioned in given report.
- *
- * @param report HID report.
- * @param report_id Report id we are interested in.
- * @return Highest button mentioned in the report.
- * @retval 1 No button was mentioned.
- *
- */
-static size_t usb_mouse_get_highest_button(usb_hid_report_t *report, uint8_t report_id)
-{
-        size_t highest_button = 0;
-
-        usb_hid_report_path_t *path = usb_hid_report_path();
-        usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0);
-        usb_hid_report_path_set_report_id(path, report_id);
-
-        usb_hid_report_field_t *field = NULL;
-
-        /* Break from within. */
-        while (1) {
-                field = usb_hid_report_get_sibling(
-                    report, field, path,
-                    USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
-                    USB_HID_REPORT_TYPE_INPUT);
-                /* No more buttons? */
-                if (field == NULL) {
-                        break;
-                }
-
-                size_t current_button = field->usage - field->usage_minimum;
-                if (current_button > highest_button) {
-                        highest_button = current_button;
-                }
-        }
-
-        usb_hid_report_path_free(path);
-
-        return highest_button;
-}
-
-/*----------------------------------------------------------------------------*/
-
 int usb_mouse_init(usb_hid_dev_t *hid_dev, void **data)
 {
@@ -455 +413 @@
         }
         
-        // FIXME: This may not be optimal since stupid hardware vendor may
-        // use buttons 1, 2, 3 and 6000 and we would allocate array of
-        // 6001*4B and use only 4 items in it.
-        // Since I doubt that hardware producers would do that, I think
-        // that the current solution is good enough.
-        /* Adding 1 because we will be accessing buttons[highest]. */
-        mouse_dev->buttons_count = usb_mouse_get_highest_button(hid_dev->report,
-            hid_dev->report_id) + 1;
-        mouse_dev->buttons = calloc(mouse_dev->buttons_count, sizeof(int32_t));
+        mouse_dev->buttons = (int32_t *)calloc(USB_MOUSE_BUTTON_COUNT, 
+            sizeof(int32_t));
         
         if (mouse_dev->buttons == NULL) {
-                usb_log_error(NAME ": out of memory, giving up on device!\n");
+                usb_log_fatal("No memory!\n");
                 free(mouse_dev);
                 return ENOMEM;
         }
-
-
+        
         // save the Mouse device structure into the HID device structure
         *data = mouse_dev;