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

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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 (moved) (moved from uspace/drv/usbhid/mouse/mousedev.c ) (17 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/mouse.h>
+#include <ipc/mouseev.h>
 #include <io/console.h>
 
@@ -56 +55 @@
 #define ARROWS_PER_SINGLE_WHEEL 3
 
-// FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
-
-#define NAME "mouse"
+#define NAME  "mouse"
 
 /*----------------------------------------------------------------------------*/
@@ -74 +70 @@
 const char *HID_MOUSE_FUN_NAME = "mouse";
 const char *HID_MOUSE_WHEEL_FUN_NAME = "mouse-wheel";
-const char *HID_MOUSE_CLASS_NAME = "mouse";
-const char *HID_MOUSE_WHEEL_CLASS_NAME = "keyboard";
+const char *HID_MOUSE_CATEGORY = "mouse";
+const char *HID_MOUSE_WHEEL_CATEGORY = "keyboard";
 
 /** Default idle rate for mouses. */
@@ -128 +124 @@
     ipc_callid_t icallid, ipc_call_t *icall)
 {
-        sysarg_t method = IPC_GET_IMETHOD(*icall);
-        
-        usb_mouse_t *mouse_dev = (usb_mouse_t *)fun->driver_data;
+        usb_mouse_t *mouse_dev = (usb_mouse_t *) fun->driver_data;
         
         if (mouse_dev == NULL) {
@@ -141 +135 @@
         usb_log_debug("default_connection_handler: fun->name: %s\n",
                       fun->name);
-        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: 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: Console "
-                            "phone to mouse already set.\n");
+                            "session to mouse already set.\n");
                         async_answer_0(icallid, ELIMIT);
-                        return;
                 }
-
-                *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);
+        } else {
+                usb_log_debug("default_connection_handler: Invalid function.\n");
+                async_answer_0(icallid, EINVAL);
+        }
 }
 
@@ -175 +169 @@
                 return NULL;
         }
-        mouse->mouse_phone = -1;
-        mouse->wheel_phone = -1;
+        mouse->mouse_sess = NULL;
+        mouse->wheel_sess = NULL;
         
         return mouse;
@@ -183 +177 @@
 /*----------------------------------------------------------------------------*/
 
-static void usb_mouse_free(usb_mouse_t **mouse_dev)
-{
-        assert(mouse_dev != NULL && *mouse_dev != NULL);
-        
-        // 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);
-        }
-        
-        free(*mouse_dev);
-        *mouse_dev = NULL;
+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);
 }
 
@@ -206 +195 @@
         unsigned int key = (wheel > 0) ? KC_UP : KC_DOWN;
 
-        if (mouse_dev->wheel_phone < 0) {
+        if (mouse_dev->wheel_sess == NULL) {
                 usb_log_warning(
                     "Connection to console not ready, wheel roll discarded.\n");
@@ -218 +207 @@
                 /* Send arrow press and release. */
                 usb_log_debug2("Sending key %d to the console\n", key);
-                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);
+                
+                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);
         }
 }
@@ -256 +248 @@
         assert(mouse_dev != NULL);
         
-        if (mouse_dev->mouse_phone < 0) {
-                usb_log_warning(NAME " No console phone.\n");
+        if (mouse_dev->mouse_sess == NULL) {
+                usb_log_warning(NAME " No console session.\n");
                 return true;
         }
@@ -269 +261 @@
 
         if ((shift_x != 0) || (shift_y != 0)) {
-                async_obsolete_req_2_0(mouse_dev->mouse_phone,
-                    MEVENT_MOVE, shift_x, shift_y);
-        }
-
-        if (wheel != 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)
                 usb_mouse_send_wheel(mouse_dev, wheel);
-        }
         
         /*
@@ -295 +287 @@
                 if (mouse_dev->buttons[field->usage - field->usage_minimum] == 0
                     && field->value != 0) {
-                        async_obsolete_req_2_0(mouse_dev->mouse_phone,
-                            MEVENT_BUTTON, field->usage, 1);
+                        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);
+                        
                         mouse_dev->buttons[field->usage - field->usage_minimum]
                             = field->value;
-                } else if (
-                    mouse_dev->buttons[field->usage - field->usage_minimum] != 0
+                } else if (mouse_dev->buttons[field->usage - field->usage_minimum] != 0
                     && field->value == 0) {
-                       async_obsolete_req_2_0(mouse_dev->mouse_phone,
-                           MEVENT_BUTTON, field->usage, 0);
-                       mouse_dev->buttons[field->usage - field->usage_minimum]
-                           = field->value;
-               }
+                        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);
+                        
+                        mouse_dev->buttons[field->usage - field->usage_minimum] =
+                           field->value;
+                }
                 
                 field = usb_hid_report_get_sibling(
@@ -326 +323 @@
         assert(mouse != NULL);
         
-        /* Create the function exposed under /dev/devices. */
+        /* 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, 
@@ -346 +343 @@
         }
         
-        usb_log_debug("Adding DDF function to class %s...\n", 
-            HID_MOUSE_CLASS_NAME);
-        rc = ddf_fun_add_to_class(fun, HID_MOUSE_CLASS_NAME);
+        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) {
                 usb_log_error(
-                    "Could not add DDF function to class %s: %s.\n",
-                    HID_MOUSE_CLASS_NAME, str_error(rc));
+                    "Could not add DDF function to category %s: %s.\n",
+                    HID_MOUSE_CATEGORY, str_error(rc));
                 ddf_fun_destroy(fun);
                 return rc;
@@ -384 +381 @@
         }
         
-        usb_log_debug("Adding DDF function to class %s...\n", 
-            HID_MOUSE_WHEEL_CLASS_NAME);
-        rc = ddf_fun_add_to_class(fun, HID_MOUSE_WHEEL_CLASS_NAME);
+        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 class %s: %s.\n",
-                    HID_MOUSE_WHEEL_CLASS_NAME, str_error(rc));
+                    "Could not add DDF function to category %s: %s.\n",
+                    HID_MOUSE_WHEEL_CATEGORY, str_error(rc));
                 ddf_fun_destroy(fun);
                 return rc;
@@ -438 +435 @@
         int rc = usb_mouse_create_function(hid_dev, mouse_dev);
         if (rc != EOK) {
-                usb_mouse_free(&mouse_dev);
+                usb_mouse_destroy(mouse_dev);
                 return rc;
         }
@@ -465 +462 @@
 {
         if (data != NULL) {
-                usb_mouse_free((usb_mouse_t **)&data);
+                usb_mouse_destroy((usb_mouse_t *)data);
         }
 }