Changeset 3fe00ee in mainline

Timestamp:

2009-03-22T19:48:11Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

8b48063

Parents:

dc033a1

Message:

'kcon' shell builtin for switching to debug console.

Location:

uspace

Files:

• app/bdsh/Makefile (modified) (2 diffs)
• app/bdsh/cmds/modules/kcon/entry.h (added)
• app/bdsh/cmds/modules/kcon/kcon.c (added)
• app/bdsh/cmds/modules/kcon/kcon.h (added)
• app/bdsh/cmds/modules/kcon/kcon_def.h (added)
• app/bdsh/cmds/modules/modules.h (modified) (2 diffs)
• lib/libc/generic/console.c (modified) (1 diff)
• lib/libc/include/console.h (modified) (1 diff)
• lib/libc/include/ipc/console.h (modified) (1 diff)
• srv/console/console.c (modified) (1 diff)

uspace/app/bdsh/Makefile

@@ -58 +58 @@
         cmds/modules/sleep/ \
         cmds/modules/cp/ \
+        cmds/modules/kcon/ \
         cmds/builtins/ \
         cmds/builtins/exit/\
@@ -72 +73 @@
         cmds/modules/sleep/sleep.c \
         cmds/modules/cp/cp.c \
+        cmds/modules/kcon/kcon.c \
         cmds/builtins/exit/exit.c \
         cmds/builtins/cd/cd.c \

uspace/app/bdsh/cmds/modules/modules.h

@@ -27 +27 @@
 #include "sleep/entry.h"
 #include "cp/entry.h"
+#include "kcon/entry.h"
 
 /* Each .def function fills the module_t struct with the individual name, entry
@@ -42 +43 @@
 #include "sleep/sleep_def.h"
 #include "cp/cp_def.h"
+#include "kcon/kcon_def.h"
         {NULL, NULL, NULL, NULL}
 };

uspace/lib/libc/generic/console.c

@@ -283 +283 @@
 }
 
+void console_kcon_enable(void)
+{
+        int cons_phone = console_phone_get(true);
+
+        cbuffer_flush();
+        async_msg_0(cons_phone, CONSOLE_KCON_ENABLE);
+}
+
 /** @}
  */

uspace/lib/libc/include/console.h

@@ -59 +59 @@
 extern void console_cursor_visibility(int);
 
+extern void console_kcon_enable(void);
+
 #endif
  

uspace/lib/libc/include/ipc/console.h

@@ -49 +49 @@
         CONSOLE_SET_COLOR,
         CONSOLE_SET_RGB_COLOR,
-        CONSOLE_CURSOR_VISIBILITY
+        CONSOLE_CURSOR_VISIBILITY,
+        CONSOLE_KCON_ENABLE
 } console_request_t;
 

uspace/srv/console/console.c

@@ -626 +626 @@
                         arg4 = ev.c;
                         break;
+                case CONSOLE_KCON_ENABLE:
+                        change_console(KERNEL_CONSOLE);
+                        break;
                 }
                 ipc_answer_4(callid, EOK, arg1, arg2, arg3, arg4);