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

File:

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

uspace/srv/hid/console/console.c

@@ -41 +41 @@
 #include <ipc/ns.h>
 #include <errno.h>
-#include <str_error.h>
 #include <ipc/console.h>
 #include <unistd.h>
@@ -65 +64 @@
 #define NAME       "console"
 #define NAMESPACE  "term"
-/** Interval for checking for new keyboard (1/4s). */
-#define HOTPLUG_WATCH_INTERVAL (1000 * 250)
 
 /** Phone to the keyboard driver. */
@@ -320 +317 @@
 static void change_console(console_t *cons)
 {
-        if (cons == active_console) {
+        if (cons == active_console)
                 return;
-        }
         
         fb_pending_flush();
@@ -462 +458 @@
                         if (IPC_GET_ARG1(call) == 1) {
                                 int newcon = gcons_mouse_btn((bool) IPC_GET_ARG2(call));
-                                if (newcon != -1) {
+                                if (newcon != -1)
                                         change_console(&consoles[newcon]);
-                                }
                         }
                         retval = 0;
@@ -715 +710 @@
 }
 
-static int connect_keyboard_or_mouse(const char *devname,
-    async_client_conn_t handler, const char *path)
-{
-        int fd = open(path, O_RDONLY);
-        if (fd < 0) {
-                return fd;
-        }
-        
-        int phone = fd_phone(fd);
-        if (phone < 0) {
+static bool console_init(char *input)
+{
+        /* Connect to input device */
+        int input_fd = open(input, O_RDONLY);
+        if (input_fd < 0) {
+                printf(NAME ": Failed opening %s\n", input);
+                return false;
+        }
+        
+        kbd_phone = fd_phone(input_fd);
+        if (kbd_phone < 0) {
                 printf(NAME ": Failed to connect to input device\n");
-                return phone;
-        }
-        
-        int rc = async_connect_to_me(phone, SERVICE_CONSOLE, 0, 0, handler);
-        if (rc != EOK) {
-                printf(NAME ": " \
-                    "Failed to create callback from input device: %s.\n",
-                    str_error(rc));
-                return rc;
-        }
-        
-        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/.
- *
- * @param arg Class name.
- * @return This function should never exit.
- */
-static int check_new_device_fibril(void *arg)
-{
-        struct hid_class_info *dev_info = arg;
-
-        size_t index = 1;
-
-        while (true) {
-                async_usleep(HOTPLUG_WATCH_INTERVAL);
-                char *path;
-                int rc = asprintf(&path, "/dev/class/%s\\%zu",
-                    dev_info->classname, index);
-                if (rc < 0) {
-                        continue;
-                }
-                rc = 0;
-                rc = dev_info->connection_func(path);
-                if (rc > 0) {
-                        /* We do not allow unplug. */
-                        index++;
-                }
-
-                free(path);
-        }
-
-        return EOK;
-}
-
-
-/** Start a fibril monitoring hot-plugged keyboards.
- */
-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 for %s.\n",
-                    classname);
-                return;
-        }
-        fibril_add_ready(fid);
-}
-
-static bool console_init(char *input)
-{
-        /* Connect to input device */
-        kbd_phone = connect_keyboard(input);
-        if (kbd_phone < 0) {
                 return false;
         }
-
-        mouse_phone = connect_mouse("/dev/hid_in/mouse");
+        
+        /* NB: The callback connection is slotted for removal */
+        if (async_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, keyboard_events)
+            != 0) {
+                printf(NAME ": Failed to create callback from input device\n");
+                return false;
+        }
+        
+        /* 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);
         if (mouse_phone < 0) {
-                printf(NAME ": Failed to connect to mouse device: %s.\n",
-                    str_error(mouse_phone));
-        }
+                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:
         
         /* Connect to framebuffer driver */
@@ -916 +837 @@
                 printf(NAME ": Error registering kconsole notifications\n");
         
-        /* Start fibril for checking on hot-plugged keyboards. */
-        check_new_devices_in_background(connect_keyboard, "keyboard");
-        check_new_devices_in_background(connect_mouse, "mouse");
-
         return true;
 }
@@ -939 +856 @@
         if (!console_init(argv[1]))
                 return -1;
-
+        
         printf(NAME ": Accepting connections\n");
         async_manager();