summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2021-10-28 02:43:51 +0100
committerGitHub <noreply@github.com>2021-10-28 02:43:51 +0100
commit780e763c13052138e4d9ad379c4138c3b2c344a7 (patch)
tree529979df4d2e44a1c6c57cde14b8ec2e58cb41d6
parentb780c797beb726839e99e3f4054f9b4c33331cdc (diff)
Remove SERIAL_MOUSE (#14969)
-rw-r--r--quantum/keyboard.c10
-rw-r--r--tmk_core/protocol.mk20
-rw-r--r--tmk_core/protocol/serial_mouse.h29
-rw-r--r--tmk_core/protocol/serial_mouse_microsoft.c113
-rw-r--r--tmk_core/protocol/serial_mouse_mousesystems.c119
5 files changed, 0 insertions, 291 deletions
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index f8e36994d2..030fec2d3e 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -40,9 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef PS2_MOUSE_ENABLE
# include "ps2_mouse.h"
#endif
-#ifdef SERIAL_MOUSE_ENABLE
-# include "serial_mouse.h"
-#endif
#ifdef RGBLIGHT_ENABLE
# include "rgblight.h"
#endif
@@ -310,9 +307,6 @@ void keyboard_init(void) {
#ifdef PS2_MOUSE_ENABLE
ps2_mouse_init();
#endif
-#ifdef SERIAL_MOUSE_ENABLE
- serial_mouse_init();
-#endif
#ifdef BACKLIGHT_ENABLE
backlight_init();
#endif
@@ -490,10 +484,6 @@ MATRIX_LOOP_END:
ps2_mouse_task();
#endif
-#ifdef SERIAL_MOUSE_ENABLE
- serial_mouse_task();
-#endif
-
#ifdef POINTING_DEVICE_ENABLE
pointing_device_task();
#endif
diff --git a/tmk_core/protocol.mk b/tmk_core/protocol.mk
index 8aa063c911..d4ad50db6a 100644
--- a/tmk_core/protocol.mk
+++ b/tmk_core/protocol.mk
@@ -1,25 +1,5 @@
PROTOCOL_DIR = protocol
-ifeq ($(strip $(SERIAL_MOUSE_MICROSOFT_ENABLE)), yes)
- SRC += $(PROTOCOL_DIR)/serial_mouse_microsoft.c
- OPT_DEFS += -DSERIAL_MOUSE_ENABLE -DSERIAL_MOUSE_MICROSOFT \
- -DMOUSE_ENABLE
-endif
-
-ifeq ($(strip $(SERIAL_MOUSE_MOUSESYSTEMS_ENABLE)), yes)
- SRC += $(PROTOCOL_DIR)/serial_mouse_mousesystems.c
- OPT_DEFS += -DSERIAL_MOUSE_ENABLE -DSERIAL_MOUSE_MOUSESYSTEMS \
- -DMOUSE_ENABLE
-endif
-
-ifeq ($(strip $(SERIAL_MOUSE_USE_SOFT)), yes)
- SRC += $(PROTOCOL_DIR)/serial_soft.c
-endif
-
-ifeq ($(strip $(SERIAL_MOUSE_USE_UART)), yes)
- SRC += $(PROTOCOL_DIR)/serial_uart.c
-endif
-
ifeq ($(strip $(USB_HID_ENABLE)), yes)
include $(TMK_DIR)/protocol/usb_hid.mk
endif
diff --git a/tmk_core/protocol/serial_mouse.h b/tmk_core/protocol/serial_mouse.h
deleted file mode 100644
index cb83cf4f62..0000000000
--- a/tmk_core/protocol/serial_mouse.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-Copyright 2014 Robin Haberkorn <robin.haberkorn@googlemail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <stdint.h>
-
-#include "serial.h"
-
-static inline uint8_t serial_mouse_init(void) {
- serial_init();
- return 0;
-}
-
-void serial_mouse_task(void);
diff --git a/tmk_core/protocol/serial_mouse_microsoft.c b/tmk_core/protocol/serial_mouse_microsoft.c
deleted file mode 100644
index eff0bf6e45..0000000000
--- a/tmk_core/protocol/serial_mouse_microsoft.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-Copyright 2014 Robin Haberkorn <robin.haberkorn@googlemail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <stdint.h>
-#include <avr/io.h>
-#include <util/delay.h>
-
-#include "serial.h"
-#include "serial_mouse.h"
-#include "report.h"
-#include "host.h"
-#include "timer.h"
-#include "print.h"
-#include "debug.h"
-
-#ifdef MAX
-# undef MAX
-#endif
-#define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
-
-static void print_usb_data(const report_mouse_t *report);
-
-void serial_mouse_task(void) {
- /* 3 byte ring buffer */
- static uint8_t buffer[3];
- static int buffer_cur = 0;
-
- static report_mouse_t report = {};
-
- int16_t rcv;
-
- rcv = serial_recv2();
- if (rcv < 0) /* no new data */
- return;
-
- if (debug_mouse) xprintf("serial_mouse: byte: %04X\n", rcv);
-
- /*
- * If bit 6 is one, this signals the beginning
- * of a 3 byte sequence/packet.
- */
- if (rcv & (1 << 6)) buffer_cur = 0;
-
- buffer[buffer_cur] = (uint8_t)rcv;
-
- if (buffer_cur == 0 && buffer[buffer_cur] == 0x20) {
- /*
- * Logitech extension: This must be a follow-up on
- * the last 3-byte packet signaling a middle button click
- */
- report.buttons |= MOUSE_BTN3;
- report.x = report.y = 0;
-
- print_usb_data(&report);
- host_mouse_send(&report);
- return;
- }
-
- buffer_cur++;
-
- if (buffer_cur < 3) return;
- buffer_cur = 0;
-
- /*
- * parse 3 byte packet.
- * NOTE: We only get a complete packet
- * if the mouse moved or the button states
- * change.
- */
- report.buttons = 0;
- if (buffer[0] & (1 << 5)) report.buttons |= MOUSE_BTN1;
- if (buffer[0] & (1 << 4)) report.buttons |= MOUSE_BTN2;
-
- report.x = (buffer[0] << 6) | buffer[1];
- report.y = ((buffer[0] << 4) & 0xC0) | buffer[2];
-
- /* USB HID uses values from -127 to 127 only */
- report.x = MAX(report.x, -127);
- report.y = MAX(report.y, -127);
-
-#if 0
- if (!report.buttons && !report.x && !report.y) {
- /*
- * Microsoft extension: Middle mouse button pressed
- * FIXME: I don't know how exactly this extension works.
- */
- report.buttons |= MOUSE_BTN3;
- }
-#endif
-
- print_usb_data(&report);
- host_mouse_send(&report);
-}
-
-static void print_usb_data(const report_mouse_t *report) {
- if (!debug_mouse) return;
-
- xprintf("serial_mouse usb: [%02X|%d %d %d %d]\n", report->buttons, report->x, report->y, report->v, report->h);
-}
diff --git a/tmk_core/protocol/serial_mouse_mousesystems.c b/tmk_core/protocol/serial_mouse_mousesystems.c
deleted file mode 100644
index 0ec2b0399a..0000000000
--- a/tmk_core/protocol/serial_mouse_mousesystems.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-Copyright 2014 Robin Haberkorn <robin.haberkorn@googlemail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <stdint.h>
-#include <avr/io.h>
-#include <util/delay.h>
-
-#include "serial.h"
-#include "serial_mouse.h"
-#include "report.h"
-#include "host.h"
-#include "timer.h"
-#include "print.h"
-#include "debug.h"
-
-#ifdef MAX
-# undef MAX
-#endif
-#define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
-
-//#define SERIAL_MOUSE_CENTER_SCROLL
-
-static void print_usb_data(const report_mouse_t *report);
-
-void serial_mouse_task(void) {
- /* 5 byte ring buffer */
- static uint8_t buffer[5];
- static int buffer_cur = 0;
-
- int16_t rcv;
-
- report_mouse_t report = {0, 0, 0, 0, 0};
-
- rcv = serial_recv2();
- if (rcv < 0) /* no new data */
- return;
-
- if (debug_mouse) xprintf("serial_mouse: byte: %04X\n", rcv);
-
- /*
- * Synchronization: mouse(4) says that all
- * bytes but the first one in the packet have
- * bit 7 == 0, but this is untrue.
- * Therefore we discard all bytes up to the
- * first one with the characteristic bit pattern.
- */
- if (buffer_cur == 0 && (rcv >> 3) != 0x10) return;
-
- buffer[buffer_cur++] = (uint8_t)rcv;
-
- if (buffer_cur < 5) return;
- buffer_cur = 0;
-
-#ifdef SERIAL_MOUSE_CENTER_SCROLL
- if ((buffer[0] & 0x7) == 0x5 && (buffer[1] || buffer[2])) {
- /* USB HID uses only values from -127 to 127 */
- report.h = MAX((int8_t)buffer[1], -127);
- report.v = MAX((int8_t)buffer[2], -127);
-
- print_usb_data(&report);
- host_mouse_send(&report);
-
- if (buffer[3] || buffer[4]) {
- report.h = MAX((int8_t)buffer[3], -127);
- report.v = MAX((int8_t)buffer[4], -127);
-
- print_usb_data(&report);
- host_mouse_send(&report);
- }
-
- return;
- }
-#endif
-
- /*
- * parse 5 byte packet.
- * NOTE: We only get a complete packet
- * if the mouse moved or the button states
- * change.
- */
- if (!(buffer[0] & (1 << 2))) report.buttons |= MOUSE_BTN1;
- if (!(buffer[0] & (1 << 1))) report.buttons |= MOUSE_BTN3;
- if (!(buffer[0] & (1 << 0))) report.buttons |= MOUSE_BTN2;
-
- /* USB HID uses only values from -127 to 127 */
- report.x = MAX((int8_t)buffer[1], -127);
- report.y = MAX(-(int8_t)buffer[2], -127);
-
- print_usb_data(&report);
- host_mouse_send(&report);
-
- if (buffer[3] || buffer[4]) {
- report.x = MAX((int8_t)buffer[3], -127);
- report.y = MAX(-(int8_t)buffer[4], -127);
-
- print_usb_data(&report);
- host_mouse_send(&report);
- }
-}
-
-static void print_usb_data(const report_mouse_t *report) {
- if (!debug_mouse) return;
-
- xprintf("serial_mouse usb: [%02X|%d %d %d %d]\n", report->buttons, report->x, report->y, report->v, report->h);
-}