Changes in uspace/srv/hid/input/generic/input.c [10a5479d:5da7199] in mainline

File:

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

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

@@ -39 +39 @@
 #include <adt/list.h>
 #include <bool.h>
-#include <fibril_synch.h>
 #include <ipc/services.h>
 #include <ipc/input.h>
@@ -84 +83 @@
 async_sess_t *irc_sess = NULL;
 
-static FIBRIL_MUTEX_INITIALIZE(discovery_lock);
-
 void kbd_push_data(kbd_dev_t *kdev, sysarg_t data)
 {
@@ -175 +172 @@
 
 /** Mouse pointer has moved. */
-void mouse_push_event_move(mouse_dev_t *mdev, int dx, int dy, int dz)
+void mouse_push_event_move(mouse_dev_t *mdev, int dx, int dy)
 {
         async_exch_t *exch = async_exchange_begin(client_sess);
-        if (dx || dy)
-                async_msg_2(exch, INPUT_EVENT_MOVE, dx, dy);
-        if (dz) {
-                // TODO: Implement proper wheel support
-                keycode_t code = dz > 0 ? KC_UP : KC_DOWN;
-                for (int i = 0; i < 3; ++i) {
-                        async_msg_4(exch, INPUT_EVENT_KEY, KEY_PRESS, code, 0, 0);
-                }
-                async_msg_4(exch, INPUT_EVENT_KEY, KEY_RELEASE, code, 0, 0);
-        }
+        async_msg_2(exch, INPUT_EVENT_MOVE, dx, dy);
         async_exchange_end(exch);
 }
@@ -409 +397 @@
          * them automatically.
          */
+#if defined(UARCH_amd64)
+        kbd_add_dev(&chardev_port, &pc_ctl);
+#endif
 #if defined(UARCH_arm32) && defined(MACHINE_gta02)
         kbd_add_dev(&chardev_port, &stty_ctl);
@@ -420 +411 @@
 #if defined(UARCH_arm32) && defined(MACHINE_integratorcp)
         kbd_add_dev(&pl050_port, &pc_ctl);
+#endif
+#if defined(UARCH_ia32)
+        kbd_add_dev(&chardev_port, &pc_ctl);
+#endif
+#if defined(MACHINE_i460GX)
+        kbd_add_dev(&chardev_port, &pc_ctl);
 #endif
 #if defined(MACHINE_ski)
@@ -453 +450 @@
          * them automatically.
          */
+#if defined(UARCH_amd64)
+        mouse_add_dev(&chardev_mouse_port, &ps2_proto);
+#endif
+#if defined(UARCH_ia32)
+        mouse_add_dev(&chardev_mouse_port, &ps2_proto);
+#endif
+#if defined(MACHINE_i460GX)
+        mouse_add_dev(&chardev_mouse_port, &ps2_proto);
+#endif
 #if defined(UARCH_ppc32)
         mouse_add_dev(&adb_mouse_port, &adb_proto);
@@ -596 +602 @@
         int rc;
         
-        fibril_mutex_lock(&discovery_lock);
-        
         rc = dev_check_new_kbdevs();
-        if (rc != EOK) {
-                fibril_mutex_unlock(&discovery_lock);
+        if (rc != EOK)
                 return rc;
-        }
         
         rc = dev_check_new_mousedevs();
-        if (rc != EOK) {
-                fibril_mutex_unlock(&discovery_lock);
+        if (rc != EOK)
                 return rc;
-        }
-        
-        fibril_mutex_unlock(&discovery_lock);
-        
+
         return EOK;
 }
@@ -660 +658 @@
         
         /* Register driver */
-        async_set_client_connection(client_connection);
-        int rc = loc_server_register(NAME);
+        int rc = loc_server_register(NAME, client_connection);
         if (rc < 0) {
                 printf("%s: Unable to register server (%d)\n", NAME, rc);