Changeset ab92305 in mainline for uspace/app/init/init.c

Timestamp:

2013-08-19T17:23:31Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4da8fdb

Parents:

2921602 (diff), 4a9728ec (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 audio support.

Includes audio server and sb16 driver.

Tested on ia32 and amd64 (qemu).

File:

• uspace/app/init/init.c (modified) (1 diff)

uspace/app/init/init.c

@@ -392 +392 @@
                 rc = console(HID_INPUT, HID_OUTPUT);
                 if (rc == EOK) {
-                        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);
+#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/vc6", "/app/klog", false);
+#endif
                 }
         }
+        srv_start("/srv/hound");
         
         return 0;