projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dev'
[bertos.git]
/
bertos
/
drv
/
kbd.c
diff --git
a/bertos/drv/kbd.c
b/bertos/drv/kbd.c
index d592f069df8731a3739d721fdaccc382ea86eb98..402e07d73832a67c54a36c4b1d9015ac16bb545c 100644
(file)
--- a/
bertos/drv/kbd.c
+++ b/
bertos/drv/kbd.c
@@
-27,15
+27,14
@@
* the GNU General Public License.
*
* Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
* the GNU General Public License.
*
* Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999, 2003 Bern
ardo
Innocenti
+ * Copyright 1999, 2003 Bern
ie
Innocenti
*
* -->
*
* \brief Keyboard driver (implementation)
*
*
* -->
*
* \brief Keyboard driver (implementation)
*
- * \version $Id$
*
*
- * \author Bern
ardo Innocenti <bernie@develer.com
>
+ * \author Bern
ie Innocenti <bernie@codewiz.org
>
* \author Stefano Fedrigo <aleph@develer.com>
* \author Francesco Sacchi <batt@develer.com>
*
* \author Stefano Fedrigo <aleph@develer.com>
* \author Francesco Sacchi <batt@develer.com>
*
@@
-48,6
+47,7
@@
#include <cfg/module.h>
#include <drv/timer.h>
#include <cfg/module.h>
#include <drv/timer.h>
+#include <mware/event.h>
#include <drv/kbd.h>
#include <drv/kbd.h>
@@
-84,6
+84,8
@@
/** Status for keyboard repeat state machine */
static enum { KS_IDLE, KS_REPDELAY, KS_REPEAT } kbd_rptStatus;
/** Status for keyboard repeat state machine */
static enum { KS_IDLE, KS_REPDELAY, KS_REPEAT } kbd_rptStatus;
+/** Used to notify the occurrence of a key pressed event */
+static Event key_pressed;
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 volatile keymask_t kbd_buf; /**< Single entry keyboard buffer */
static volatile keymask_t kbd_cnt; /**< Number of keypress events in \c kbd_buf */
@@
-154,7
+156,7
@@
static void kbd_softint(UNUSED_ARG(iptr_t, arg))
timer_add(&kbd_timer);
}
timer_add(&kbd_timer);
}
-#else
+#else
#error "Define keyboard poll method"
#endif /* CONFIG_KBD_POLL */
#error "Define keyboard poll method"
#endif /* CONFIG_KBD_POLL */
@@
-177,10
+179,11
@@
keymask_t kbd_peek(void)
{
keymask_t key = 0;
{
keymask_t key = 0;
-// FIXME: make it optional
+#if CONFIG_KBD_SCHED
/* Let other tasks run for a while */
extern void schedule(void);
schedule();
/* Let other tasks run for a while */
extern void schedule(void);
schedule();
+#endif
/* Extract an event from the keyboard buffer */
IRQ_DISABLE;
/* Extract an event from the keyboard buffer */
IRQ_DISABLE;
@@
-203,7
+206,13
@@
keymask_t kbd_get(void)
{
keymask_t key;
{
keymask_t key;
- while (!(key = kbd_peek())) {}
+ #if CONFIG_KBD_POLL == KBD_POLL_SOFTINT
+ event_wait(&key_pressed);
+ key = kbd_peek();
+ #else
+ while (!(key = kbd_peek()))
+ cpu_relax();
+ #endif
return key;
}
return key;
}
@@
-216,18
+225,10
@@
keymask_t kbd_get(void)
*/
keymask_t kbd_get_timeout(mtime_t timeout)
{
*/
keymask_t kbd_get_timeout(mtime_t timeout)
{
- keymask_t key;
-
- ticks_t start = timer_clock();
- ticks_t stop = ms_to_ticks(timeout);
- do
- {
- if ((key = kbd_peek()))
- return key;
- }
- while (timer_clock() - start < stop);
-
- return K_TIMEOUT;
+ if (event_waitTimeout(&key_pressed, timeout))
+ return kbd_peek();
+ else
+ return K_TIMEOUT;
}
}
@@
-236,7
+237,7
@@
void kbd_addHandler(struct KbdHandler *handler)
KbdHandler *node;
List *list;
KbdHandler *node;
List *list;
- cpuflags_t flags;
+ cpu
_
flags_t flags;
IRQ_SAVE_DISABLE(flags);
/* Choose between raw and coocked handlers list */
IRQ_SAVE_DISABLE(flags);
/* Choose between raw and coocked handlers list */
@@
-278,6
+279,9
@@
static keymask_t kbd_defHandlerFunc(keymask_t key)
/* Force a single event in kbd buffer */
kbd_buf = key;
kbd_cnt = 1;
/* Force a single event in kbd buffer */
kbd_buf = key;
kbd_cnt = 1;
+ #if CONFIG_KBD_POLL == KBD_POLL_SOFTINT
+ event_do(&key_pressed);
+ #endif
#if CONFIG_KBD_OBSERVER
observer_notify(&kbd_subject, KBD_EVENT_KEY, &key);
#if CONFIG_KBD_OBSERVER
observer_notify(&kbd_subject, KBD_EVENT_KEY, &key);
@@
-471,9
+475,15
@@
void kbd_init(void)
#if CONFIG_KBD_POLL == KBD_POLL_SOFTINT
MOD_CHECK(timer);
#if CONFIG_KBD_POLL == KBD_POLL_SOFTINT
MOD_CHECK(timer);
+ #if CONFIG_KERN
+ MOD_CHECK(proc);
+ #endif
+
+ /* Initialize the keyboard event (key pressed) */
+ event_initGeneric(&key_pressed);
/* Add kbd handler to soft timers list */
/* Add kbd handler to soft timers list */
- event_initSoft
I
nt(&kbd_timer.expire, kbd_softint, NULL);
+ event_initSoft
i
nt(&kbd_timer.expire, kbd_softint, NULL);
timer_setDelay(&kbd_timer, ms_to_ticks(KBD_CHECK_INTERVAL));
timer_add(&kbd_timer);
timer_setDelay(&kbd_timer, ms_to_ticks(KBD_CHECK_INTERVAL));
timer_add(&kbd_timer);