aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/protocol/chibios
diff options
context:
space:
mode:
authorskullY <skullydazed@gmail.com>2020-05-04 09:25:44 -0700
committerskullY <skullydazed@gmail.com>2020-05-04 09:25:44 -0700
commit6f30b402a285ddecce9b6f5b002a649f775225d2 (patch)
tree5a25c7334d931a56d9fbfad80b6284cda7e38950 /tmk_core/protocol/chibios
parent1ff526dac0e73ea8cce522d0106631e3a748802c (diff)
downloadqmk_firmware-6f30b402a285ddecce9b6f5b002a649f775225d2.tar.gz
qmk_firmware-6f30b402a285ddecce9b6f5b002a649f775225d2.zip
Revert "Fix conflicting types for 'tfp_printf' (#8269)"
This reverts commit e17b55e33ad5b3dcefcf7b828ac99aeb2daeeae2.
Diffstat (limited to 'tmk_core/protocol/chibios')
-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, 9 insertions, 1 deletions
diff --git a/tmk_core/protocol/chibios/main.c b/tmk_core/protocol/chibios/main.c
index 7d32c16ed..61665eb6f 100644
--- a/tmk_core/protocol/chibios/main.c
+++ b/tmk_core/protocol/chibios/main.c
@@ -158,6 +158,9 @@ 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
161#ifdef MIDI_ENABLE 164#ifdef MIDI_ENABLE
162 setup_midi(); 165 setup_midi();
163#endif 166#endif
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 66985b9de..ecc83d9ec 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -796,7 +796,10 @@ int8_t sendchar(uint8_t c) {
796} 796}
797#endif /* CONSOLE_ENABLE */ 797#endif /* CONSOLE_ENABLE */
798 798
799void _putchar(char character) { sendchar(character); } 799void sendchar_pf(void *p, char c) {
800 (void)p;
801 sendchar((uint8_t)c);
802}
800 803
801#ifdef RAW_ENABLE 804#ifdef RAW_ENABLE
802void raw_hid_send(uint8_t *data, uint8_t length) { 805void raw_hid_send(uint8_t *data, uint8_t length) {
diff --git a/tmk_core/protocol/chibios/usb_main.h b/tmk_core/protocol/chibios/usb_main.h
index 94baf9b35..17041b4f2 100644
--- a/tmk_core/protocol/chibios/usb_main.h
+++ b/tmk_core/protocol/chibios/usb_main.h
@@ -87,4 +87,6 @@ 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
90#endif /* _USB_MAIN_H_ */ 92#endif /* _USB_MAIN_H_ */