diff options
author | Ryan <fauxpark@gmail.com> | 2021-06-03 16:26:41 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-03 16:26:41 +1000 |
commit | 261d94ce344e28a13bf01444e467cc7c68c27282 (patch) | |
tree | 2998ae78f02e4e55b3b448fa55b8f2f7b8c4a72e | |
parent | a0cc2dc6d0b4fafc9f7d70b98254e32d032c3f17 (diff) | |
download | qmk_firmware-261d94ce344e28a13bf01444e467cc7c68c27282.tar.gz qmk_firmware-261d94ce344e28a13bf01444e467cc7c68c27282.zip |
Tidy up spi_master includes (#13053)
-rw-r--r-- | drivers/avr/spi_master.c | 4 | ||||
-rw-r--r-- | drivers/avr/spi_master.h | 4 | ||||
-rw-r--r-- | drivers/chibios/spi_master.c | 2 | ||||
-rw-r--r-- | drivers/chibios/spi_master.h | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/drivers/avr/spi_master.c b/drivers/avr/spi_master.c index 19ca0ced4..4e8fd3bcd 100644 --- a/drivers/avr/spi_master.c +++ b/drivers/avr/spi_master.c | |||
@@ -14,10 +14,8 @@ | |||
14 | * along with this program. If not, see <https://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <https://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <avr/io.h> | ||
18 | |||
19 | #include "spi_master.h" | 17 | #include "spi_master.h" |
20 | #include "quantum.h" | 18 | |
21 | #include "timer.h" | 19 | #include "timer.h" |
22 | 20 | ||
23 | #if defined(__AVR_AT90USB162__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) | 21 | #if defined(__AVR_AT90USB162__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) |
diff --git a/drivers/avr/spi_master.h b/drivers/avr/spi_master.h index 9203698dd..8a30f47ae 100644 --- a/drivers/avr/spi_master.h +++ b/drivers/avr/spi_master.h | |||
@@ -16,7 +16,9 @@ | |||
16 | 16 | ||
17 | #pragma once | 17 | #pragma once |
18 | 18 | ||
19 | #include "quantum.h" | 19 | #include <stdbool.h> |
20 | |||
21 | #include "gpio.h" | ||
20 | 22 | ||
21 | typedef int16_t spi_status_t; | 23 | typedef int16_t spi_status_t; |
22 | 24 | ||
diff --git a/drivers/chibios/spi_master.c b/drivers/chibios/spi_master.c index 8341b59a5..4852a6eba 100644 --- a/drivers/chibios/spi_master.c +++ b/drivers/chibios/spi_master.c | |||
@@ -15,7 +15,7 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "spi_master.h" | 17 | #include "spi_master.h" |
18 | #include "quantum.h" | 18 | |
19 | #include "timer.h" | 19 | #include "timer.h" |
20 | 20 | ||
21 | static pin_t currentSlavePin = NO_PIN; | 21 | static pin_t currentSlavePin = NO_PIN; |
diff --git a/drivers/chibios/spi_master.h b/drivers/chibios/spi_master.h index 5953bef77..e93580e31 100644 --- a/drivers/chibios/spi_master.h +++ b/drivers/chibios/spi_master.h | |||
@@ -18,7 +18,9 @@ | |||
18 | 18 | ||
19 | #include <ch.h> | 19 | #include <ch.h> |
20 | #include <hal.h> | 20 | #include <hal.h> |
21 | #include "quantum.h" | 21 | #include <stdbool.h> |
22 | |||
23 | #include "gpio.h" | ||
22 | 24 | ||
23 | #ifndef SPI_DRIVER | 25 | #ifndef SPI_DRIVER |
24 | # define SPI_DRIVER SPID2 | 26 | # define SPI_DRIVER SPID2 |