Changeset 0f31e2b in mainline for uspace/srv/hid/console/console.c

Timestamp:

2011-03-03T12:44:33Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

d3594362

Parents:

1c6c4092 (diff), 2c22f1f7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged development changes.

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>
@@ -64 +65 @@
 #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. */
@@ -712 +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);
@@ -725 +729 @@
         }
         
-        /* NB: The callback connection is slotted for removal */
-        sysarg_t phonehash;
-        sysarg_t taskhash;
-        int rc = async_req_3_5(phone, IPC_M_CONNECT_TO_ME, SERVICE_CONSOLE,
-            0, 0, NULL, NULL, NULL, &taskhash, &phonehash);
+        int rc = async_connect_to_me(phone, SERVICE_CONSOLE, 0, 0, handler);
         if (rc != EOK) {
-                printf(NAME ": Failed to create callback from input device\n");
+                printf(NAME ": " \
+                    "Failed to create callback from input device: %s.\n",
+                    str_error(rc));
                 return rc;
         }
         
-        async_new_connection(taskhash, phonehash, 0, NULL, keyboard_events);
-
-        printf(NAME ": we got a hit (new keyboard \"%s\").\n", path);
+        printf(NAME ": found %s \"%s\".\n", devname, path);
 
         return phone;
 }
 
-/** Try to connect to given keyboard, bypassing provided libc routines.
+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 devmap_path Path to keyboard without /dev prefix.
- * @return Phone or error code.
+ * @param arg Class name.
+ * @return This function should never exit.
  */
-static int connect_keyboard_bypass(char *devmap_path)
-{
-        int devmap_phone = async_connect_me_to_blocking(PHONE_NS,
-            SERVICE_DEVMAP, DEVMAP_CLIENT, 0);
-        if (devmap_phone < 0) {
-                return devmap_phone;
-        }
-        ipc_call_t answer;
-        aid_t req = async_send_2(devmap_phone, DEVMAP_DEVICE_GET_HANDLE,
-            0, 0,  &answer);
-
-        sysarg_t retval = async_data_write_start(devmap_phone,
-            devmap_path, str_size(devmap_path));
-        if (retval != EOK) {
-                async_wait_for(req, NULL);
-                async_hangup(devmap_phone);
-                return retval;
-        }
-
-        async_wait_for(req, &retval);
-
-        if (retval != EOK) {
-                async_hangup(devmap_phone);
-                return retval;
-        }
-
-        devmap_handle_t handle = (devmap_handle_t) IPC_GET_ARG1(answer);
-
-        async_hangup(devmap_phone);
-
-        int phone = async_connect_me_to(PHONE_NS,
-            SERVICE_DEVMAP, DEVMAP_CONNECT_TO_DEVICE, handle);
-        if (phone < 0) {
-                return phone;
-        }
-
-        /* NB: The callback connection is slotted for removal */
-        sysarg_t phonehash;
-        sysarg_t taskhash;
-        int rc = async_req_3_5(phone, IPC_M_CONNECT_TO_ME, SERVICE_CONSOLE,
-            0, 0, NULL, NULL, NULL, &taskhash, &phonehash);
-        if (rc != EOK) {
-                printf(NAME ": Failed to create callback from input device\n");
-                return rc;
-        }
-
-        async_new_connection(taskhash, phonehash, 0, NULL, keyboard_events);
-
-        printf(NAME ": we got a hit (new keyboard \"/dev/%s\").\n",
-            devmap_path);
-
-        return phone;
-}
-
-
-static int check_new_keyboards(void *arg)
-{
-        char *class_name = (char *) arg;
-
-        int index = 1;
+static int check_new_device_fibril(void *arg)
+{
+        struct hid_class_info *dev_info = arg;
+
+        size_t index = 1;
 
         while (true) {
-                async_usleep(1 * 500 * 1000);
+                async_usleep(HOTPLUG_WATCH_INTERVAL);
                 char *path;
-                int rc = asprintf(&path, "class/%s\\%d", class_name, index);
+                int rc = asprintf(&path, "/dev/class/%s\\%zu",
+                    dev_info->classname, index);
                 if (rc < 0) {
                         continue;
                 }
                 rc = 0;
-                rc = connect_keyboard_bypass(path);
+                rc = dev_info->connection_func(path);
                 if (rc > 0) {
                         /* We do not allow unplug. */
@@ -831 +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;
         }
@@ -849 +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 */
@@ -955 +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;