Changeset 889e8e3 in mainline

Timestamp:

2011-03-25T17:26:21Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

291b8bc, 9a2923d

Parents:

25bbaea

Message:

devman in kconsole as a config option

Files:

• HelenOS.config (modified) (1 diff)
• uspace/app/init/init.c (modified) (2 diffs)

HelenOS.config

@@ -554 +554 @@
 % Polling UHCI & OHCI (no interrupts)
 ! [PLATFORM=ia32|PLATFORM=amd64] CONFIG_USBHC_NO_INTERRUPTS (y/n)
+
+% Run devman in kconsole (not recommended)
+! CONFIG_DEVMAN_EARLY_LAUNCH (n/y)
+

uspace/app/init/init.c

@@ -288 +288 @@
         
         spawn("/srv/clip");
-        
+
+#ifdef CONFIG_DEVMAN_EARLY_LAUNCH
         spawn("/srv/devman");
+#endif
         
         /*
@@ -315 +317 @@
         getterm("term/vc5", "/app/bdsh", false);
         getterm("term/vc6", "/app/klog", false);
-        
+
+#ifndef CONFIG_DEVMAN_EARLY_LAUNCH
+        getterm("term/vc7", "/srv/devman", false);
+#endif
+
         return 0;
 }