Changeset 73d8600 in mainline for uspace/srv/hid/output/output.c

Timestamp:

2016-12-27T13:29:31Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bfa4ffa

Parents:

fd384d6

Message:

Make serial console mutually exclusive with other user input/output methods

This limitation can be lifted once we figure out how to properly run them
side by side.

File:

• uspace/srv/hid/output/output.c (modified) (2 diffs)

uspace/srv/hid/output/output.c

@@ -34 +34 @@
 #include <task.h>
 #include <ipc/output.h>
+#include <config.h>
 #include "port/ega.h"
 #include "port/kchar.h"
@@ -476 +477 @@
         }
         
-        ega_init();
-        kchar_init();
-        niagara_init();
-        ski_init();
-        chardev_init();
+        if (!config_key_exists("console")) {
+                ega_init();
+                kchar_init();
+                niagara_init();
+                ski_init();
+        } else {
+                chardev_init();
+        }
         
         printf("%s: Accepting connections\n", NAME);