Merge branch "preempt" in "trunk".

[bertos.git] / bertos / drv / kbd.c

diff --git a/bertos/drv/kbd.c b/bertos/drv/kbd.c
index fa03d841aacc3ff71dc2e52fd2597e464b5a44a7..3d1eca4537dc2a256301f9178fe2c5aaa47e8e0e 100644 (file)
--- a/bertos/drv/kbd.c
+++ b/bertos/drv/kbd.c
@@ -177,10 +177,11 @@ keymask_t kbd_peek(void)
 {
        keymask_t key = 0;
 
-// FIXME: make it optional
+#if CONFIG_KBD_SCHED
        /* Let other tasks run for a while */
        extern void schedule(void);
        schedule();
+#endif
 
        /* Extract an event from the keyboard buffer */
        IRQ_DISABLE;
@@ -236,7 +237,7 @@ void kbd_addHandler(struct KbdHandler *handler)
        KbdHandler *node;
        List *list;
 
-       cpuflags_t flags;
+       cpu_flags_t flags;
        IRQ_SAVE_DISABLE(flags);
 
        /* Choose between raw and coocked handlers list */