Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bug] Fix compilation issues with PS/2 driver on F4x1 controllers #20433

Merged
merged 3 commits into from
Apr 13, 2023
Merged

[Bug] Fix compilation issues with PS/2 driver on F4x1 controllers #20433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69a63a7
[Bug] Fix compilation issues with PS/2 driver on F4x1 controllers
drashna Apr 12, 2023
2cd6df7
Also ensure that HID Mouse subsystem is enabled
drashna Apr 13, 2023
1edfa50
Change order in makefiles
drashna Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion builddefs/common_features.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,9 +809,9 @@ endif

ifeq ($(strip $(PS2_MOUSE_ENABLE)), yes)
PS2_ENABLE := yes
MOUSE_ENABLE := yes
SRC += ps2_mouse.c
OPT_DEFS += -DPS2_MOUSE_ENABLE
OPT_DEFS += -DMOUSE_ENABLE
endif

VALID_PS2_DRIVER_TYPES := busywait interrupt usart vendor
Expand Down
1 change: 1 addition & 0 deletions drivers/ps2/ps2_interrupt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ POSSIBILITY OF SUCH DAMAGE.
// chibiOS headers
# include "ch.h"
# include "hal.h"
# include "gpio.h"
#endif

#include "ps2.h"
Expand Down
1 change: 1 addition & 0 deletions platforms/chibios/drivers/ps2/ps2_io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// chibiOS headers
#include "ch.h"
#include "hal.h"
#include "gpio.h"

/* Check port settings for clock and data line */
#if !(defined(PS2_CLOCK_PIN))
Expand Down