Subversion Repositories HelenOS

Rev

Rev 4031 | Rev 4043 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4031 Rev 4042
Line 52... Line 52...
52 
#include <ddi/irq.h>
 52 
#include <ddi/irq.h>
53 
#include <ddi/device.h>
 53 
#include <ddi/device.h>
54 
#include <arch/bootinfo.h>
 54 
#include <arch/bootinfo.h>
55 
#include <genarch/drivers/legacy/ia32/io.h>
 55 
#include <genarch/drivers/legacy/ia32/io.h>
56 
#include <genarch/drivers/ega/ega.h>
 56 
#include <genarch/drivers/ega/ega.h>
57 
#include <genarch/kbd/i8042.h>
 57 
#include <genarch/kbrd/kbrd.h>
- 
 
 58 
#include <genarch/drivers/i8042/i8042.h>
58 
#include <genarch/kbd/ns16550.h>
 59 
#include <genarch/kbd/ns16550.h>
59 
#include <smp/smp.h>
 60 
#include <smp/smp.h>
60 
#include <smp/ipi.h>
 61 
#include <smp/ipi.h>
61 
#include <arch/atomic.h>
 62 
#include <arch/atomic.h>
62 
#include <panic.h>
 63 
#include <panic.h>
Line 175... Line 176...
175 
        (uintptr_t) NS16550_BASE);
 176 
        (uintptr_t) NS16550_BASE);
176 
    sysinfo_set_item_val("kbd.address.kernel", NULL,
 177 
    sysinfo_set_item_val("kbd.address.kernel", NULL,
177 
        (uintptr_t) NS16550_BASE);
 178 
        (uintptr_t) NS16550_BASE);
178 
#else
 179 
#else
179 
    inr = IRQ_KBD;
 180 
    inr = IRQ_KBD;
- 
 
 181 
    kbrd_init(stdin);
180 
    (void) i8042_init((i8042_t *)I8042_BASE, devno, inr);
 182 
    (void) i8042_init((i8042_t *)I8042_BASE, devno, inr, &kbrdin);
- 
 
 183 
    trap_virtual_enable_irqs(1 << inr);
181 
    sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY);
 184 
    sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY);
182 
    sysinfo_set_item_val("kbd.address.physical", NULL,
 185 
    sysinfo_set_item_val("kbd.address.physical", NULL,
183 
        (uintptr_t) I8042_BASE);
 186 
        (uintptr_t) I8042_BASE);
184 
    sysinfo_set_item_val("kbd.address.kernel", NULL,
 187 
    sysinfo_set_item_val("kbd.address.kernel", NULL,
185 
        (uintptr_t) I8042_BASE);
 188 
        (uintptr_t) I8042_BASE);