Changeset 21bb58d in mainline

Timestamp:

2011-03-02T20:20:42Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

24aa62c, 5dd9209

Parents:

103ae7f8

Message:

USB mouse sends events to console

The values are not properly scaled, the clicking is very simple
(doubt that the console is able to handle something more
complicated) but it is possible to switch consoles with the mouse.

Tested in QEMU only.

Location:

uspace/drv/usbmouse

Files:

• init.c (modified) (4 diffs)
• mouse.c (modified) (2 diffs)
• mouse.h (modified) (1 diff)

uspace/drv/usbmouse/init.c

@@ -100 +100 @@
 }
 
+static void default_connection_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *);
+static ddf_dev_ops_t mouse_ops = {
+        .default_handler = default_connection_handler
+};
+
+/** Default handler for IPC methods not handled by DDF.
+ *
+ * @param dev Device handling the call.
+ * @param icallid Call id.
+ * @param icall Call data.
+ */
+void default_connection_handler(ddf_fun_t *fun,
+    ipc_callid_t icallid, ipc_call_t *icall)
+{
+        sysarg_t method = IPC_GET_IMETHOD(*icall);
+
+        usb_mouse_t *mouse = (usb_mouse_t *) fun->driver_data;
+        assert(mouse != NULL);
+
+        if (method == IPC_M_CONNECT_TO_ME) {
+                int callback = IPC_GET_ARG5(*icall);
+
+                if (mouse->console_phone != -1) {
+                        async_answer_0(icallid, ELIMIT);
+                        return;
+                }
+
+                mouse->console_phone = callback;
+                async_answer_0(icallid, EOK);
+                return;
+        }
+
+        async_answer_0(icallid, EINVAL);
+}
+
 
 int usb_mouse_create(ddf_dev_t *dev)
@@ -108 +143 @@
         }
         mouse->device = dev;
+        mouse->console_phone = -1;
 
         int rc;
@@ -144 +180 @@
                 goto leave;
         }
+
+        mouse->mouse_fun->ops = &mouse_ops;
+
         rc = ddf_fun_bind(mouse->mouse_fun);
         if (rc != EOK) {
@@ -157 +196 @@
         /* Everything allright. */
         dev->driver_data = mouse;
+        mouse->mouse_fun->driver_data = mouse;
 
         return EOK;

uspace/drv/usbmouse/mouse.c

@@ -37 +37 @@
 #include <usb/debug.h>
 #include <errno.h>
+#include <ipc/mouse.h>
 
 int usb_mouse_polling_fibril(void *arg)
@@ -94 +95 @@
                 }
 
+                if (mouse->console_phone >= 0) {
+                        if ((shift_x != 0) || (shift_y != 0)) {
+                                /* FIXME: guessed for QEMU */
+                                async_req_2_0(mouse->console_phone,
+                                    MEVENT_MOVE,
+                                    - shift_x / 10,  - shift_y / 10);
+                        }
+                        if (butt) {
+                                /* FIXME: proper button clicking. */
+                                async_req_2_0(mouse->console_phone,
+                                    MEVENT_BUTTON, 1, 1);
+                                async_req_2_0(mouse->console_phone,
+                                    MEVENT_BUTTON, 1, 0);
+                        }
+                }
+
                 usb_log_debug("buttons=%s  dX=%+3d  dY=%+3d  wheel=%+3d\n",
                    str_buttons, shift_x, shift_y, wheel);

uspace/drv/usbmouse/mouse.h

@@ -50 +50 @@
         usb_endpoint_pipe_t poll_pipe;
         suseconds_t poll_interval_us;
+        int console_phone;
 } usb_mouse_t;