Changeset 76fca31 in mainline for kernel/generic/src/console

Timestamp:

2008-12-16T19:02:07Z (17 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)

Location:

kernel/generic/src/console

Files:

• cmd.c (modified) (1 diff)
• console.c (modified) (1 diff)
• kconsole.c (modified) (3 diffs)

kernel/generic/src/console/cmd.c

@@ -502 +502 @@
                 cmd_initialize(basic_commands[i]);
                 if (!cmd_register(basic_commands[i]))
-                        panic("could not register command %s\n", basic_commands[i]->name);
+                        printf("Cannot register command %s\n", basic_commands[i]->name);
         }
 }

kernel/generic/src/console/console.c

@@ -168 +168 @@
                 else
                         printf("cpu: ");
-                printf("halted - no kconsole\n");
+                printf("halted (no kconsole)\n");
                 cpu_halt();
         }

kernel/generic/src/console/kconsole.c

@@ -402 +402 @@
 }
 
-/** Kernel console managing thread.
+/** Kernel console prompt.
  *
  * @param prompt Kernel console prompt (e.g kconsole/panic).
- */
-void kconsole(void *prompt)
+ * @param msg    Message to display in the beginning.
+ * @param kcon   Wait for keypress to show the prompt
+ *               and never exit.
+ *
+ */
+void kconsole(char *prompt, char *msg, bool kcon)
 {
         cmd_info_t *cmd_info;
@@ -413 +417 @@
 
         if (!stdin) {
-                printf("%s: no stdin\n", __func__);
+                LOG("No stdin for kernel console");
                 return;
         }
+        
+        if (msg)
+                printf("%s", msg);
+        
+        if (kcon)
+                _getc(stdin);
         
         while (true) {
@@ -422 +432 @@
                 if (!len)
                         continue;
+                
                 cmd_info = parse_cmdline(cmdline, len);
                 if (!cmd_info)
                         continue;
-                if (strncmp(cmd_info->name, "exit",
-                    min(strlen(cmd_info->name), 5)) == 0)
+                
+                if ((!kcon)
+                    && (strncmp(cmd_info->name, "exit", min(strlen(cmd_info->name), 5)) == 0))
                         break;
+                
                 (void) cmd_info->func(cmd_info->argv);
         }
+}
+
+/** Kernel console managing thread.
+ *
+ */
+void kconsole_thread(void *data)
+{
+        kconsole("kconsole", "Kernel console ready (press any key to activate)\n", true);
 }