From 8d5fa95f4fa9b283daff1e1f7bd7003e2970e223 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 11 Dec 2020 13:45:24 +1100 Subject: Normalise include statements in core code (#11153) * Normalise include statements in core code * Missed one --- tmk_core/protocol/chibios/main.c | 4 ++-- tmk_core/protocol/chibios/usb_driver.c | 2 +- tmk_core/protocol/chibios/usb_driver.h | 2 +- tmk_core/protocol/chibios/usb_main.c | 4 ++-- tmk_core/protocol/chibios/usb_main.h | 4 ++-- tmk_core/protocol/lufa/lufa.c | 2 +- tmk_core/protocol/midi/bytequeue/interrupt_setting.c | 2 +- tmk_core/protocol/usb_descriptor.h | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) (limited to 'tmk_core/protocol') diff --git a/tmk_core/protocol/chibios/main.c b/tmk_core/protocol/chibios/main.c index ea8279d7c3..aaadefd8d2 100644 --- a/tmk_core/protocol/chibios/main.c +++ b/tmk_core/protocol/chibios/main.c @@ -15,8 +15,8 @@ * GPL v2 or later. */ -#include "ch.h" -#include "hal.h" +#include +#include #include "usb_main.h" diff --git a/tmk_core/protocol/chibios/usb_driver.c b/tmk_core/protocol/chibios/usb_driver.c index 22d3c91f5a..cc0ce7600f 100644 --- a/tmk_core/protocol/chibios/usb_driver.c +++ b/tmk_core/protocol/chibios/usb_driver.c @@ -22,7 +22,7 @@ * @{ */ -#include "hal.h" +#include #include "usb_driver.h" #include diff --git a/tmk_core/protocol/chibios/usb_driver.h b/tmk_core/protocol/chibios/usb_driver.h index 77dff80669..6d71bcec4f 100644 --- a/tmk_core/protocol/chibios/usb_driver.h +++ b/tmk_core/protocol/chibios/usb_driver.h @@ -25,7 +25,7 @@ #ifndef USB_DRIVER_H # define USB_DRIVER_H -# include "hal_usb_cdc.h" +# include /*===========================================================================*/ /* Driver constants. */ diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c index 2ecaaf65dc..6456f26b5b 100644 --- a/tmk_core/protocol/chibios/usb_main.c +++ b/tmk_core/protocol/chibios/usb_main.c @@ -25,8 +25,8 @@ * makes the assumption this is safe to avoid littering with preprocessor directives. */ -#include "ch.h" -#include "hal.h" +#include +#include #include "usb_main.h" diff --git a/tmk_core/protocol/chibios/usb_main.h b/tmk_core/protocol/chibios/usb_main.h index d8813f4801..1381d07654 100644 --- a/tmk_core/protocol/chibios/usb_main.h +++ b/tmk_core/protocol/chibios/usb_main.h @@ -21,8 +21,8 @@ // TESTING // extern uint8_t blinkLed; -#include "ch.h" -#include "hal.h" +#include +#include /* ------------------------- * General USB driver header diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index 568d1dd501..ce31e54990 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c @@ -61,7 +61,7 @@ extern keymap_config_t keymap_config; #endif #ifdef AUDIO_ENABLE -# include +# include "audio.h" #endif #ifdef BLUETOOTH_ENABLE diff --git a/tmk_core/protocol/midi/bytequeue/interrupt_setting.c b/tmk_core/protocol/midi/bytequeue/interrupt_setting.c index 1be1fee973..407cc65f49 100644 --- a/tmk_core/protocol/midi/bytequeue/interrupt_setting.c +++ b/tmk_core/protocol/midi/bytequeue/interrupt_setting.c @@ -32,7 +32,7 @@ interrupt_setting_t store_and_clear_interrupt(void) { void restore_interrupt_setting(interrupt_setting_t setting) { SREG = setting; } #elif defined(__arm__) -# include "ch.h" +# include interrupt_setting_t store_and_clear_interrupt(void) { chSysLock(); diff --git a/tmk_core/protocol/usb_descriptor.h b/tmk_core/protocol/usb_descriptor.h index ac897720f5..109db61b65 100644 --- a/tmk_core/protocol/usb_descriptor.h +++ b/tmk_core/protocol/usb_descriptor.h @@ -46,7 +46,7 @@ #include #ifdef PROTOCOL_CHIBIOS -# include "hal.h" +# include #endif #ifdef WEBUSB_ENABLE #include "webusb_descriptor.h" -- cgit v1.2.3