X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=hw%2Fhw_kbd.h;h=c4f684b82019cc417ecec6fec14ec8d7e4819a7a;hb=3b33848a29f6a9ba49a2913ba6b721e01d8b95f5;hp=8908db2786a8e98e4d143d22cec5ad8d92125c37;hpb=482fcc3ee5ea930a38e04c93341445b8a77f6123;p=bertos.git

diff --git a/hw/hw_kbd.h b/hw/hw_kbd.h
index 8908db27..c4f684b8 100755
--- a/hw/hw_kbd.h
+++ b/hw/hw_kbd.h
@@ -16,6 +16,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.3  2006/03/22 09:51:27  bernie
+ *#* Wrap C++ stuff.
+ *#*
+ *#* Revision 1.2  2006/02/15 09:13:42  bernie
+ *#* Add keyboard emulator.
+ *#*
  *#* Revision 1.1  2006/02/10 12:31:03  bernie
  *#* Add templates for hw definitions.
  *#*
@@ -24,46 +30,24 @@
 #ifndef HW_KBD_H
 #define HW_KBD_H
 
-
 #include "kbd_map.h"
 #include <cfg/macros.h>
-#include <cfg/debug.h>
-
-
- /*!
- * \name CPU ports <-> switches assignement
- * @{
- */
 
 #define K_RPT_MASK (K_UP | K_DOWN | K_OK | K_CANCEL)
-/*@}*/
-
 
 #define KBD_HW_INIT \
 	do { \
 	} while (0)
 
+EXTERN_C int emul_kbdReadCols(void);
 
-/*!
+/**
  * Read the keyboard ports and return the mask of
  * depressed keys.
  */
 INLINE keymask_t kbd_readkeys(void)
 {
-	keymask_t key = 0;
-
-	uint32_t mask = 0xF;
-
-	if (!(mask & 1))
-		key |= K_OK;
-	if (!(mask & 2))
-		key |= K_CANCEL;
-	if (!(mask & 4))
-		key |= K_UP;
-	if (!(mask & 8))
-		key |= K_DOWN;
-
-	return key;
+	return (keymask_t)emul_kbdReadCols();
 }
 
 #endif /* HW_KBD_H */