| /trunk/kernel/generic/src/console/console.c |
|---|
| 41,6 → 41,7 |
| #include <arch/types.h> |
| #include <ddi/irq.h> |
| #include <ddi/ddi.h> |
| #include <event/event.h> |
| #include <ipc/irq.h> |
| #include <arch.h> |
| #include <func.h> |
| 100,12 → 101,6 |
| sysinfo_set_item_val("klog.faddr", NULL, (unative_t) faddr); |
| sysinfo_set_item_val("klog.pages", NULL, SIZE2FRAMES(KLOG_SIZE)); |
| //irq_initialize(&klog_irq); |
| //klog_irq.devno = devno; |
| //klog_irq.inr = KLOG_VIRT_INR; |
| //klog_irq.claim = klog_claim; |
| //irq_register(&klog_irq); |
| spinlock_lock(&klog_lock); |
| klog_inited = true; |
| spinlock_unlock(&klog_lock); |
| 242,10 → 237,10 |
| { |
| spinlock_lock(&klog_lock); |
| // if ((klog_inited) && (klog_irq.notif_cfg.notify) && (klog_uspace > 0)) { |
| // ipc_irq_send_msg_3(&klog_irq, klog_start, klog_len, klog_uspace); |
| // klog_uspace = 0; |
| // } |
| if (klog_inited && event_is_subscribed(EVENT_KLOG) && klog_uspace > 0) { |
| event_notify_3(EVENT_KLOG, klog_start, klog_len, klog_uspace); |
| klog_uspace = 0; |
| } |
| spinlock_unlock(&klog_lock); |
| } |
| /trunk/kernel/generic/src/console/cmd.c |
|---|
| 64,6 → 64,7 |
| #include <proc/task.h> |
| #include <ipc/ipc.h> |
| #include <ipc/irq.h> |
| #include <event/event.h> |
| #include <symtab.h> |
| #include <errno.h> |
| 954,8 → 955,7 |
| printf("The kernel will now relinquish the console.\n"); |
| release_console(); |
| if ((kconsole_notify) && (kconsole_irq.notif_cfg.notify)) |
| ipc_irq_send_msg_0(&kconsole_irq); |
| event_notify_0(EVENT_KCONSOLE); |
| return 1; |
| } |
| /trunk/kernel/generic/src/console/kconsole.c |
|---|
| 87,30 → 87,6 |
| index_t *end); |
| static char history[KCONSOLE_HISTORY][MAX_CMDLINE] = {}; |
| /* |
| * 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(irq_t *irq) |
| { |
| return IRQ_DECLINE; |
| } |
| /** Initialize kconsole data structures |
| * |
| * This is the most basic initialization, almost no |
| 126,27 → 102,6 |
| history[i][0] = '\0'; |
| } |
| /** Initialize kconsole notification mechanism |
| * |
| * Initialize the virtual IRQ notification mechanism. |
| * |
| */ |
| void kconsole_notify_init(void) |
| { |
| sysinfo_set_item_val("kconsole.present", NULL, true); |
| sysinfo_set_item_val("kconsole.inr", NULL, KCONSOLE_VIRT_INR); |
| irq_initialize(&kconsole_irq); |
| kconsole_irq.devno = device_assign_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. |