X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fkbd.h;h=eb699602d26cf3158c5f6cad080da70fb8893bd5;hb=4278d44ef7681c56f4bd16615c3c4d9338112df4;hp=f73487522ee1491079ac04eef1878a39372fa3f7;hpb=d62963b4a64efe8d2917f489fefaf586a9a99126;p=bertos.git

diff --git a/bertos/drv/kbd.h b/bertos/drv/kbd.h
index f7348752..eb699602 100644
--- a/bertos/drv/kbd.h
+++ b/bertos/drv/kbd.h
@@ -27,27 +27,37 @@
  * the GNU General Public License.
  *
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999, 2003 Bernardo Innocenti
+ * Copyright 1999, 2003 Bernie Innocenti
  *
  * -->
  *
- * \brief Keyboard driver (interface)
+ * \defgroup kbd Keyboard handling driver
+ * \ingroup drivers
+ * \{
+ * \brief Keyboard driver.
+ *
+ * <b>Configuration file</b>: cfg_kbd.h
  *
- * \version $Id$
- * \author Bernardo Innocenti <bernie@develer.com>
+ * <b>HAL files</b>: hw_kbd.h, kbd_map.h
+ * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Stefano Fedrigo <aleph@develer.com>
  * \author Francesco Sacchi <batt@develer.com>
+ *
+ * $WIZ$ module_name = "kbd"
+ * $WIZ$ module_depends = "timer"
+ * $WIZ$ module_configuration = "bertos/cfg/cfg_kbd.h"
+ * $WIZ$ module_hw = "bertos/hw/hw_kbd.h", "bertos/hw/kbd_map.h"
  */
 
 #ifndef DRV_KBD_H
 #define DRV_KBD_H
 
-#include "kbd_map.h"
+#include "hw/kbd_map.h"
 
-#include <cfg/cfg_kbd.h> // CONFIG_KBD_OBSERVER
+#include "cfg/cfg_kbd.h" // CONFIG_KBD_OBSERVER
 #include <cfg/compiler.h>
 
-#include <mware/list.h>
+#include <struct/list.h>
 
 /**
  * \name Keyboard polling modes.
@@ -75,7 +85,9 @@ typedef struct KbdHandler
 
 void kbd_init(void);
 keymask_t kbd_peek(void);
+keymask_t kbd_peekMask(keymask_t mask);
 keymask_t kbd_get(void);
+keymask_t kbd_getMask(keymask_t mask);
 keymask_t kbd_get_timeout(mtime_t timeout);
 void kbd_addHandler(struct KbdHandler *handler);
 void kbd_remHandler(struct KbdHandler *handler);
@@ -94,4 +106,5 @@ keymask_t kbd_setRepeatMask(keymask_t mask);
 	};
 #endif
 
+/** \} */ //defgroup kbd
 #endif /* DRV_KBD_H */