Changeset 3f03199 in mainline for uspace/app/init/init.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/app/init/init.c (modified) (2 diffs)

uspace/app/init/init.c

@@ -384 +384 @@
         srv_start("/srv/input", HID_INPUT);
         srv_start("/srv/output", HID_OUTPUT);
+        srv_start("/srv/hound");
         
         int rc = compositor(HID_INPUT, HID_COMPOSITOR_SERVER);
@@ -392 +393 @@
                 rc = console(HID_INPUT, HID_OUTPUT);
                 if (rc == EOK) {
-#ifndef CONFIG_VC_COUNT
-#define CONFIG_VC_COUNT 6
-#endif
-                        switch((unsigned)CONFIG_VC_COUNT) {
-                        default:
-                        case 6: getterm("term/vc5", "/app/bdsh", false);
-                        case 5: getterm("term/vc4", "/app/bdsh", false);
-                        case 4: getterm("term/vc3", "/app/bdsh", false);
-                        case 3: getterm("term/vc2", "/app/bdsh", false);
-                        case 2: getterm("term/vc1", "/app/bdsh", false);
-                        case 1: getterm("term/vc0", "/app/bdsh", true);
-                        }
-#ifdef CONFIG_KERNEL_LOG_VC_6
+                        getterm("term/vc0", "/app/bdsh", true);
+                        getterm("term/vc1", "/app/bdsh", false);
+                        getterm("term/vc2", "/app/bdsh", false);
+                        getterm("term/vc3", "/app/bdsh", false);
+                        getterm("term/vc4", "/app/bdsh", false);
+                        getterm("term/vc5", "/app/bdsh", false);
                         getterm("term/vc6", "/app/klog", false);
-#endif
                 }
         }
-        srv_start("/srv/hound");
         
         return 0;