drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Revert "Fix conflicting types for 'tfp_printf' (#8269)"

Browse source 
This reverts commit e17b55e33a.
This commit is contained in:
skullY 2020-05-04 09:25:44 -07:00
parent 1ff526dac0
commit 6f30b402a2
10 changed files with 357 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tmk_core/common.mk
View file

@ -1,5 +1,3 @@
PRINTF_PATH = $(LIB_PATH)/printf
COMMON_DIR = common
PLATFORM_COMMON_DIR = $(COMMON_DIR)/$(PLATFORM_KEY)
@ -23,12 +21,7 @@ TMK_COMMON_SRC += $(COMMON_DIR)/host.c \
ifeq ($(PLATFORM),AVR)
TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/xprintf.S
else ifeq ($(PLATFORM),CHIBIOS)
TMK_COMMON_SRC += $(PRINTF_PATH)/printf.c
TMK_COMMON_DEFS += -DPRINTF_DISABLE_SUPPORT_FLOAT
TMK_COMMON_DEFS += -DPRINTF_DISABLE_SUPPORT_EXPONENTIAL
TMK_COMMON_DEFS += -DPRINTF_DISABLE_SUPPORT_LONG_LONG
TMK_COMMON_DEFS += -DPRINTF_DISABLE_SUPPORT_PTRDIFF_T
VPATH += $(PRINTF_PATH)
TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c
else ifeq ($(PLATFORM),ARM_ATSAM)
TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c
endif