aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/protocol
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2020-05-04 07:19:51 +0100
committerGitHub <noreply@github.com>2020-05-03 23:19:51 -0700
commite17b55e33ad5b3dcefcf7b828ac99aeb2daeeae2 (patch)
treee6430a88e4ce4e73783f2a2f4fd4939885b1e402 /tmk_core/protocol
parentf31bf1b2025ece2d61cec10293cbd4e18b537eeb (diff)
downloadqmk_firmware-e17b55e33ad5b3dcefcf7b828ac99aeb2daeeae2.tar.gz
qmk_firmware-e17b55e33ad5b3dcefcf7b828ac99aeb2daeeae2.zip
Fix conflicting types for 'tfp_printf' (#8269)
* Refactor to use mpaland/printf * trim firmware size * remove keymap changes * run clang format * Fixup after rebase * fix up git-submodule command for printf
Diffstat (limited to 'tmk_core/protocol')
-rw-r--r--tmk_core/protocol/chibios/main.c3
-rw-r--r--tmk_core/protocol/chibios/usb_main.c5
-rw-r--r--tmk_core/protocol/chibios/usb_main.h2
3 files changed, 2 insertions, 8 deletions
diff --git a/tmk_core/protocol/chibios/main.c b/tmk_core/protocol/chibios/main.c
index 61665eb6f..7d32c16ed 100644
--- a/tmk_core/protocol/chibios/main.c
+++ b/tmk_core/protocol/chibios/main.c
@@ -158,9 +158,6 @@ int main(void) {
158 /* Init USB */ 158 /* Init USB */
159 init_usb_driver(&USB_DRIVER); 159 init_usb_driver(&USB_DRIVER);
160 160
161 /* init printf */
162 init_printf(NULL, sendchar_pf);
163
164#ifdef MIDI_ENABLE 161#ifdef MIDI_ENABLE
165 setup_midi(); 162 setup_midi();
166#endif 163#endif
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index ecc83d9ec..65bd291be 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -796,9 +796,8 @@ int8_t sendchar(uint8_t c) {
796} 796}
797#endif /* CONSOLE_ENABLE */ 797#endif /* CONSOLE_ENABLE */
798 798
799void sendchar_pf(void *p, char c) { 799void _putchar(char character) {
800 (void)p; 800 sendchar(character);
801 sendchar((uint8_t)c);
802} 801}
803 802
804#ifdef RAW_ENABLE 803#ifdef RAW_ENABLE
diff --git a/tmk_core/protocol/chibios/usb_main.h b/tmk_core/protocol/chibios/usb_main.h
index 17041b4f2..94baf9b35 100644
--- a/tmk_core/protocol/chibios/usb_main.h
+++ b/tmk_core/protocol/chibios/usb_main.h
@@ -87,6 +87,4 @@ void console_flush_output(void);
87 87
88#endif /* CONSOLE_ENABLE */ 88#endif /* CONSOLE_ENABLE */
89 89
90void sendchar_pf(void *p, char c);
91
92#endif /* _USB_MAIN_H_ */ 90#endif /* _USB_MAIN_H_ */