X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fkbd.c;h=3d1eca4537dc2a256301f9178fe2c5aaa47e8e0e;hb=fbb255258c626502f8d7ba583ca138f903e03b75;hp=cc623c6a82e6e04210af5c0371dd0231d3276620;hpb=d62963b4a64efe8d2917f489fefaf586a9a99126;p=bertos.git

diff --git a/bertos/drv/kbd.c b/bertos/drv/kbd.c
index cc623c6a..3d1eca45 100644
--- a/bertos/drv/kbd.c
+++ b/bertos/drv/kbd.c
@@ -27,7 +27,7 @@
  * the GNU General Public License.
  *
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999, 2003 Bernardo Innocenti
+ * Copyright 1999, 2003 Bernie Innocenti
  *
  * -->
  *
@@ -35,15 +35,15 @@
  *
  * \version $Id$
  *
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Stefano Fedrigo <aleph@develer.com>
  * \author Francesco Sacchi <batt@develer.com>
  *
  */
 
-#include "hw_kbd.h"
+#include "hw/hw_kbd.h"
 
-#include <cfg/cfg_kbd.h>
+#include "cfg/cfg_kbd.h"
 #include <cfg/debug.h>
 #include <cfg/module.h>
 
@@ -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,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 */
@@ -473,7 +474,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);