forked from mirrors/qmk_userspace
		
	Relocate PS2 code (#14895)
* Relocate ps2 protocol code * clang * Move makefile logic
This commit is contained in:
		
					parent
					
						
							
								5500c428dd
							
						
					
				
			
			
				commit
				
					
						d4be4b67a2
					
				
			
		
					 11 changed files with 38 additions and 32 deletions
				
			
		| 
						 | 
				
			
			@ -576,6 +576,40 @@ ifeq ($(strip $(AUTO_SHIFT_ENABLE)), yes)
 | 
			
		|||
    endif
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
ifeq ($(strip $(PS2_MOUSE_ENABLE)), yes)
 | 
			
		||||
    PS2_ENABLE := yes
 | 
			
		||||
    SRC += ps2_mouse.c
 | 
			
		||||
    OPT_DEFS += -DPS2_MOUSE_ENABLE
 | 
			
		||||
    OPT_DEFS += -DMOUSE_ENABLE
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
ifeq ($(strip $(PS2_USE_BUSYWAIT)), yes)
 | 
			
		||||
    PS2_ENABLE := yes
 | 
			
		||||
    SRC += ps2_busywait.c
 | 
			
		||||
    SRC += ps2_io_avr.c
 | 
			
		||||
    OPT_DEFS += -DPS2_USE_BUSYWAIT
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
ifeq ($(strip $(PS2_USE_INT)), yes)
 | 
			
		||||
    PS2_ENABLE := yes
 | 
			
		||||
    SRC += ps2_interrupt.c
 | 
			
		||||
    SRC += ps2_io.c
 | 
			
		||||
    OPT_DEFS += -DPS2_USE_INT
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
ifeq ($(strip $(PS2_USE_USART)), yes)
 | 
			
		||||
    PS2_ENABLE := yes
 | 
			
		||||
    SRC += ps2_usart.c
 | 
			
		||||
    SRC += ps2_io.c
 | 
			
		||||
    OPT_DEFS += -DPS2_USE_USART
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
ifeq ($(strip $(PS2_ENABLE)), yes)
 | 
			
		||||
    COMMON_VPATH += $(DRIVER_PATH)/ps2
 | 
			
		||||
    COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/ps2
 | 
			
		||||
    OPT_DEFS += -DPS2_ENABLE
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
JOYSTICK_ENABLE ?= no
 | 
			
		||||
VALID_JOYSTICK_TYPES := analog digital
 | 
			
		||||
JOYSTICK_DRIVER ?= analog
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -16,13 +16,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
*/
 | 
			
		||||
 | 
			
		||||
#include <stdbool.h>
 | 
			
		||||
 | 
			
		||||
#if defined(__AVR__)
 | 
			
		||||
#    include <avr/io.h>
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#include "ps2_mouse.h"
 | 
			
		||||
#include "wait.h"
 | 
			
		||||
#include "gpio.h"
 | 
			
		||||
#include "host.h"
 | 
			
		||||
#include "timer.h"
 | 
			
		||||
#include "print.h"
 | 
			
		||||
| 
						 | 
				
			
			@ -42,6 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 | 
			
		|||
#include <stdbool.h>
 | 
			
		||||
#include <avr/interrupt.h>
 | 
			
		||||
#include <util/delay.h>
 | 
			
		||||
#include "gpio.h"
 | 
			
		||||
#include "ps2.h"
 | 
			
		||||
#include "ps2_io.h"
 | 
			
		||||
#include "print.h"
 | 
			
		||||
| 
						 | 
				
			
			@ -1,30 +1,5 @@
 | 
			
		|||
PROTOCOL_DIR = protocol
 | 
			
		||||
 | 
			
		||||
ifeq ($(strip $(PS2_MOUSE_ENABLE)), yes)
 | 
			
		||||
    SRC += $(PROTOCOL_DIR)/ps2_mouse.c
 | 
			
		||||
    OPT_DEFS += -DPS2_MOUSE_ENABLE
 | 
			
		||||
    OPT_DEFS += -DMOUSE_ENABLE
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
ifeq ($(strip $(PS2_USE_BUSYWAIT)), yes)
 | 
			
		||||
    SRC += protocol/ps2_busywait.c
 | 
			
		||||
    SRC += protocol/ps2_io_avr.c
 | 
			
		||||
    OPT_DEFS += -DPS2_USE_BUSYWAIT
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
ifeq ($(strip $(PS2_USE_INT)), yes)
 | 
			
		||||
    SRC += protocol/ps2_interrupt.c
 | 
			
		||||
    SRC += protocol/ps2_io_$(PLATFORM_KEY).c
 | 
			
		||||
    OPT_DEFS += -DPS2_USE_INT
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
ifeq ($(strip $(PS2_USE_USART)), yes)
 | 
			
		||||
    SRC += protocol/ps2_usart.c
 | 
			
		||||
    SRC += protocol/ps2_io_$(PLATFORM_KEY).c
 | 
			
		||||
    OPT_DEFS += -DPS2_USE_USART
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
ifeq ($(strip $(SERIAL_MOUSE_MICROSOFT_ENABLE)), yes)
 | 
			
		||||
    SRC += $(PROTOCOL_DIR)/serial_mouse_microsoft.c
 | 
			
		||||
    OPT_DEFS += -DSERIAL_MOUSE_ENABLE -DSERIAL_MOUSE_MICROSOFT \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue