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

diff --git a/drv/kbd.c b/drv/kbd.c
index de1c561c..4dabd3b3 100755
--- a/drv/kbd.c
+++ b/drv/kbd.c
@@ -17,6 +17,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.7  2006/06/03 13:57:36  bernie
+ *#* Make keyboard repeat mask run-time configurable.
+ *#*
+ *#* 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.
  *#*
@@ -38,7 +44,6 @@
 
 #include <drv/timer.h>
 #include <drv/kbd.h>
-#include <drv/buzzer.h>
 
 #include <cfg/debug.h>
 #include <cfg/module.h>
@@ -48,7 +53,16 @@
 #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 */
@@ -68,6 +82,7 @@ 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 */
+static keymask_t kbd_rpt_mask;     /**< Mask of repeatable keys. */
 
 #if CONFIG_KBD_POLL == KBD_POLL_SOFTINT
 static Timer kbd_timer;            /*!< Keyboard softtimer */
@@ -83,6 +98,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
 
 
 /*!
@@ -162,6 +181,7 @@ keymask_t kbd_peek(void)
 	keymask_t key = 0;
 
 // FIXME
+	/* Let other tasks run for a while */
 	extern void schedule(void);
 	schedule();
 
@@ -177,7 +197,6 @@ keymask_t kbd_peek(void)
 	return key;
 }
 
-
 /*!
  * Wait for a keypress and return the mask of depressed keys.
  *
@@ -188,6 +207,7 @@ keymask_t kbd_get(void)
 	keymask_t key;
 
 	while (!(key = kbd_peek())) {}
+
 	return key;
 }
 
@@ -262,10 +282,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 */
@@ -306,35 +330,44 @@ static keymask_t kbd_debHandlerFunc(keymask_t key)
 }
 
 #ifdef  K_LNG_MASK
-/*!
- * Handle long pression keys
+/**
+ * Handle long pression keys.
  */
 static keymask_t kbd_lngHandlerFunc(keymask_t key)
 {
-	static ticks_t stop;
+	static ticks_t start;
 	ticks_t now = timer_clock();
 
 	if (key & K_LNG_MASK)
 	{
-		if (now - stop > 0)
-			key &= K_LNG_MASK;
-		else
-			key &= ~K_LNG_MASK;
+		if (now - start > ms_to_ticks(KBD_LNG_DELAY))
+			key |= K_LONG;
 	}
 	else
-		stop = now + ms_to_ticks(KBD_LNG_DELAY);
+		start = now;
 	return key;
 }
 #endif
 
+/**
+ * Set current mask of repeatable keys.
+ */
+keymask_t kbd_setRepeatMask(keymask_t mask)
+{
+	keymask_t oldmask = kbd_rpt_mask;
+	ATOMIC(kbd_rpt_mask = mask);
+	return oldmask;
+}
+
 /*!
  * Handle keyboard repeat
  */
 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();
@@ -342,7 +375,7 @@ static keymask_t kbd_rptHandlerFunc(keymask_t key)
 	switch (kbd_rptStatus)
 	{
 		case KS_IDLE:
-			if (key & K_RPT_MASK)
+			if (key & kbd_rpt_mask)
 			{
 				repeat_time = now;
 				kbd_rptStatus = KS_REPDELAY;
@@ -350,11 +383,11 @@ static keymask_t kbd_rptHandlerFunc(keymask_t key)
 			break;
 
 		case KS_REPDELAY:
-			if (key & K_RPT_MASK)
+			if (key & kbd_rpt_mask)
 			{
 				if (now - repeat_time > ms_to_ticks(KBD_REPEAT_DELAY))
 				{
-					key = (key & K_RPT_MASK) | K_REPEAT;
+					key = (key & kbd_rpt_mask) | K_REPEAT;
 					repeat_time = now;
 					repeat_rate = ms_to_ticks(KBD_REPEAT_RATE);
 					kbd_rptStatus = KS_REPEAT;
@@ -367,12 +400,12 @@ static keymask_t kbd_rptHandlerFunc(keymask_t key)
 			break;
 
 		case KS_REPEAT:
-			if (key & K_RPT_MASK)
+			if (key & kbd_rpt_mask)
 			{
 				if (now - repeat_time > repeat_rate)
 				{
 					/* Enqueue a new event in the buffer */
-					key = (key & K_RPT_MASK) | K_REPEAT;
+					key = (key & kbd_rpt_mask) | K_REPEAT;
 					repeat_time = now;
 
 					/* Repeat rate acceleration */
@@ -399,7 +432,9 @@ MOD_DEFINE(kbd)
  */
 void kbd_init(void)
 {
+#if CONFIG_KBD_BEEP
 	MOD_CHECK(buzzer);
+#endif
 
 	KBD_HW_INIT;
 
@@ -432,6 +467,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);