Changeset 73d8600 in mainline

Timestamp:

2016-12-27T13:29:31Z (9 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.

Location:

uspace

Files:

• app/init/init.c (modified) (3 diffs)
• srv/hid/input/input.c (modified) (1 diff)
• srv/hid/output/output.c (modified) (2 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);
+                }
         }
         

uspace/srv/hid/input/input.c

@@ -827 +827 @@
         fibril_mutex_lock(&discovery_lock);
         
-        rc = dev_check_new_kbdevs();
-        if (rc != EOK) {
-                fibril_mutex_unlock(&discovery_lock);
-                return rc;
-        }
-        
-        rc = dev_check_new_mousedevs();
-        if (rc != EOK) {
-                fibril_mutex_unlock(&discovery_lock);
-                return rc;
-        }
-
-        rc = dev_check_new_serialdevs();
-        if (rc != EOK) {
-                fibril_mutex_unlock(&discovery_lock);
-                return rc;
+        if (!serial_console) {
+                rc = dev_check_new_kbdevs();
+                if (rc != EOK) {
+                        fibril_mutex_unlock(&discovery_lock);
+                        return rc;
+                }
+        
+                rc = dev_check_new_mousedevs();
+                if (rc != EOK) {
+                        fibril_mutex_unlock(&discovery_lock);
+                        return rc;
+                }
+        } else {
+                rc = dev_check_new_serialdevs();
+                if (rc != EOK) {
+                        fibril_mutex_unlock(&discovery_lock);
+                        return rc;
+                }
         }
         

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);