X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fkbd.h;h=f6193738d786bee9f4e61c756ed7df75b732052f;hb=5f3952176a4e9a00ca8dd5ec4a6b994958f89e0a;hp=ab024472191e71fdd792b52f14d4d59a71377ba9;hpb=25909cdf6e3cb243846a002cf704af8357d0ec4c;p=bertos.git

diff --git a/drv/kbd.h b/drv/kbd.h
old mode 100755
new mode 100644
index ab024472..f6193738
--- a/drv/kbd.h
+++ b/drv/kbd.h
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
@@ -16,6 +16,21 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.6  2006/07/19 12:56:25  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.5  2006/06/03 13:57:36  bernie
+ *#* Make keyboard repeat mask run-time configurable.
+ *#*
+ *#* Revision 1.4  2006/03/20 17:50:17  bernie
+ *#* Add FreeRTOS and Observers support.
+ *#*
+ *#* Revision 1.3  2006/02/27 22:39:45  bernie
+ *#* Misc build and doc fixes from project_grl.
+ *#*
+ *#* Revision 1.2  2006/02/10 12:38:16  bernie
+ *#* Add preliminary FreeRTOS support; Enforce CONFIG_* definitions.
+ *#*
  *#* Revision 1.1  2005/06/27 21:28:45  bernie
  *#* Import generic keyboard driver.
  *#*
@@ -25,29 +40,53 @@
 
 #include <kbd_map.h>
 #include <cfg/compiler.h>
-#include <arch_config.h>
 #include <mware/list.h>
+#include <appconfig.h> // CONFIG_KBD_OBSERVER
 
+/**
+ * \name Keyboard polling modes.
+ *
+ * Define CONFIG_KBD_POLL to one of these.
+ *
+ * \{
+ */
+#define KBD_POLL_SOFTINT  1
+#define KBD_POLL_FREERTOS 2
+/* \} */
 
-/*!
+/**
  * Keyboard handler descriptor
  */
 typedef struct KbdHandler
 {
 	Node link;
-	keymask_t (*hook)(keymask_t);   /*!< Hook function */
-	int8_t pri;                     /*!< Priority in input queue */
-	uint8_t flags;                  /*!< See below for definitions */
+	keymask_t (*hook)(keymask_t);   /**< Hook function */
+	int8_t pri;                     /**< Priority in input queue */
+	uint8_t flags;                  /**< See below for definitions */
 } KbdHandler;
 
-#define KHF_RAWKEYS	BV(0)           /*!< Handler gets raw key events */
+#define KHF_RAWKEYS	BV(0)           /**< Handler gets raw key events */
+
+
+void kbd_init(void);
+keymask_t kbd_peek(void);
+keymask_t kbd_get(void);
+keymask_t kbd_get_timeout(mtime_t timeout);
+void kbd_addHandler(struct KbdHandler *handler);
+void kbd_remHandler(struct KbdHandler *handler);
+keymask_t kbd_setRepeatMask(keymask_t mask);
+
+#if CONFIG_KBD_OBSERVER
+	struct Subject;
 
+	/** Subject structure for keyboard observers. */
+	extern struct Subject kbd_subject;
 
-extern void kbd_init(void);
-extern keymask_t kbd_peek(void);
-extern keymask_t kbd_get(void);
-extern keymask_t kbd_get_timeout(mtime_t timeout);
-extern void kbd_addHandler(struct KbdHandler *handler);
-extern void kbd_remHandler(struct KbdHandler *handler);
+	enum
+	{
+		/* Event for key presses. */
+		KBD_EVENT_KEY = 0x100
+	};
+#endif
 
 #endif /* DRV_KBD_H */