diff options
| author | Drashna Jaelre <drashna@live.com> | 2021-08-23 18:40:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-24 11:40:24 +1000 |
| commit | 6fd20acf4be76e7a2bd82d3dfd0a9bcca8c507eb (patch) | |
| tree | 8ce8291e910bce462c9b82fac312a9ed439f2be5 /tmk_core | |
| parent | d57d9aec4f1e00601e6664ef6c4cb0e3e7826fe2 (diff) | |
| download | qmk_firmware-6fd20acf4be76e7a2bd82d3dfd0a9bcca8c507eb.tar.gz qmk_firmware-6fd20acf4be76e7a2bd82d3dfd0a9bcca8c507eb.zip | |
Fix Mouse Shared EP functionality (#14136)
Specifically, if you enable the shared endpoint for mouse reports (or keyboard, which force enables it for mouse), and you don't have mousekeys enabled, it does not properly enable shared mouse EP for pointing device (which uses mouse reports). This cause it to error out in compiling. This fixes up some of the logic to ensure that all use cases are supported, and consolidates some of the code.
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 69d27e6c0..7f7420059 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk | |||
| @@ -25,7 +25,8 @@ ifeq ($(strip $(KEYBOARD_SHARED_EP)), yes) | |||
| 25 | MOUSE_SHARED_EP = yes | 25 | MOUSE_SHARED_EP = yes |
| 26 | endif | 26 | endif |
| 27 | 27 | ||
| 28 | ifeq ($(strip $(MOUSEKEY_ENABLE)), yes) | 28 | ifeq ($(strip $(MOUSE_ENABLE)), yes) |
| 29 | OPT_DEFS += -DMOUSE_ENABLE | ||
| 29 | ifeq ($(strip $(MOUSE_SHARED_EP)), yes) | 30 | ifeq ($(strip $(MOUSE_SHARED_EP)), yes) |
| 30 | TMK_COMMON_DEFS += -DMOUSE_SHARED_EP | 31 | TMK_COMMON_DEFS += -DMOUSE_SHARED_EP |
| 31 | SHARED_EP_ENABLE = yes | 32 | SHARED_EP_ENABLE = yes |