Disable menu timeout.

[bertos.git] / drv / kbd.c

diff --git a/drv/kbd.c b/drv/kbd.c
index e231536524f2397cfb7c3a316f2a76b3417c75bf..a051edc73a63695d8e626097c542dfeb72bf598c 100755 (executable)
--- a/drv/kbd.c
+++ b/drv/kbd.c
@@ -17,6 +17,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.6  2006/03/20 17:50:17  bernie
+ *#* Add FreeRTOS and Observers support.
+ *#*
+ *#* 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.
  *#*
@@ -32,16 +41,25 @@
 
 #include <drv/timer.h>
 #include <drv/kbd.h>
-#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)
        #error CONFIG_KBD_POLL must be defined to either KBD_POLL_SOFTINT or CONFIG_POLL_FREERTOS
 #endif
+#if !defined(CONFIG_KBD_BEEP) || (CONFIG_KBD_BEEP != 0 && CONFIG_KBD_BEEP != 1)
+       #error CONFIG_KBD_BEEP must be defined to either 0 or 1
+#endif
+#if !defined(CONFIG_KBD_OBSERVER) || (CONFIG_KBD_OBSERVER != 0 && CONFIG_KBD_OBSERVER != 1)
+       #error CONFIG_KBD_OBSERVER must be defined to either 0 or 1
+#endif
 
+#if CONFIG_KBD_BEEP
+       #include <drv/buzzer.h>
+#endif
 
 #define KBD_CHECK_INTERVAL  10  /*!< (ms) Timing for kbd softint */
 #define KBD_DEBOUNCE_TIME   30  /*!< (ms) Debounce time */
@@ -62,7 +80,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 */
@@ -74,6 +94,10 @@ static KbdHandler kbd_rptHandler;  /*!< Auto-repeat keyboard handler */
 static KbdHandler kbd_lngHandler;  /*!< Long pression keys handler */
 #endif
 
+#if CONFIG_KBD_OBSERVER
+       #include <mware/observer.h>
+       Subject kbd_subject;
+#endif
 
 
 /*!
@@ -94,7 +118,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 */
@@ -104,7 +128,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);
        }
 }
@@ -125,11 +149,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);
        }
 }
@@ -153,6 +177,7 @@ keymask_t kbd_peek(void)
        keymask_t key = 0;
 
 // FIXME
+       /* Let other tasks run for a while */
        extern void schedule(void);
        schedule();
 
@@ -168,7 +193,6 @@ keymask_t kbd_peek(void)
        return key;
 }
 
-
 /*!
  * Wait for a keypress and return the mask of depressed keys.
  *
@@ -179,6 +203,7 @@ keymask_t kbd_get(void)
        keymask_t key;
 
        while (!(key = kbd_peek())) {}
+
        return key;
 }
 
@@ -221,12 +246,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);
 }
@@ -253,10 +278,14 @@ static keymask_t kbd_defHandlerFunc(keymask_t key)
                kbd_buf = key;
                kbd_cnt = 1;
 
-#if KBD_BEEP_TIME
-               if (!(key & K_REPEAT))
-                       buz_beep(KBD_BEEP_TIME);
-#endif
+               #if CONFIG_KBD_OBSERVER
+                       observer_notify(&kbd_subject, KBD_EVENT_KEY, &key);
+               #endif
+
+               #if CONFIG_KBD_BEEP
+                       if (!(key & K_REPEAT))
+                               buz_beep(KBD_BEEP_TIME);
+               #endif
        }
 
        /* Eat all input */
@@ -323,9 +352,10 @@ static keymask_t kbd_lngHandlerFunc(keymask_t key)
  */
 static keymask_t kbd_rptHandlerFunc(keymask_t key)
 {
-       /*! Timer for keyboard repeat events */
+       /* Timer for keyboard repeat events. */
        static ticks_t repeat_time;
 
+       /* Current repeat rate (for acceleration). */
        static ticks_t repeat_rate; /*! Current repeat rate (for acceleration) */
 
        ticks_t now = timer_clock();
@@ -390,7 +420,9 @@ MOD_DEFINE(kbd)
  */
 void kbd_init(void)
 {
+#if CONFIG_KBD_BEEP
        MOD_CHECK(buzzer);
+#endif
 
        KBD_HW_INIT;
 
@@ -423,6 +455,10 @@ void kbd_init(void)
        kbd_defHandler.pri = -128; /* lowest priority */
        kbd_addHandler(&kbd_defHandler);
 
+#if CONFIG_KBD_OBSERVER
+       observer_InitSubject(&kbd_subject);
+#endif
+
 #if CONFIG_KBD_POLL == KBD_POLL_SOFTINT
 
        MOD_CHECK(timer);
@@ -435,7 +471,7 @@ void kbd_init(void)
 #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