summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorMekaniserad Apelsin <mek@pels.in>2015-04-26 08:08:54 +0200
committerMekaniserad Apelsin <mek@pels.in>2015-04-26 08:57:00 +0200
commit7780fd1c01182ab67d899b78d85a0d3b0d89196f (patch)
treefb416f095da28041879d2e85cf5d127bdd3957af /tmk_core
parent55fc97f957555c20c4509e587e8fd2ef1194ab0d (diff)
Add mouse support to ADB
Adding the makefile options ADB_MOUSE_ENABLE and ADB_MOUSE_ACCMAX. Might have gone overboard with comments, and tried but failed at not adding more than necessary outside the converter/adb_usb/ folder.
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/common/keyboard.c10
-rw-r--r--tmk_core/protocol.mk4
-rw-r--r--tmk_core/protocol/adb.c24
-rw-r--r--tmk_core/protocol/adb.h4
-rw-r--r--tmk_core/protocol/pjrc.mk4
5 files changed, 45 insertions, 1 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index f0ead604ec..b03b124d76 100644
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -39,6 +39,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef SERIAL_MOUSE_ENABLE
#include "serial_mouse.h"
#endif
+#ifdef ADB_MOUSE_ENABLE
+#include "adb.h"
+#endif
#ifdef MATRIX_HAS_GHOST
@@ -69,6 +72,9 @@ void keyboard_init(void)
#ifdef SERIAL_MOUSE_ENABLE
serial_mouse_init();
#endif
+#ifdef ADB_MOUSE_ENABLE
+ adb_mouse_init();
+#endif
#ifdef BOOTMAGIC_ENABLE
@@ -147,6 +153,10 @@ MATRIX_LOOP_END:
serial_mouse_task();
#endif
+#ifdef ADB_MOUSE_ENABLE
+ adb_mouse_task();
+#endif
+
// update LED
if (led_status != host_keyboard_leds()) {
led_status = host_keyboard_leds();
diff --git a/tmk_core/protocol.mk b/tmk_core/protocol.mk
index 726f658a04..54913329e6 100644
--- a/tmk_core/protocol.mk
+++ b/tmk_core/protocol.mk
@@ -46,5 +46,9 @@ ifdef SERIAL_MOUSE_USE_UART
SRC += $(PROTOCOL_DIR)/serial_uart.c
endif
+ifdef ADB_MOUSE_ENABLE
+ OPT_DEFS += -DADB_MOUSE_ENABLE -DMOUSE_ENABLE
+endif
+
# Search Path
VPATH += $(TMK_DIR)/protocol
diff --git a/tmk_core/protocol/adb.c b/tmk_core/protocol/adb.c
index bbff66df03..5c6c99b4fc 100644
--- a/tmk_core/protocol/adb.c
+++ b/tmk_core/protocol/adb.c
@@ -60,6 +60,7 @@ static inline void place_bit1(void);
static inline void send_byte(uint8_t data);
static inline uint16_t wait_data_lo(uint16_t us);
static inline uint16_t wait_data_hi(uint16_t us);
+static inline uint16_t adb_host_dev_recv(uint8_t device);
void adb_host_init(void)
@@ -121,12 +122,33 @@ bool adb_host_psw(void)
//
// [from Apple IIgs Hardware Reference Second Edition]
+enum {
+ ADDR_KEYB = 0x20,
+ ADDR_MOUSE = 0x30
+};
+
uint16_t adb_host_kbd_recv(void)
{
+ return adb_host_dev_recv(ADDR_KEYB);
+}
+
+#ifdef ADB_MOUSE_ENABLE
+void adb_mouse_init(void) {
+ return;
+}
+
+uint16_t adb_host_mouse_recv(void)
+{
+ return adb_host_dev_recv(ADDR_MOUSE);
+}
+#endif
+
+static inline uint16_t adb_host_dev_recv(uint8_t device)
+{
uint16_t data = 0;
cli();
attention();
- send_byte(0x2C); // Addr:Keyboard(0010), Cmd:Talk(11), Register0(00)
+ send_byte(device|0x0C); // Addr:Keyboard(0010)/Mouse(0011), Cmd:Talk(11), Register0(00)
place_bit0(); // Stopbit(0)
if (!wait_data_hi(500)) { // Service Request(310us Adjustable Keyboard): just ignored
sei();
diff --git a/tmk_core/protocol/adb.h b/tmk_core/protocol/adb.h
index bfe598bbf1..b4b3633cf4 100644
--- a/tmk_core/protocol/adb.h
+++ b/tmk_core/protocol/adb.h
@@ -56,7 +56,11 @@ POSSIBILITY OF SUCH DAMAGE.
void adb_host_init(void);
bool adb_host_psw(void);
uint16_t adb_host_kbd_recv(void);
+uint16_t adb_host_mouse_recv(void);
void adb_host_listen(uint8_t cmd, uint8_t data_h, uint8_t data_l);
void adb_host_kbd_led(uint8_t led);
+void adb_mouse_task(void);
+void adb_mouse_init(void);
+
#endif
diff --git a/tmk_core/protocol/pjrc.mk b/tmk_core/protocol/pjrc.mk
index 36585de7df..2b1ba2cbfb 100644
--- a/tmk_core/protocol/pjrc.mk
+++ b/tmk_core/protocol/pjrc.mk
@@ -11,6 +11,10 @@ ifdef MOUSEKEY_ENABLE
SRC += $(PJRC_DIR)/usb_mouse.c
endif
+ifdef ADB_MOUSE_ENABLE
+ SRC += $(PJRC_DIR)/usb_mouse.c
+endif
+
ifdef PS2_MOUSE_ENABLE
SRC += $(PJRC_DIR)/usb_mouse.c
endif