Changeset 854eddd6 in mainline for uspace/srv/hid/input/generic/input.c

Timestamp:

2011-06-14T21:40:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

662da50, e3a46c2

Parents:

ecb692a2

Message:

Route mouse input through input server. Remove device-handling code from
console server.

File:

• uspace/srv/hid/input/generic/input.c (modified) (11 diffs)

uspace/srv/hid/input/generic/input.c

@@ -54 +54 @@
 #include <io/keycode.h>
 #include <devmap.h>
+#include <input.h>
 #include <kbd.h>
 #include <kbd_port.h>
 #include <kbd_ctl.h>
 #include <layout.h>
+#include <mouse.h>
 
 // FIXME: remove this header
@@ -68 +70 @@
 static void kbd_devs_reclaim(void);
 
+static void input_event_key(int, unsigned int, unsigned, wchar_t);
+
 int client_phone = -1;
 
 /** List of keyboard devices */
 static link_t kbd_devs;
+
+/** List of mouse devices */
+link_t mouse_devs;
 
 bool irc_service = false;
@@ -166 +173 @@
 
         ev.c = layout_parse_ev(kdev->active_layout, &ev);
-
-        async_obsolete_msg_4(client_phone, INPUT_EVENT, ev.type, ev.key, ev.mods, ev.c);
+        input_event_key(ev.type, ev.key, ev.mods, ev.c);
+}
+
+/** Key has been pressed or released. */
+static void input_event_key(int type, unsigned int key, unsigned mods,
+    wchar_t c)
+{
+        async_obsolete_msg_4(client_phone, INPUT_EVENT_KEY, type, key,
+            mods, c);
+}
+
+/** Mouse pointer has moved. */
+void input_event_move(int dx, int dy)
+{
+        async_obsolete_msg_2(client_phone, INPUT_EVENT_MOVE, dx, dy);
+}
+
+/** Mouse button has been pressed. */
+void input_event_button(int bnum, int press)
+{
+        async_obsolete_msg_2(client_phone, INPUT_EVENT_BUTTON, bnum, press);
 }
 
@@ -221 +247 @@
         kdev = calloc(1, sizeof(kbd_dev_t));
         if (kdev == NULL) {
-                printf(NAME ": Allocating keyboard device. Out of memory.\n");
+                printf(NAME ": Error allocating keyboard device. "
+                    "Out of memory.\n");
                 return NULL;
         }
@@ -374 +401 @@
 }
 
-/** Periodically check for new kbdev devices in /dev/class/keyboard.
+/** Periodically check for new input devices.
+ *
+ * Looks under /dev/class/keyboard and /dev/class/mouse.
  *
  * @param arg   Ignored
@@ -381 +410 @@
 {
         char *dev_path;
-        size_t id = 1;
+        size_t kbd_id = 1;
+        size_t mouse_id = 1;
         int rc;
 
@@ -387 +417 @@
                 async_usleep(DISCOVERY_POLL_INTERVAL);
 
-                rc = asprintf(&dev_path, "/dev/class/keyboard\\%zu", id);
+                /*
+                 * Check for new keyboard device
+                 */
+                rc = asprintf(&dev_path, "/dev/class/keyboard\\%zu", kbd_id);
                 if (rc < 0)
                         continue;
 
                 if (kbd_add_kbdev(dev_path) == EOK) {
-                        printf(NAME ": Connected kbdev device '%s'\n",
+                        printf(NAME ": Connected keyboard device '%s'\n",
                             dev_path);
 
                         /* XXX Handle device removal */
-                        ++id;
+                        ++kbd_id;
                 }
 
                 free(dev_path);
+
+                /*
+                 * Check for new mouse device
+                 */
+                rc = asprintf(&dev_path, "/dev/class/mouse\\%zu", mouse_id);
+                if (rc < 0)
+                        continue;
+
+                if (mouse_add_dev(dev_path) == EOK) {
+                        printf(NAME ": Connected mouse device '%s'\n",
+                            dev_path);
+
+                        /* XXX Handle device removal */
+                        ++mouse_id;
+                }
+
+                free(dev_path);
         }
 
@@ -406 +456 @@
 
 /** Start a fibril for discovering new devices. */
-static void kbd_start_dev_discovery(void)
+static void input_start_dev_discovery(void)
 {
         fid_t fid;
@@ -427 +477 @@
         
         list_initialize(&kbd_devs);
+        list_initialize(&mouse_devs);
         
         if (((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc))
@@ -437 +488 @@
         }
         
-        /* Add legacy devices. */
+        /* Add legacy keyboard devices. */
         kbd_add_legacy_devs();
 
+        /* Add legacy (devmap-style) mouse device. */
+        (void) mouse_add_dev("/dev/hid_in/mouse");
         
         /* Register driver */
@@ -457 +510 @@
         }
 
-        /* Start looking for new kbdev devices */
-        kbd_start_dev_discovery();
+        /* Start looking for new input devices */
+        input_start_dev_discovery();
 
         printf(NAME ": Accepting connections\n");