Changeset 41d33ac in mainline for generic

Timestamp:

2006-05-31T22:18:40Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

e7ed9868

Parents:

018f95a

Message:

Added syscall that lets kernel regain access to keyboard.

Location:

generic

Files:

• include/console/console.h (modified) (1 diff)
• include/syscall/syscall.h (modified) (1 diff)
• src/console/cmd.c (modified) (4 diffs)
• src/syscall/syscall.c (modified) (3 diffs)

generic/include/console/console.h

@@ -41 +41 @@
 extern void putchar(char c);
 
+extern void arch_grab_console(void);
+extern void arch_release_console(void);
+
 #endif /* __CHARDEV_H__ */

generic/include/syscall/syscall.h

@@ -59 +59 @@
         SYS_SYSINFO_VALID,
         SYS_SYSINFO_VALUE,
+        SYS_DEBUG_ENABLE_CONSOLE,
         SYSCALL_END
 } syscall_t;

generic/src/console/cmd.c

@@ -38 +38 @@
 
 #include <console/cmd.h>
+#include <console/console.h>
 #include <console/kconsole.h>
 #include <print.h>
@@ -71 +72 @@
         .name = "exit",
         .description ="Exit kconsole",
+        .argc = 0
+};
+
+static int cmd_continue(cmd_arg_t *argv);
+static cmd_info_t continue_info = {
+        .name = "continue",
+        .description ="Return console back to userspace",
+        .func = cmd_continue,
         .argc = 0
 };
@@ -333 +342 @@
         &call2_info,
         &call3_info,
+        &continue_info,
         &cpus_info,
         &desc_info,
@@ -700 +710 @@
         return 1;
 }
+
+/** Command for returning console back to userspace.
+ *
+ * @param argv Ignored.
+ *
+ * return Always 1.
+ */
+int cmd_continue(cmd_arg_t *argv)
+{
+        arch_release_console();
+        return 1;
+}

generic/src/syscall/syscall.c

@@ -47 +47 @@
 #include <syscall/copy.h>
 #include <sysinfo/sysinfo.h>
+#include <console/console.h>
 
 /** Print using kernel facility
@@ -77 +78 @@
         
         return count;
+}
+
+/** Tell kernel to get keyboard/console access again */
+static __native sys_debug_enable_console(void)
+{
+        arch_grab_console();
+        return 0;
 }
 
@@ -131 +139 @@
         /* Sysinfo syscalls */
         sys_sysinfo_valid,
-        sys_sysinfo_value
+        sys_sysinfo_value,
+        
+        /* Debug calls */
+        sys_debug_enable_console
 };