| /trunk/kernel/generic/include/console/kconsole.h |
|---|
| 37,6 → 37,7 |
| #include <adt/list.h> |
| #include <synch/spinlock.h> |
| #include <ipc/irq.h> |
| #define MAX_CMDLINE 256 |
| #define KCONSOLE_HISTORY 10 |
| 83,10 → 84,14 |
| void (* help)(void); |
| } cmd_info_t; |
| extern bool kconsole_notify; |
| extern irq_t kconsole_irq; |
| SPINLOCK_EXTERN(cmd_lock); |
| extern link_t cmd_head; |
| extern void kconsole_init(void); |
| extern void kconsole_notify_init(void); |
| extern void kconsole(char *prompt, char *msg, bool kcon); |
| extern void kconsole_thread(void *data); |
| /trunk/kernel/generic/include/ipc/irq.h |
|---|
| 53,6 → 53,8 |
| * User friendly wrappers for ipc_irq_send_msg(). They are in the form |
| * ipc_irq_send_msg_m(), where m is the number of payload arguments. |
| */ |
| #define ipc_irq_send_msg_0(irq) \ |
| ipc_irq_send_msg((irq), 0, 0, 0, 0, 0) |
| #define ipc_irq_send_msg_1(irq, a1) \ |
| ipc_irq_send_msg((irq), (a1), 0, 0, 0, 0) |
| #define ipc_irq_send_msg_2(irq, a1, a2) \ |
| /trunk/kernel/generic/src/main/main.c |
|---|
| 198,7 → 198,7 |
| "\nconfig.stack_base=%#" PRIp " config.stack_size=%" PRIs, |
| config.base, config.kernel_size, config.stack_base, |
| config.stack_size); |
| #ifdef CONFIG_KCONSOLE |
| /* |
| * kconsole data structures must be initialized very early |
| 213,7 → 213,7 |
| * starts adding its own handlers |
| */ |
| LOG_EXEC(exc_init()); |
| /* |
| * Memory management subsystems initialization. |
| */ |
| 259,7 → 259,11 |
| LOG_EXEC(ipc_init()); |
| LOG_EXEC(klog_init()); |
| #ifdef CONFIG_KCONSOLE |
| LOG_EXEC(kconsole_notify_init()); |
| #endif |
| /* |
| * Create kernel task. |
| */ |
| /trunk/kernel/generic/src/console/cmd.c |
|---|
| 976,8 → 976,11 |
| int cmd_continue(cmd_arg_t *argv) |
| { |
| printf("The kernel will now relinquish the console.\n"); |
| printf("Use userspace controls to redraw the screen.\n"); |
| arch_release_console(); |
| if ((kconsole_notify) && (kconsole_irq.notif_cfg.notify)) |
| ipc_irq_send_msg_0(&kconsole_irq); |
| return 1; |
| } |
| /trunk/kernel/generic/src/console/kconsole.c |
|---|
| 51,6 → 51,8 |
| #include <func.h> |
| #include <symtab.h> |
| #include <macros.h> |
| #include <sysinfo/sysinfo.h> |
| #include <ddi/device.h> |
| /** Simple kernel console. |
| * |
| 83,10 → 85,39 |
| index_t *end); |
| static char history[KCONSOLE_HISTORY][MAX_CMDLINE] = {}; |
| /** Initialize kconsole data structures. */ |
| /* |
| * For now, we use 0 as INR. |
| * However, it is therefore desirable to have architecture specific |
| * definition of KCONSOLE_VIRT_INR in the future. |
| */ |
| #define KCONSOLE_VIRT_INR 0 |
| bool kconsole_notify = false; |
| irq_t kconsole_irq; |
| /** Allways refuse IRQ ownership. |
| * |
| * This is not a real IRQ, so we always decline. |
| * |
| * @return Always returns IRQ_DECLINE. |
| * |
| */ |
| static irq_ownership_t kconsole_claim(void) |
| { |
| return IRQ_DECLINE; |
| } |
| /** Initialize kconsole data structures |
| * |
| * This is the most basic initialization, almost no |
| * other kernel subsystem is ready yet. |
| * |
| */ |
| void kconsole_init(void) |
| { |
| int i; |
| unsigned int i; |
| cmd_init(); |
| for (i = 0; i < KCONSOLE_HISTORY; i++) |
| 94,6 → 125,29 |
| } |
| /** Initialize kconsole notification mechanism |
| * |
| * Initialize the virtual IRQ notification mechanism. |
| * |
| */ |
| void kconsole_notify_init(void) |
| { |
| devno_t devno = device_assign_devno(); |
| sysinfo_set_item_val("kconsole.present", NULL, true); |
| sysinfo_set_item_val("kconsole.devno", NULL, devno); |
| sysinfo_set_item_val("kconsole.inr", NULL, KCONSOLE_VIRT_INR); |
| irq_initialize(&kconsole_irq); |
| kconsole_irq.devno = devno; |
| kconsole_irq.inr = KCONSOLE_VIRT_INR; |
| kconsole_irq.claim = kconsole_claim; |
| irq_register(&kconsole_irq); |
| kconsole_notify = true; |
| } |
| /** Register kconsole command. |
| * |
| * @param cmd Structure describing the command. |