Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 1842 → Rev 1844

/trunk/kernel/arch/sparc64/src/console.c
42,8 → 42,8
#ifdef CONFIG_Z8530
#include <genarch/kbd/z8530.h>
#endif
#ifdef CONFIG_16550A
#include <genarch/kbd/16550a.h>
#ifdef CONFIG_NS16550
#include <genarch/kbd/ns16550.h>
#endif
 
#include <console/chardev.h>
64,6 → 64,11
fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height,
bootinfo.screen.bpp, bootinfo.screen.scanline, true);
 
#ifdef KBD_ADDR_OVRD
if (!bootinfo.keyboard.addr)
bootinfo.keyboard.addr = KBD_ADDR_OVRD;
#endif
 
if (bootinfo.keyboard.addr)
kbd_init();
}
81,8 → 86,8
#ifdef CONFIG_Z8530
z8530_poll();
#endif
#ifdef CONFIG_16550A
16550a_poll();
#ifdef CONFIG_NS16550
ns16550_poll();
#endif
thread_usleep(KEYBOARD_POLL_PAUSE);
}
/trunk/kernel/arch/sparc64/src/drivers/kbd.c
36,8 → 36,8
#ifdef CONFIG_Z8530
#include <genarch/kbd/z8530.h>
#endif
#ifdef CONFIG_16650A
#include <genarch/kbd/16650a.h>
#ifdef CONFIG_NS16550
#include <genarch/kbd/ns16550.h>
#endif
 
#include <arch/boot/boot.h>
69,8 → 69,8
#ifdef CONFIG_Z8530
z8530_init();
#endif
#ifdef CONFIG_16650A
16650A_init();
#ifdef CONFIG_NS16550
ns16550_init();
#endif
}