Changes in uspace/srv/hid/console/console.c [30db06c:103ae7f8] in mainline

File:

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

uspace/srv/hid/console/console.c

@@ -715 +715 @@
 }
 
-static int connect_keyboard(char *path)
+static int connect_keyboard_or_mouse(const char *devname,
+    async_client_conn_t handler, const char *path)
 {
         int fd = open(path, O_RDONLY);
@@ -728 +729 @@
         }
         
-        int rc = async_connect_to_me(phone, SERVICE_CONSOLE, 0, 0,
-            keyboard_events);
+        int rc = async_connect_to_me(phone, SERVICE_CONSOLE, 0, 0, handler);
         if (rc != EOK) {
                 printf(NAME ": " \
@@ -737 +737 @@
         }
         
-        printf(NAME ": found keyboard \"%s\".\n", path);
+        printf(NAME ": found %s \"%s\".\n", devname, path);
 
         return phone;
 }
 
+static int connect_keyboard(const char *path)
+{
+        return connect_keyboard_or_mouse("keyboard", keyboard_events, path);
+}
+
+static int connect_mouse(const char *path)
+{
+        return connect_keyboard_or_mouse("mouse", mouse_events, path);
+}
+
+struct hid_class_info {
+        char *classname;
+        int (*connection_func)(const char *);
+};
 
 /** Periodically check for new keyboards in /dev/class/.
@@ -748 +762 @@
  * @return This function should never exit.
  */
-static int check_new_keyboards(void *arg)
-{
-        char *class_name = (char *) arg;
+static int check_new_device_fibril(void *arg)
+{
+        struct hid_class_info *dev_info = arg;
 
         size_t index = 1;
@@ -758 +772 @@
                 char *path;
                 int rc = asprintf(&path, "/dev/class/%s\\%zu",
-                    class_name, index);
+                    dev_info->classname, index);
                 if (rc < 0) {
                         continue;
                 }
                 rc = 0;
-                rc = connect_keyboard(path);
+                rc = dev_info->connection_func(path);
                 if (rc > 0) {
                         /* We do not allow unplug. */
@@ -778 +792 @@
 /** Start a fibril monitoring hot-plugged keyboards.
  */
-static void check_new_keyboards_in_background()
-{
-        fid_t fid = fibril_create(check_new_keyboards, (void *)"keyboard");
+static void check_new_devices_in_background(int (*connection_func)(const char *),
+    const char *classname)
+{
+        struct hid_class_info *dev_info = malloc(sizeof(struct hid_class_info));
+        if (dev_info == NULL) {
+                printf(NAME ": " \
+                    "out of memory, will not start hot-plug-watch fibril.\n");
+                return;
+        }
+        int rc;
+
+        rc = asprintf(&dev_info->classname, "%s", classname);
+        if (rc < 0) {
+                printf(NAME ": failed to format classname: %s.\n",
+                    str_error(rc));
+                return;
+        }
+        dev_info->connection_func = connection_func;
+
+        fid_t fid = fibril_create(check_new_device_fibril, (void *)dev_info);
         if (!fid) {
-                printf(NAME ": failed to create hot-plug-watch fibril.\n");
+                printf(NAME
+                    ": failed to create hot-plug-watch fibril for %s.\n",
+                    classname);
                 return;
         }
@@ -796 +829 @@
         }
 
-        /* Connect to mouse device */
-        mouse_phone = -1;
-        int mouse_fd = open("/dev/hid_in/mouse", O_RDONLY);
-        
-        if (mouse_fd < 0) {
-                printf(NAME ": Notice - failed opening %s\n", "/dev/hid_in/mouse");
-                goto skip_mouse;
-        }
-        
-        mouse_phone = fd_phone(mouse_fd);
+        mouse_phone = connect_mouse("/dev/hid_in/mouse");
         if (mouse_phone < 0) {
-                printf(NAME ": Failed to connect to mouse device\n");
-                goto skip_mouse;
-        }
-        
-        if (async_connect_to_me(mouse_phone, SERVICE_CONSOLE, 0, 0, mouse_events)
-            != 0) {
-                printf(NAME ": Failed to create callback from mouse device\n");
-                mouse_phone = -1;
-                goto skip_mouse;
-        }
-        
-skip_mouse:
+                printf(NAME ": Failed to connect to mouse device: %s.\n",
+                    str_error(mouse_phone));
+        }
         
         /* Connect to framebuffer driver */
@@ -902 +917 @@
         
         /* Start fibril for checking on hot-plugged keyboards. */
-        check_new_keyboards_in_background();
+        check_new_devices_in_background(connect_keyboard, "keyboard");
+        check_new_devices_in_background(connect_mouse, "mouse");
 
         return true;