Changeset 73d8600 in mainline for uspace/app/init/init.c

Timestamp:

2016-12-27T13:29:31Z (7 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/app/init/init.c (modified) (3 diffs)

uspace/app/init/init.c

@@ -49 +49 @@
 #include <loc.h>
 #include <str_error.h>
+#include <config.h>
 #include "init.h"
 
@@ -306 +307 @@
 int main(int argc, char *argv[])
 {
+        int rc;
+
         info_print();
         
@@ -356 +359 @@
         srv_start("/srv/hound");
         
-        int rc = compositor(HID_INPUT, HID_COMPOSITOR_SERVER);
-        if (rc == EOK) {
-                gui_start("/app/barber", HID_COMPOSITOR_SERVER);
-                gui_start("/app/vlaunch", HID_COMPOSITOR_SERVER);
-                gui_start("/app/vterm", HID_COMPOSITOR_SERVER);
+        if (!config_key_exists("console")) {
+                rc = compositor(HID_INPUT, HID_COMPOSITOR_SERVER);
+                if (rc == EOK) {
+                        gui_start("/app/barber", HID_COMPOSITOR_SERVER);
+                        gui_start("/app/vlaunch", HID_COMPOSITOR_SERVER);
+                        gui_start("/app/vterm", HID_COMPOSITOR_SERVER);
+                }
         }