| /trunk/kernel/generic/include/console/chardev.h |
|---|
| 50,7 → 50,7 |
| /** Resume pushing characters. */ |
| void (* resume)(struct chardev *); |
| /** Write character to stream. */ |
| void (* write)(struct chardev *, char c); |
| void (* write)(struct chardev *, char c, bool silent); |
| /** Read character directly from device, assume interrupts disabled. */ |
| char (* read)(struct chardev *); |
| } chardev_operations_t; |
| /trunk/kernel/generic/include/console/console.h |
|---|
| 49,6 → 49,9 |
| extern count_t gets(chardev_t *chardev, char *buf, size_t buflen); |
| extern void putchar(char c); |
| extern void grab_console(void); |
| extern void release_console(void); |
| extern void arch_grab_console(void); |
| extern void arch_release_console(void); |
| /trunk/kernel/generic/include/syscall/syscall.h |
|---|
| 79,6 → 79,7 |
| SYS_SYSINFO_VALUE, |
| SYS_DEBUG_ENABLE_CONSOLE, |
| SYS_DEBUG_DISABLE_CONSOLE, |
| SYS_IPC_CONNECT_KBOX, |
| SYSCALL_END |
| } syscall_t; |
| /trunk/kernel/generic/src/console/console.c |
|---|
| 65,12 → 65,15 |
| /**< Number of stored kernel log characters for uspace */ |
| static size_t klog_uspace = 0; |
| /**< Silent output */ |
| static bool silent = false; |
| /**< Kernel log spinlock */ |
| SPINLOCK_INITIALIZE(klog_lock); |
| /** Physical memory area used for klog buffer */ |
| static parea_t klog_parea; |
| /* |
| * For now, we use 0 as INR. |
| * However, it is therefore desirable to have architecture specific |
| 144,6 → 147,18 |
| spinlock_unlock(&klog_lock); |
| } |
| void grab_console(void) |
| { |
| silent = false; |
| arch_grab_console(); |
| } |
| void release_console(void) |
| { |
| silent = true; |
| arch_release_console(); |
| } |
| /** Get character from character device. Do not echo character. |
| * |
| * @param chardev Character device. |
| 199,7 → 214,7 |
| { |
| index_t index = 0; |
| char ch; |
| while (index < buflen) { |
| ch = _getc(chardev); |
| if (ch == '\b') { |
| 213,7 → 228,7 |
| continue; |
| } |
| putchar(ch); |
| if (ch == '\n') { /* end of string => write 0, return */ |
| buf[index] = '\0'; |
| return (count_t) index; |
| 253,7 → 268,7 |
| /* Print charaters stored in kernel log */ |
| index_t i; |
| for (i = klog_len - klog_stored; i < klog_len; i++) |
| stdout->op->write(stdout, klog[(klog_start + i) % KLOG_SIZE]); |
| stdout->op->write(stdout, klog[(klog_start + i) % KLOG_SIZE], silent); |
| klog_stored = 0; |
| } |
| 265,7 → 280,7 |
| klog_start = (klog_start + 1) % KLOG_SIZE; |
| if (stdout->op->write) |
| stdout->op->write(stdout, c); |
| stdout->op->write(stdout, c, silent); |
| else { |
| /* The character is just in the kernel log */ |
| if (klog_stored < klog_len) |
| /trunk/kernel/generic/src/console/cmd.c |
|---|
| 976,7 → 976,7 |
| int cmd_continue(cmd_arg_t *argv) |
| { |
| printf("The kernel will now relinquish the console.\n"); |
| arch_release_console(); |
| release_console(); |
| if ((kconsole_notify) && (kconsole_irq.notif_cfg.notify)) |
| ipc_irq_send_msg_0(&kconsole_irq); |
| /trunk/kernel/generic/src/syscall/syscall.c |
|---|
| 92,7 → 92,7 |
| static unative_t sys_debug_enable_console(void) |
| { |
| #ifdef CONFIG_KCONSOLE |
| arch_grab_console(); |
| grab_console(); |
| return true; |
| #else |
| return false; |
| 99,6 → 99,13 |
| #endif |
| } |
| /** Tell kernel to relinquish keyboard/console access */ |
| static unative_t sys_debug_disable_console(void) |
| { |
| release_console(); |
| return true; |
| } |
| /** Dispatch system call */ |
| unative_t syscall_handler(unative_t a1, unative_t a2, unative_t a3, |
| unative_t a4, unative_t a5, unative_t a6, unative_t id) |
| 184,7 → 191,8 |
| /* Debug calls */ |
| (syshandler_t) sys_debug_enable_console, |
| (syshandler_t) sys_debug_disable_console, |
| (syshandler_t) sys_ipc_connect_kbox |
| }; |