Changeset 392f0e7 in mainline

Timestamp:

2018-11-23T14:50:24Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2519349

Parents:

ca21f1e2

git-author:

Jiri Svoboda <jiri@…> (2018-11-22 17:48:21)

git-committer:

Jiri Svoboda <jiri@…> (2018-11-23 14:50:24)

Message:

Provide a way for kernel console on SKI to disable the user-space driver.

Files:

• kernel/generic/src/console/console.c (modified) (2 diffs)
• uspace/drv/char/ski-con/ski-con.c (modified) (5 diffs)

kernel/generic/src/console/console.c

@@ -209 +209 @@
 void grab_console(void)
 {
+        sysinfo_set_item_val("kconsole", NULL, true);
         event_notify_1(EVENT_KCONSOLE, false, true);
         bool prev = console_override;
@@ -226 +227 @@
 void release_console(void)
 {
+        sysinfo_set_item_val("kconsole", NULL, false);
         console_override = false;
         event_notify_1(EVENT_KCONSOLE, false, false);

uspace/drv/char/ski-con/ski-con.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2005 Jakub Jermar
- * Copyright (c) 2017 Jiri Svoboda
+ * Copyright (c) 2018 Jiri Svoboda
  * All rights reserved.
  *
@@ -40 +40 @@
 #include <stdlib.h>
 #include <stdbool.h>
+#include <sysinfo.h>
 
 #include "ski-con.h"
@@ -127 +128 @@
 }
 
+/** Detect if SKI console is in use by the kernel.
+ *
+ * This is needed since the kernel has no way of fencing off the user-space
+ * driver.
+ *
+ * @return @c true if in use by the kernel.
+ */
+static bool ski_con_disabled(void)
+{
+        sysarg_t kconsole;
+
+        /*
+         * XXX Ideally we should get information from our kernel counterpart
+         * driver. But there needs to be a mechanism for the kernel console
+         * to inform the kernel driver.
+         */
+        if (sysinfo_get_value("kconsole", &kconsole) != EOK)
+                return false;
+
+        return kconsole != false;
+}
+
 /** Poll Ski for keypresses. */
 static errno_t ski_con_fibril(void *arg)
@@ -135 +158 @@
 
         while (true) {
-                while (true) {
+                while (!ski_con_disabled()) {
                         c = ski_con_getchar();
                         if (c == 0)
@@ -246 +269 @@
         uint8_t *dp = (uint8_t *) data;
 
-        for (i = 0; i < size; i++)
-                ski_con_putchar(con, dp[i]);
+        for (i = 0; i < size; i++) {
+                if (!ski_con_disabled())
+                        ski_con_putchar(con, dp[i]);
+        }
 
         *nwr = size;