Browse Source

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.
Drashna Jaelre 5 years ago
parent
commit
6fd20acf4b
2 changed files with 4 additions and 3 deletions
  1. 2 2
      common_features.mk
  2. 2 1
      tmk_core/common.mk

+ 2 - 2
common_features.mk

@@ -117,13 +117,13 @@ endif
 
 
 ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)
 ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)
     OPT_DEFS += -DMOUSEKEY_ENABLE
     OPT_DEFS += -DMOUSEKEY_ENABLE
-    OPT_DEFS += -DMOUSE_ENABLE
+    MOUSE_ENABLE := yes
     SRC += $(QUANTUM_DIR)/mousekey.c
     SRC += $(QUANTUM_DIR)/mousekey.c
 endif
 endif
 
 
 ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
 ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
     OPT_DEFS += -DPOINTING_DEVICE_ENABLE
     OPT_DEFS += -DPOINTING_DEVICE_ENABLE
-    OPT_DEFS += -DMOUSE_ENABLE
+    MOUSE_ENABLE := yes
     SRC += $(QUANTUM_DIR)/pointing_device.c
     SRC += $(QUANTUM_DIR)/pointing_device.c
 endif
 endif
 
 

+ 2 - 1
tmk_core/common.mk

@@ -25,7 +25,8 @@ ifeq ($(strip $(KEYBOARD_SHARED_EP)), yes)
     MOUSE_SHARED_EP = yes
     MOUSE_SHARED_EP = yes
 endif
 endif
 
 
-ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)
+ifeq ($(strip $(MOUSE_ENABLE)), yes)
+    OPT_DEFS += -DMOUSE_ENABLE
     ifeq ($(strip $(MOUSE_SHARED_EP)), yes)
     ifeq ($(strip $(MOUSE_SHARED_EP)), yes)
         TMK_COMMON_DEFS += -DMOUSE_SHARED_EP
         TMK_COMMON_DEFS += -DMOUSE_SHARED_EP
         SHARED_EP_ENABLE = yes
         SHARED_EP_ENABLE = yes