Changeset 76fca31 in mainline for kernel/generic/src/main/main.c

Timestamp:

2008-12-16T19:02:07Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5ae4443

Parents:

8fe5980

Message:

kconsole is optional
kernel & uspace framebuffer rewrite with speedups (some things are slightly broken yet)

File:

• kernel/generic/src/main/main.c (modified) (5 diffs)

kernel/generic/src/main/main.c

@@ -192 +192 @@
         /* Keep this the first thing. */
         the_initialize(THE);
-
-        LOG();
         
         version_print();
@@ -201 +199 @@
             config.base, config.kernel_size, config.stack_base,
             config.stack_size);
-        
-
+
+#ifdef CONFIG_KCONSOLE
         /*
          * kconsole data structures must be initialized very early
@@ -209 +207 @@
          */
         LOG_EXEC(kconsole_init());
+#endif
         
         /*
@@ -253 +252 @@
                 count_t i;
                 for (i = 0; i < init.cnt; i++)
-                        printf("init[%" PRIc "].addr=%#" PRIp ", init[%" PRIc
+                        LOG("init[%" PRIc "].addr=%#" PRIp ", init[%" PRIc
                             "].size=%#" PRIs "\n", i, init.tasks[i].addr, i,
                             init.tasks[i].size);
@@ -272 +271 @@
          * Create the first thread.
          */
-        thread_t *kinit_thread = thread_create(kinit, NULL, kernel, 0, "kinit",
-            true);
+        thread_t *kinit_thread
+                = thread_create(kinit, NULL, kernel, 0, "kinit", true);
         if (!kinit_thread)
                 panic("Can't create kinit thread\n");