Changeset 7259317 in mainline

Timestamp:

2016-12-23T21:21:20Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00130656

Parents:

a91d719

Message:

Wait only for the serial console service specified by the user

File:

• uspace/srv/hid/output/port/chardev.c (modified) (5 diffs)

uspace/srv/hid/output/port/chardev.c

@@ -39 +39 @@
 #include <errno.h>
 #include <str.h>
+#include <sysinfo.h>
 #include "../ctl/serial.h"
 #include "../output.h"
 #include "chardev.h"
+
+static char *console;
 
 static async_sess_t *sess;
@@ -61 +64 @@
 }
 
+/*
+ * This callback scans all the services in the 'serial' category, hoping to see
+ * the single one the user wishes to use as a serial console. If it spots it, it
+ * connects to it and registers it as an output device. Then it ublocks the
+ * fibril blocked in chardev_init().
+ */
 static void check_for_dev(void)
 {
         int rc;
 
-        if (sess)
+        fibril_mutex_lock(&discovery_lock);
+        if (discovery_finished) {
+                // TODO: no need to receive these callbacks anymore
+                fibril_mutex_unlock(&discovery_lock);
                 return;
+        }
 
         service_id_t *svc;
@@ -72 +85 @@
         rc = loc_category_get_svcs(serial_cat_id, &svc, &svcs);
         if (rc != EOK) {
+                fibril_mutex_unlock(&discovery_lock);
                 printf("%s: Failed to get services\n", NAME);
                 return;
         }
 
-        if (svcs < 1) {
-                free(svc);
+        service_id_t sid;
+        bool found = false;
+
+        for (size_t i = 0; i < svcs && !found; i++) {
+                char *name;
+                
+                rc = loc_service_get_name(svc[i], &name);
+                if (rc != EOK)
+                        continue;
+
+                if (!str_cmp(console, name)) {
+                        /*
+                         * This is the serial console service that the user
+                         * wanted to use.
+                         */
+                        found = true;
+                        sid = svc[i];
+                }
+                        
+                free(name);
+        }
+
+        free(svc);
+
+        if (!found) {
+                fibril_mutex_unlock(&discovery_lock);
                 return;
         }
 
-        service_id_t sid = svc[0];
-        free(svc);
-
         sess = loc_service_connect(sid, INTERFACE_DDF, IPC_FLAG_BLOCKING);
         if (!sess) {
+                fibril_mutex_unlock(&discovery_lock);
                 printf("%s: Failed connecting to device\n", NAME);
                 return;
@@ -91 +127 @@
         serial_init(chardev_putchar, chardev_control_puts);
 
-        fibril_mutex_lock(&discovery_lock);
         discovery_finished = true;
         fibril_condvar_signal(&discovery_cv);
@@ -99 +134 @@
 int chardev_init(void)
 {
+        char *boot_args;
+        size_t size;
         int rc;
+
+        boot_args = sysinfo_get_data("boot_args", &size);
+        if (!boot_args || !size) {
+                /*
+                 * Ok, there is nothing in the boot arguments. That means that
+                 * the user did not specify a serial console device.
+                 */
+                return EOK;
+        }
+
+        char *args = boot_args;
+        char *arg;
+#define ARG_CONSOLE     "console="
+        while ((arg = str_tok(args, " ", &args)) != NULL) {
+                if (!str_lcmp(arg, ARG_CONSOLE, str_length(ARG_CONSOLE))) {
+                        console = arg + str_length(ARG_CONSOLE);
+                        break;
+                }
+        }
 
         rc = loc_category_get_id("serial", &serial_cat_id, IPC_FLAG_BLOCKING);