From 12f6e9ffa76f685f7256bf1421f918f90c93add1 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Sat, 28 Apr 2012 01:57:36 +0900
Subject: Added M0110A support contributed by skagon@github.

- README is written with markdown notation.
- m0110.c can handles Arrow keys and Calc keys of M0110A.
- EXTRAFLAGS and EXTRALDFLAGS are added in rules.mk to give flags on make command line.
---
 m0110.h | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

(limited to 'm0110.h')

diff --git a/m0110.h b/m0110.h
index 287c45b548..39da4ad662 100644
--- a/m0110.h
+++ b/m0110.h
@@ -54,23 +54,39 @@ POSSIBILITY OF SUCH DAMAGE.
 #   error "M0110 data port setting is required in config.h"
 #endif
 
-#define M0110_INQUIRY     0x10
-#define M0110_INSTANT     0x14
-#define M0110_MODEL       0x16
-#define M0110_TEST        0x36
-
-#define M0110_PAD         0x79
-#define M0110_NULL        0x7B
-#define M0110_TEST_ACK    0x7D
-#define M0110_TEST_NAK    0x77
-
+/* Commands */
+#define M0110_INQUIRY       0x10
+#define M0110_INSTANT       0x14
+#define M0110_MODEL         0x16
+#define M0110_TEST          0x36
+
+/* Response(raw byte from M0110) */
+#define M0110_NULL          0x7B
+#define M0110_KEYPAD        0x79
+#define M0110_TEST_ACK      0x7D
+#define M0110_TEST_NAK      0x77
+#define M0110_SHIFT_MAKE    0x71
+#define M0110_SHIFT_BREAK   0xF1
+#define M0110_ARROW_UP      0x1B
+#define M0110_ARROW_DOWN    0x11
+#define M0110_ARROW_LEFT    0x0D
+#define M0110_ARROW_RIGHT   0x05
+
+/* This inidcates no response. */
+#define M0110_ERROR         0xFF
 
 /* scan code offset for keypad and arrow keys */
 #define M0110_KEYPAD_OFFSET 0x40
-#define M0110_ARROW_OFFSET  0x60
+#define M0110_CALC_OFFSET   0x60
 
 /* convert key event raw response into scan code */
-#define M0110_RAW2SCAN(key) ((key&(1<<7)) | ((key&0x7F)>>1))
+#define M0110_RAW2SCAN(key) ( \
+    (key == M0110_NULL) ?  M0110_NULL : ( \
+        (key == M0110_ERROR) ?  M0110_ERROR : ( \
+            ((key&0x80) | ((key&0x7F)>>1)) \
+        ) \
+    ) \
+)
 
 
 extern uint8_t m0110_error;
@@ -80,5 +96,7 @@ void m0110_init(void);
 uint8_t m0110_send(uint8_t data);
 uint8_t m0110_recv(void);
 uint8_t m0110_recv_key(void);
+uint8_t m0110_inquiry(void);
+uint8_t m0110_instant(void);
 
 #endif
-- 
cgit v1.2.3


From d553289e7edfdf17dfe4fb9cf45a3b23ea2e03df Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Sun, 29 Apr 2012 03:09:40 +0900
Subject: Ignore release flag when comparing key event.

---
 m0110.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'm0110.h')

diff --git a/m0110.h b/m0110.h
index 39da4ad662..7d2ffa83a0 100644
--- a/m0110.h
+++ b/m0110.h
@@ -65,8 +65,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #define M0110_KEYPAD        0x79
 #define M0110_TEST_ACK      0x7D
 #define M0110_TEST_NAK      0x77
-#define M0110_SHIFT_MAKE    0x71
-#define M0110_SHIFT_BREAK   0xF1
+#define M0110_SHIFT         0x71
 #define M0110_ARROW_UP      0x1B
 #define M0110_ARROW_DOWN    0x11
 #define M0110_ARROW_LEFT    0x0D
-- 
cgit v1.2.3


From f5f48c2a240b43e1773c3787b8fca8859f128cf7 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Tue, 15 May 2012 03:41:07 +0900
Subject: Fix bug on RAW2SCAN. Add work around for M0110A.

- Bug fix: Macro RAW2SCAN doesn't work and converted into static inline function.
- Add Exceptional handling for M0110A arrow keys and calc keys.
- Fix keymap.
---
 m0110.h | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'm0110.h')

diff --git a/m0110.h b/m0110.h
index 7d2ffa83a0..792a562b60 100644
--- a/m0110.h
+++ b/m0110.h
@@ -78,15 +78,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #define M0110_KEYPAD_OFFSET 0x40
 #define M0110_CALC_OFFSET   0x60
 
-/* convert key event raw response into scan code */
-#define M0110_RAW2SCAN(key) ( \
-    (key == M0110_NULL) ?  M0110_NULL : ( \
-        (key == M0110_ERROR) ?  M0110_ERROR : ( \
-            ((key&0x80) | ((key&0x7F)>>1)) \
-        ) \
-    ) \
-)
-
 
 extern uint8_t m0110_error;
 
-- 
cgit v1.2.3


From 805ce3c1309421df6166b085b70f53c494f9946b Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Tue, 22 May 2012 00:14:02 +0900
Subject: Fix key stuck bug of M0110A support.

- rewrite special key handling in m0110.c
- add mouse keys to keymap
---
 m0110.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'm0110.h')

diff --git a/m0110.h b/m0110.h
index 792a562b60..2b95ed34d5 100644
--- a/m0110.h
+++ b/m0110.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2011 Jun WAKO <wakojun@gmail.com>
+Copyright 2011,2012 Jun WAKO <wakojun@gmail.com>
 
 This software is licensed with a Modified BSD License.
 All of this is supposed to be Free Software, Open Source, DFSG-free,
-- 
cgit v1.2.3