From 2dce1236b77f7b39f0352db5dd6df6c1046652cb Mon Sep 17 00:00:00 2001
From: Kai Ryu <kai1103@gmail.com>
Date: Tue, 15 Dec 2015 10:50:29 +0900
Subject: [PATCH] fantastic60: Disable bootmagic and change method of detecting
 ps2 mouse

---
 keyboard/fantastic60/Makefile |  4 ++--
 keyboard/fantastic60/matrix.c | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/keyboard/fantastic60/Makefile b/keyboard/fantastic60/Makefile
index 0001702b..857b2a29 100755
--- a/keyboard/fantastic60/Makefile
+++ b/keyboard/fantastic60/Makefile
@@ -121,8 +121,8 @@ endif
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration(+1000)
-#MOUSEKEY_ENABLE = yes	# Mouse keys(+4700)
+#BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes	# Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
 CONSOLE_ENABLE = yes	# Console for debug(+400)
 COMMAND_ENABLE = yes	# Commands for debug and configuration
diff --git a/keyboard/fantastic60/matrix.c b/keyboard/fantastic60/matrix.c
index 3f261077..559f4a32 100644
--- a/keyboard/fantastic60/matrix.c
+++ b/keyboard/fantastic60/matrix.c
@@ -74,6 +74,20 @@ void matrix_init(void)
     unselect_rows();
     init_cols();
 
+#ifdef PS2_MOUSE_ENABLE
+    // ps2 mouse detecting
+    DDRC  &= ~(1<<PC7);
+    PORTC |=  (1<<PC7);
+    _delay_us(30);  // without this wait read unstable value.
+    if ((PINC & (1<<PC7)) == 0) {
+        ps2_mouse_enabled = 1;
+    }
+    else {
+        ps2_mouse_enabled = 0;
+    }
+    PORTC &= ~(1<<PC7);
+#endif
+
     // initialize matrix state: all keys off
     for (uint8_t i=0; i < MATRIX_ROWS; i++) {
         matrix[i] = 0;