summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@drashna.net>2023-04-12 21:43:27 -0700
committerGitHub <noreply@github.com>2023-04-12 21:43:27 -0700
commitcf5626e0246b66879b03a18115a19a566e839f48 (patch)
tree22a611c7d65ca066075bbf34b1785523e97d0f8b
parent572f86349ec50d5187d8448f8eb1cf73fa670f5a (diff)
[Bug] Fix compilation issues with PS/2 driver on F4x1 controllers (#20433)
-rw-r--r--builddefs/common_features.mk2
-rw-r--r--drivers/ps2/ps2_interrupt.c1
-rw-r--r--platforms/chibios/drivers/ps2/ps2_io.c1
3 files changed, 3 insertions, 1 deletions
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 6a22c28b05..dc64ed2394 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -809,9 +809,9 @@ endif
809 809
810ifeq ($(strip $(PS2_MOUSE_ENABLE)), yes) 810ifeq ($(strip $(PS2_MOUSE_ENABLE)), yes)
811 PS2_ENABLE := yes 811 PS2_ENABLE := yes
812 MOUSE_ENABLE := yes
812 SRC += ps2_mouse.c 813 SRC += ps2_mouse.c
813 OPT_DEFS += -DPS2_MOUSE_ENABLE 814 OPT_DEFS += -DPS2_MOUSE_ENABLE
814 OPT_DEFS += -DMOUSE_ENABLE
815endif 815endif
816 816
817VALID_PS2_DRIVER_TYPES := busywait interrupt usart vendor 817VALID_PS2_DRIVER_TYPES := busywait interrupt usart vendor
diff --git a/drivers/ps2/ps2_interrupt.c b/drivers/ps2/ps2_interrupt.c
index 2810a0f126..f7400564ef 100644
--- a/drivers/ps2/ps2_interrupt.c
+++ b/drivers/ps2/ps2_interrupt.c
@@ -47,6 +47,7 @@ POSSIBILITY OF SUCH DAMAGE.
47// chibiOS headers 47// chibiOS headers
48# include "ch.h" 48# include "ch.h"
49# include "hal.h" 49# include "hal.h"
50# include "gpio.h"
50#endif 51#endif
51 52
52#include "ps2.h" 53#include "ps2.h"
diff --git a/platforms/chibios/drivers/ps2/ps2_io.c b/platforms/chibios/drivers/ps2/ps2_io.c
index 906d85d848..9eb56d63da 100644
--- a/platforms/chibios/drivers/ps2/ps2_io.c
+++ b/platforms/chibios/drivers/ps2/ps2_io.c
@@ -4,6 +4,7 @@
4// chibiOS headers 4// chibiOS headers
5#include "ch.h" 5#include "ch.h"
6#include "hal.h" 6#include "hal.h"
7#include "gpio.h"
7 8
8/* Check port settings for clock and data line */ 9/* Check port settings for clock and data line */
9#if !(defined(PS2_CLOCK_PIN)) 10#if !(defined(PS2_CLOCK_PIN))