X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fkbd.c;h=de1c561c06bccf8af580360c77a1eedc3ec6a378;hb=d10f125474900e83860a3031ca3a31141fdf27a9;hp=e70114b1e9c81675022c343c6dd19bb8eddba93f;hpb=a98a42143f3b9c130a36e59221817fa5260a8322;p=bertos.git

diff --git a/drv/kbd.c b/drv/kbd.c
index e70114b1..de1c561c 100755
--- a/drv/kbd.c
+++ b/drv/kbd.c
@@ -17,6 +17,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.5  2006/02/27 22:39:45  bernie
+ *#* Misc build and doc fixes from project_grl.
+ *#*
+ *#* Revision 1.4  2006/02/24 00:27:14  bernie
+ *#* Use new naming convention for list macros.
+ *#*
+ *#* Revision 1.3  2006/02/17 21:15:42  bernie
+ *#* Add MOD_CHECK() checks.
+ *#*
  *#* Revision 1.2  2006/02/10 12:36:20  bernie
  *#* Add preliminary FreeRTOS support; Enforce CONFIG_* definitions.
  *#*
@@ -32,6 +41,8 @@
 #include <drv/buzzer.h>
 
 #include <cfg/debug.h>
+#include <cfg/module.h>
+#include <appconfig.h>
 
 /* Configuration sanity checks */
 #if !defined(CONFIG_KBD_POLL) || (CONFIG_KBD_POLL != KBD_POLL_SOFTINT && CONFIG_KBD_POLL != CONFIG_POLL_FREERTOS)
@@ -58,7 +69,9 @@ static enum { KS_IDLE, KS_REPDELAY, KS_REPEAT } kbd_rptStatus;
 static volatile keymask_t kbd_buf; /*!< Single entry keyboard buffer */
 static volatile keymask_t kbd_cnt; /*!< Number of keypress events in \c kbd_buf */
 
+#if CONFIG_KBD_POLL == KBD_POLL_SOFTINT
 static Timer kbd_timer;            /*!< Keyboard softtimer */
+#endif
 
 static List kbd_rawHandlers;       /*!< Raw keyboard handlers */
 static List kbd_handlers;          /*!< Cooked keyboard handlers */
@@ -90,7 +103,7 @@ static void kbd_poll(void)
 	keymask_t key = kbd_readkeys();
 
 	/* Call raw input handlers */
-	FOREACHNODE(handler, &kbd_rawHandlers)
+	FOREACH_NODE(handler, &kbd_rawHandlers)
 		key = handler->hook(key);
 
 	/* If this key was not previously pressed */
@@ -100,7 +113,7 @@ static void kbd_poll(void)
 		current_key = key;
 
 		/* Call cooked input handlers */
-		FOREACHNODE(handler, &kbd_handlers)
+		FOREACH_NODE(handler, &kbd_handlers)
 			key = handler->hook(key);
 	}
 }
@@ -121,11 +134,11 @@ static void kbd_softint(UNUSED_ARG(iptr_t, arg))
 #include "FreeRTOS.h"
 #include "task.h"
 
-static portTASK_FUNCTION(kbd_poll, arg)
+static portTASK_FUNCTION(kbd_task, arg)
 {
 	for (;;)
 	{
-		kbd_poll(0);
+		kbd_poll();
 		timer_delay(KBD_CHECK_INTERVAL);
 	}
 }
@@ -217,12 +230,12 @@ void kbd_addHandler(struct KbdHandler *handler)
 	 * Search for the first node whose priority
 	 * is lower than the timer we want to add.
 	 */
-	FOREACHNODE(node,list)
+	FOREACH_NODE(node,list)
 		if (node->pri < handler->pri)
 			break;
 
 	/* Enqueue handler in the handlers chain */
-	INSERTBEFORE(&handler->link, &node->link);
+	INSERT_BEFORE(&handler->link, &node->link);
 
 	IRQ_RESTORE(flags);
 }
@@ -379,12 +392,15 @@ static keymask_t kbd_rptHandlerFunc(keymask_t key)
 }
 
 
+MOD_DEFINE(kbd)
 
 /*!
  * Initialize keyboard ports and softtimer
  */
 void kbd_init(void)
 {
+	MOD_CHECK(buzzer);
+
 	KBD_HW_INIT;
 
 	/* Init handlers lists */
@@ -405,29 +421,35 @@ void kbd_init(void)
 	kbd_addHandler(&kbd_lngHandler);
 	#endif
 
-
 	/* Add repeat keyboard handler */
 	kbd_rptHandler.hook = kbd_rptHandlerFunc;
 	kbd_rptHandler.pri = 80; /* high priority */
 	kbd_rptHandler.flags = KHF_RAWKEYS;
 	kbd_addHandler(&kbd_rptHandler);
 
-
 	/* Add default keyboard handler */
 	kbd_defHandler.hook = kbd_defHandlerFunc;
 	kbd_defHandler.pri = -128; /* lowest priority */
 	kbd_addHandler(&kbd_defHandler);
 
 #if CONFIG_KBD_POLL == KBD_POLL_SOFTINT
+
+	MOD_CHECK(timer);
+
 	/* Add kbd handler to soft timers list */
 	event_initSoftInt(&kbd_timer.expire, kbd_softint, 0);
 	timer_setDelay(&kbd_timer, ms_to_ticks(KBD_CHECK_INTERVAL));
 	timer_add(&kbd_timer);
+
 #elif CONFIG_KBD_POLL == CONFIG_POLL_FREERTOS
+
 	/* Create a timer specific thread */
-	xTaskCreate(kbd_poll, "kbd_poll", CONFIG_STACK_KBD,
+	xTaskCreate(kbd_task, "kbd", CONFIG_STACK_KBD,
 			NULL, CONFIG_PRI_KBD, NULL);
+
 #else
 	#error "Define keyboard poll method"
 #endif
+
+	MOD_INIT(kbd);
 }