Sistema l'errore da me commesso in fase di conversione...

[bertos.git] / hw / hw_kbd.h

diff --git a/hw/hw_kbd.h b/hw/hw_kbd.h
old mode 100755 (executable)
new mode 100644 (file)
index 8908db2..1f62462
--- a/hw/hw_kbd.h
+++ b/hw/hw_kbd.h
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
@@ -16,6 +16,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.4  2006/07/19 12:56:27  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* 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 +33,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 */