Index: kernel/arch/ia64/include/ski/ski.h =================================================================== --- kernel/arch/ia64/include/ski/ski.h (revision ec944b1fe3e29a4f91a93cbdd7acc7aa350d7f39) +++ kernel/arch/ia64/include/ski/ski.h (revision db4ce845185d0afbdb84c938b2e579a7b5fb8bf2) @@ -37,5 +37,5 @@ #include -#include +#include #define SKI_INIT_CONSOLE 20 @@ -43,12 +43,7 @@ #define SKI_PUTCHAR 31 -extern chardev_t ski_uconsole; - -extern void ski_init_console(void); - +extern void ski_console_init(chardev_t *); extern void ski_kbd_grab(void); extern void ski_kbd_release(void); - -extern void kkbdpoll(void *arg); #endif Index: kernel/arch/ia64/src/ia64.c =================================================================== --- kernel/arch/ia64/src/ia64.c (revision ec944b1fe3e29a4f91a93cbdd7acc7aa350d7f39) +++ kernel/arch/ia64/src/ia64.c (revision db4ce845185d0afbdb84c938b2e579a7b5fb8bf2) @@ -131,5 +131,4 @@ } - void arch_post_mm_init(void) { @@ -137,35 +136,28 @@ iosapic_init(); irq_init(INR_COUNT, INR_COUNT); + } + it_init(); +} + +void arch_post_cpu_init(void) +{ +} + +void arch_pre_smp_init(void) +{ +} + +void arch_post_smp_init(void) +{ #ifdef SKI - ski_init_console(); -#else - ega_init(EGA_BASE, EGA_VIDEORAM); -#endif - } - it_init(); - -} - -void arch_post_cpu_init(void) -{ -} - -void arch_pre_smp_init(void) -{ -} - -void arch_post_smp_init(void) -{ - /* - * Create thread that polls keyboard. - */ -#ifdef SKI - thread_t *t = thread_create(kkbdpoll, NULL, TASK, 0, "kkbdpoll", true); - if (!t) - panic("Cannot create kkbdpoll."); - thread_ready(t); + srln_init(stdin); + ski_console_init(&srlnin); #endif #ifdef I460GX +#ifdef CONFIG_EGA + ega_init(EGA_BASE, EGA_VIDEORAM); +#endif + devno_t devno = device_assign_devno(); inr_t inr; Index: kernel/arch/ia64/src/ski/ski.c =================================================================== --- kernel/arch/ia64/src/ski/ski.c (revision ec944b1fe3e29a4f91a93cbdd7acc7aa350d7f39) +++ kernel/arch/ia64/src/ski/ski.c (revision db4ce845185d0afbdb84c938b2e579a7b5fb8bf2) @@ -36,22 +36,15 @@ #include #include -#include #include #include -#include -#include -#include #include #include #include #include +#include -#define SKI_KBD_INR 0 +static chardev_t *skiout; -static irq_t ski_kbd_irq; -static devno_t ski_kbd_devno; - -chardev_t ski_console; -chardev_t ski_uconsole; +static chardev_t ski_stdout; static bool kbd_disabled; @@ -82,4 +75,8 @@ } +static chardev_operations_t ski_ops = { + .write = ski_putchar +}; + /** Ask debug console if a key was pressed. * @@ -108,24 +105,8 @@ } -/** - * This is a blocking wrapper for ski_getchar(). - * To be used when the kernel crashes. - */ -static char ski_getchar_blocking(chardev_t *d) -{ - int ch; - - while(!(ch = ski_getchar())); - - if (ch == '\r') - ch = '\n'; - return (char) ch; -} - /** Ask keyboard if a key was pressed. */ static void poll_keyboard(void) { char ch; - static char last; ipl_t ipl; @@ -137,65 +118,28 @@ } - spinlock_lock(&ski_kbd_irq.lock); - ch = ski_getchar(); if(ch == '\r') ch = '\n'; - if (ch) { - if (ski_kbd_irq.notif_cfg.notify && - ski_kbd_irq.notif_cfg.answerbox) { - chardev_push_character(&ski_uconsole, ch); - /* XXX: send notification to userspace */ - } else { - chardev_push_character(&ski_console, ch); - } - last = ch; - spinlock_unlock(&ski_kbd_irq.lock); + if (ch && skiout) { + chardev_push_character(skiout, ch); interrupts_restore(ipl); return; } - if (last) { - if (ski_kbd_irq.notif_cfg.notify && - ski_kbd_irq.notif_cfg.answerbox) { - chardev_push_character(&ski_uconsole, 0); - /* XXX: send notification to userspace */ - } - last = 0; - } - - spinlock_unlock(&ski_kbd_irq.lock); interrupts_restore(ipl); } -/* Called from getc(). */ -static void ski_kbd_enable(chardev_t *d) +#define POLL_INTERVAL 10000 /* 10 ms */ + +/** Kernel thread for polling keyboard. */ +static void kkbdpoll(void *arg) { - kbd_disabled = false; + while (1) { + if (!silent) { + poll_keyboard(); + } + thread_usleep(POLL_INTERVAL); + } } - -/* Called from getc(). */ -static void ski_kbd_disable(chardev_t *d) -{ - kbd_disabled = true; -} - -/** Decline to service hardware IRQ. - * - * This is only a virtual IRQ, so always decline. - * - * @return Always IRQ_DECLINE. - */ -static irq_ownership_t ski_kbd_claim(irq_t *irq) -{ - return IRQ_DECLINE; -} - -static chardev_operations_t ski_ops = { - .resume = ski_kbd_enable, - .suspend = ski_kbd_disable, - .write = ski_putchar, - .read = ski_getchar_blocking -}; /** Initialize debug console @@ -204,5 +148,5 @@ * to open debug console. */ -void ski_init_console(void) +void ski_console_init(chardev_t *devout) { asm volatile ( @@ -214,20 +158,14 @@ ); - chardev_initialize("ski_console", &ski_console, &ski_ops); - chardev_initialize("ski_uconsole", &ski_uconsole, &ski_ops); - stdin = &ski_console; - stdout = &ski_console; + skiout = devout; + chardev_initialize("ski_stdout", &ski_stdout, &ski_ops); + stdout = &ski_stdout; - ski_kbd_devno = device_assign_devno(); - - irq_initialize(&ski_kbd_irq); - ski_kbd_irq.inr = SKI_KBD_INR; - ski_kbd_irq.devno = ski_kbd_devno; - ski_kbd_irq.claim = ski_kbd_claim; - irq_register(&ski_kbd_irq); + thread_t *t = thread_create(kkbdpoll, NULL, TASK, 0, "kkbdpoll", true); + if (!t) + panic("Cannot create kkbdpoll."); + thread_ready(t); sysinfo_set_item_val("kbd", NULL, true); - sysinfo_set_item_val("kbd.inr", NULL, SKI_KBD_INR); - sysinfo_set_item_val("kbd.devno", NULL, ski_kbd_devno); sysinfo_set_item_val("kbd.type", NULL, KBD_SKI); @@ -237,33 +175,10 @@ void ski_kbd_grab(void) { - ipl_t ipl = interrupts_disable(); - spinlock_lock(&ski_kbd_irq.lock); - ski_kbd_irq.notif_cfg.notify = false; - spinlock_unlock(&ski_kbd_irq.lock); - interrupts_restore(ipl); + kbd_disabled = true; } void ski_kbd_release(void) { - ipl_t ipl = interrupts_disable(); - spinlock_lock(&ski_kbd_irq.lock); - if (ski_kbd_irq.notif_cfg.answerbox) - ski_kbd_irq.notif_cfg.notify = true; - spinlock_unlock(&ski_kbd_irq.lock); - interrupts_restore(ipl); -} - - -#define POLL_INTERVAL 50000 /* 50 ms */ - -/** Kernel thread for polling keyboard. */ -void kkbdpoll(void *arg) -{ - while (1) { - if (!silent) { - poll_keyboard(); - } - thread_usleep(POLL_INTERVAL); - } + kbd_disabled = false; }