diff options
author | Joel Challis <git@zvecr.com> | 2021-02-14 01:44:22 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-14 01:44:22 +0000 |
commit | 1f2fe2eab99548f4bde2a79b03e3303cc9b73214 (patch) | |
tree | 22c7b61acf16ce3e25b5c35ce56cc2bb6ebec290 /tmk_core/common.mk | |
parent | 72e515547aedbfd0b91296a51a81861236be8fe5 (diff) | |
download | qmk_firmware-1f2fe2eab99548f4bde2a79b03e3303cc9b73214.tar.gz qmk_firmware-1f2fe2eab99548f4bde2a79b03e3303cc9b73214.zip |
Refactor platform logic within print.h (#11863)
* Remove GCC check from debug
* Remove platform logic from common.mk
* Refactor platform logic within print.h
* restore debug.c format
* headers
* Rename function pointer type
* review comments
* Update tmk_core/common/printf.c
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Format
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'tmk_core/common.mk')
-rw-r--r-- | tmk_core/common.mk | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 3cf3edde3..238b3c69f 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk | |||
@@ -1,5 +1,3 @@ | |||
1 | PRINTF_PATH = $(LIB_PATH)/printf | ||
2 | |||
3 | COMMON_DIR = common | 1 | COMMON_DIR = common |
4 | PLATFORM_COMMON_DIR = $(COMMON_DIR)/$(PLATFORM_KEY) | 2 | PLATFORM_COMMON_DIR = $(COMMON_DIR)/$(PLATFORM_KEY) |
5 | 3 | ||
@@ -10,7 +8,6 @@ TMK_COMMON_SRC += $(COMMON_DIR)/host.c \ | |||
10 | $(COMMON_DIR)/action_macro.c \ | 8 | $(COMMON_DIR)/action_macro.c \ |
11 | $(COMMON_DIR)/action_layer.c \ | 9 | $(COMMON_DIR)/action_layer.c \ |
12 | $(COMMON_DIR)/action_util.c \ | 10 | $(COMMON_DIR)/action_util.c \ |
13 | $(COMMON_DIR)/print.c \ | ||
14 | $(COMMON_DIR)/debug.c \ | 11 | $(COMMON_DIR)/debug.c \ |
15 | $(COMMON_DIR)/sendchar_null.c \ | 12 | $(COMMON_DIR)/sendchar_null.c \ |
16 | $(COMMON_DIR)/eeconfig.c \ | 13 | $(COMMON_DIR)/eeconfig.c \ |
@@ -20,17 +17,11 @@ TMK_COMMON_SRC += $(COMMON_DIR)/host.c \ | |||
20 | $(COMMON_DIR)/sync_timer.c \ | 17 | $(COMMON_DIR)/sync_timer.c \ |
21 | $(PLATFORM_COMMON_DIR)/bootloader.c \ | 18 | $(PLATFORM_COMMON_DIR)/bootloader.c \ |
22 | 19 | ||
23 | ifeq ($(PLATFORM),AVR) | 20 | # Use platform provided print - fall back to lib/printf |
24 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/xprintf.S | 21 | ifneq ("$(wildcard $(TMK_PATH)/$(PLATFORM_COMMON_DIR)/printf.mk)","") |
25 | else ifeq ($(PLATFORM),CHIBIOS) | 22 | include $(TMK_PATH)/$(PLATFORM_COMMON_DIR)/printf.mk |
26 | TMK_COMMON_SRC += $(PRINTF_PATH)/printf.c | 23 | else |
27 | TMK_COMMON_DEFS += -DPRINTF_DISABLE_SUPPORT_FLOAT | 24 | include $(TMK_PATH)/$(COMMON_DIR)/lib_printf.mk |
28 | TMK_COMMON_DEFS += -DPRINTF_DISABLE_SUPPORT_EXPONENTIAL | ||
29 | TMK_COMMON_DEFS += -DPRINTF_DISABLE_SUPPORT_LONG_LONG | ||
30 | TMK_COMMON_DEFS += -DPRINTF_DISABLE_SUPPORT_PTRDIFF_T | ||
31 | VPATH += $(PRINTF_PATH) | ||
32 | else ifeq ($(PLATFORM),ARM_ATSAM) | ||
33 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c | ||
34 | endif | 25 | endif |
35 | 26 | ||
36 | # Option modules | 27 | # Option modules |