Subversion Repositories HelenOS

Rev

Rev 1842 | Rev 1849 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1842 Rev 1844
Line 40... Line 40...
40 
 
 40 
 
41 
#include <arch/drivers/kbd.h>
 41 
#include <arch/drivers/kbd.h>
42 
#ifdef CONFIG_Z8530
 42 
#ifdef CONFIG_Z8530
43 
#include <genarch/kbd/z8530.h>
 43 
#include <genarch/kbd/z8530.h>
44 
#endif
 44 
#endif
45 
#ifdef CONFIG_16550A
 45 
#ifdef CONFIG_NS16550
46 
#include <genarch/kbd/16550a.h>
 46 
#include <genarch/kbd/ns16550.h>
47 
#endif
 47 
#endif
48 
 
 48 
 
49 
#include <console/chardev.h>
 49 
#include <console/chardev.h>
50 
#include <console/console.h>
 50 
#include <console/console.h>
51 
#include <arch/asm.h>
 51 
#include <arch/asm.h>
Line 62... Line 62...
62 
    stdin = NULL;
 62 
    stdin = NULL;
63 
       
 63 
       
64 
    fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height,
 64 
    fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height,
65 
        bootinfo.screen.bpp, bootinfo.screen.scanline, true);
 65 
        bootinfo.screen.bpp, bootinfo.screen.scanline, true);
66 
 
 66 
 
- 
 
 67 
#ifdef KBD_ADDR_OVRD
- 
 
 68 
    if (!bootinfo.keyboard.addr)
- 
 
 69 
        bootinfo.keyboard.addr = KBD_ADDR_OVRD;
- 
 
 70 
#endif
- 
 
 71 
 
67 
    if (bootinfo.keyboard.addr)
 72 
    if (bootinfo.keyboard.addr)
68 
        kbd_init();
 73 
        kbd_init();
69 
}
 74 
}
70 
 
 75 
 
71 
/** Kernel thread for polling keyboard.
 76 
/** Kernel thread for polling keyboard.
Line 79... Line 84...
79 
       
 84 
       
80 
    while (1) {
 85 
    while (1) {
81 
#ifdef CONFIG_Z8530
 86 
#ifdef CONFIG_Z8530
82 
        z8530_poll();
 87 
        z8530_poll();
83 
#endif
 88 
#endif
84 
#ifdef CONFIG_16550A
 89 
#ifdef CONFIG_NS16550
85 
        16550a_poll();
 90 
        ns16550_poll();
86 
#endif
 91 
#endif
87 
        thread_usleep(KEYBOARD_POLL_PAUSE);
 92 
        thread_usleep(KEYBOARD_POLL_PAUSE);
88 
    }
 93 
    }
89 
}
 94 
}
90 
 
 95