X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fkbd.c;h=19b2478df313275725165039a4bfb12903176d52;hb=ce53d10edad6c070e6603cf8cd2e8da464dad32c;hp=b36a5a4801c0806103cc2895eec84424e8e4c9cc;hpb=4cc44c9888a0336b9d01121ec0b7ad95f4a76195;p=bertos.git

diff --git a/bertos/drv/kbd.c b/bertos/drv/kbd.c
index b36a5a48..19b2478d 100644
--- a/bertos/drv/kbd.c
+++ b/bertos/drv/kbd.c
@@ -154,7 +154,7 @@ static void kbd_softint(UNUSED_ARG(iptr_t, arg))
 	timer_add(&kbd_timer);
 }
 
-#else 
+#else
 	#error "Define keyboard poll method"
 
 #endif /* CONFIG_KBD_POLL */
@@ -177,10 +177,9 @@ keymask_t kbd_peek(void)
 {
 	keymask_t key = 0;
 
-// FIXME: make it optional
-	/* Let other tasks run for a while */
-	extern void schedule(void);
+#if CONFIG_KBD_SCHED
 	schedule();
+#endif
 
 	/* Extract an event from the keyboard buffer */
 	IRQ_DISABLE;
@@ -236,7 +235,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 */
@@ -473,7 +472,7 @@ void kbd_init(void)
 	MOD_CHECK(timer);
 
 	/* Add kbd handler to soft timers list */
-	event_initSoftInt(&kbd_timer.expire, kbd_softint, NULL);
+	event_initSoftint(&kbd_timer.expire, kbd_softint, NULL);
 	timer_setDelay(&kbd_timer, ms_to_ticks(KBD_CHECK_INTERVAL));
 	timer_add(&kbd_timer);