From 8b317f9dd907a7b434eb1a54c189e54670e107c0 Mon Sep 17 00:00:00 2001 From: jflyper Date: Tue, 11 Jul 2017 18:27:35 +0900 Subject: [PATCH] Remove stale USE_SDCARD_SPIx declarations --- src/main/target/BEEROTORF4/target.h | 1 - src/main/target/BETAFLIGHTF3/target.h | 4 ++-- src/main/target/CHEBUZZF3/target.h | 1 - src/main/target/CLRACINGF4/target.h | 1 - src/main/target/FRSKYF3/target.h | 2 -- src/main/target/FRSKYF4/target.h | 4 +--- src/main/target/FURYF3/target.h | 1 - src/main/target/LUX_RACE/target.h | 3 +-- src/main/target/OMNIBUS/target.h | 3 +-- src/main/target/OMNIBUSF4/target.h | 1 - src/main/target/REVO/target.h | 2 -- src/main/target/RG_SSD_F3/target.h | 3 +-- src/main/target/SIRINFPV/target.h | 1 - src/main/target/SPRACINGF3EVO/target.h | 3 +-- src/main/target/SPRACINGF3MINI/target.h | 3 +-- src/main/target/SPRACINGF3NEO/target.h | 3 +-- src/main/target/SPRACINGF4EVO/target.h | 3 +-- src/main/target/SPRACINGF4NEO/target.h | 3 +-- src/main/target/STM32F3DISCOVERY/target.h | 1 - 19 files changed, 11 insertions(+), 32 deletions(-) diff --git a/src/main/target/BEEROTORF4/target.h b/src/main/target/BEEROTORF4/target.h index 17a4e98ed7..de4656d396 100644 --- a/src/main/target/BEEROTORF4/target.h +++ b/src/main/target/BEEROTORF4/target.h @@ -56,7 +56,6 @@ #define MAX7456_DMA_IRQ_HANDLER_ID DMA1_ST0_HANDLER #define USE_SDCARD -#define USE_SDCARD_SPI2 #define SDCARD_DETECT_PIN PC3 #define SDCARD_DETECT_INVERTED diff --git a/src/main/target/BETAFLIGHTF3/target.h b/src/main/target/BETAFLIGHTF3/target.h index 71deeba8b5..2820c5f82f 100644 --- a/src/main/target/BETAFLIGHTF3/target.h +++ b/src/main/target/BETAFLIGHTF3/target.h @@ -96,10 +96,10 @@ #define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define USE_SDCARD -#define USE_SDCARD_SPI2 -#define SDCARD_DETECT_INVERTED +#define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PC14 + #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN diff --git a/src/main/target/CHEBUZZF3/target.h b/src/main/target/CHEBUZZF3/target.h index c2af417258..00726521b8 100644 --- a/src/main/target/CHEBUZZF3/target.h +++ b/src/main/target/CHEBUZZF3/target.h @@ -42,7 +42,6 @@ #define SPI2_MOSI_PIN PB15 #define USE_SDCARD -#define USE_SDCARD_SPI2 #define SDCARD_DETECT_PIN PC14 #define SDCARD_SPI_INSTANCE SPI2 diff --git a/src/main/target/CLRACINGF4/target.h b/src/main/target/CLRACINGF4/target.h index 8f637440bf..5a7599b49e 100644 --- a/src/main/target/CLRACINGF4/target.h +++ b/src/main/target/CLRACINGF4/target.h @@ -57,7 +57,6 @@ #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT #define USE_SDCARD -#define USE_SDCARD_SPI2 #define SDCARD_DETECT_PIN PB7 #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN diff --git a/src/main/target/FRSKYF3/target.h b/src/main/target/FRSKYF3/target.h index f636da9af5..7c6e3001fe 100644 --- a/src/main/target/FRSKYF3/target.h +++ b/src/main/target/FRSKYF3/target.h @@ -102,10 +102,8 @@ #define SPI1_MOSI_PIN PA7 #define USE_SDCARD -#define USE_SDCARD_SPI1 #define SDCARD_DETECT_INVERTED - #define SDCARD_DETECT_PIN PB5 #define SDCARD_SPI_INSTANCE SPI1 #define SDCARD_SPI_CS_PIN SPI1_NSS_PIN diff --git a/src/main/target/FRSKYF4/target.h b/src/main/target/FRSKYF4/target.h index bbf5f94d54..44dd05173a 100644 --- a/src/main/target/FRSKYF4/target.h +++ b/src/main/target/FRSKYF4/target.h @@ -55,11 +55,9 @@ #define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT + #define USE_SDCARD -#define USE_SDCARD_SPI2 - #define SDCARD_DETECT_INVERTED - #define SDCARD_DETECT_PIN PB7 #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h index c208c286c4..4813fd936e 100644 --- a/src/main/target/FURYF3/target.h +++ b/src/main/target/FURYF3/target.h @@ -99,7 +99,6 @@ #else #define USE_SDCARD - #define USE_SDCARD_SPI2 #define SDCARD_DETECT_INVERTED diff --git a/src/main/target/LUX_RACE/target.h b/src/main/target/LUX_RACE/target.h index 02971c7b98..decba5c1dd 100644 --- a/src/main/target/LUX_RACE/target.h +++ b/src/main/target/LUX_RACE/target.h @@ -68,11 +68,10 @@ #define SPI2_MOSI_PIN PB15 #define USE_SDCARD -#define USE_SDCARD_SPI2 #define SDCARD_DETECT_INVERTED - #define SDCARD_DETECT_PIN PC13 + #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h index 2ce0593dec..172b5e2427 100644 --- a/src/main/target/OMNIBUS/target.h +++ b/src/main/target/OMNIBUS/target.h @@ -121,11 +121,10 @@ #define SPI2_MOSI_PIN PB15 #define USE_SDCARD -#define USE_SDCARD_SPI2 #define SDCARD_DETECT_INVERTED - #define SDCARD_DETECT_PIN PC14 + #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h index 87a604ac7d..a29aa5870b 100644 --- a/src/main/target/OMNIBUSF4/target.h +++ b/src/main/target/OMNIBUSF4/target.h @@ -92,7 +92,6 @@ #if defined(OMNIBUSF4SD) #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT #define USE_SDCARD -#define USE_SDCARD_SPI2 #define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PB7 #define SDCARD_SPI_INSTANCE SPI2 diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h index 5db3a250de..6950cbd1b1 100644 --- a/src/main/target/REVO/target.h +++ b/src/main/target/REVO/target.h @@ -149,8 +149,6 @@ // SDCARD support for AIRBOTF4SD #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT #define USE_SDCARD -#define USE_SDCARD_SPI3 - #define SDCARD_DETECT_INVERTED #define SDCARD_DETECT_PIN PC0 #define SDCARD_SPI_INSTANCE SPI3 diff --git a/src/main/target/RG_SSD_F3/target.h b/src/main/target/RG_SSD_F3/target.h index 62b2830b13..60a6b1567b 100644 --- a/src/main/target/RG_SSD_F3/target.h +++ b/src/main/target/RG_SSD_F3/target.h @@ -59,11 +59,10 @@ #define ENSURE_MPU_DATA_READY_IS_LOW #define USE_SDCARD -#define USE_SDCARD_SPI1 #define SDCARD_DETECT_INVERTED - #define SDCARD_DETECT_PIN PC14 + #define SDCARD_SPI_INSTANCE SPI1 #define SDCARD_SPI_CS_GPIO GPIOB #define SDCARD_SPI_CS_PIN SPI1_NSS_PIN diff --git a/src/main/target/SIRINFPV/target.h b/src/main/target/SIRINFPV/target.h index 9e2fc543d5..5bb5fc6b9c 100644 --- a/src/main/target/SIRINFPV/target.h +++ b/src/main/target/SIRINFPV/target.h @@ -116,7 +116,6 @@ #define RTC6705_SPICLK_PIN PC13 #define USE_SDCARD -#define USE_SDCARD_SPI2 #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_GPIO SPI2_GPIO diff --git a/src/main/target/SPRACINGF3EVO/target.h b/src/main/target/SPRACINGF3EVO/target.h index 5c11f6406e..c9cc40e01d 100644 --- a/src/main/target/SPRACINGF3EVO/target.h +++ b/src/main/target/SPRACINGF3EVO/target.h @@ -127,11 +127,10 @@ #define SPI2_MOSI_PIN PB15 #define USE_SDCARD -#define USE_SDCARD_SPI2 #define SDCARD_DETECT_INVERTED - #define SDCARD_DETECT_PIN PC14 + #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN diff --git a/src/main/target/SPRACINGF3MINI/target.h b/src/main/target/SPRACINGF3MINI/target.h index 5ad36027cf..71474d0c97 100644 --- a/src/main/target/SPRACINGF3MINI/target.h +++ b/src/main/target/SPRACINGF3MINI/target.h @@ -149,11 +149,10 @@ #define SPI2_MOSI_PIN PB15 #define USE_SDCARD -#define USE_SDCARD_SPI2 #define SDCARD_DETECT_INVERTED - #define SDCARD_DETECT_PIN PC14 + #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN diff --git a/src/main/target/SPRACINGF3NEO/target.h b/src/main/target/SPRACINGF3NEO/target.h index f22407d59e..3186c86717 100644 --- a/src/main/target/SPRACINGF3NEO/target.h +++ b/src/main/target/SPRACINGF3NEO/target.h @@ -124,11 +124,10 @@ #define SPI_SHARED_MAX7456_AND_RTC6705 #define USE_SDCARD -#define USE_SDCARD_SPI2 #define SDCARD_DETECT_INVERTED - #define SDCARD_DETECT_PIN PC14 + #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN diff --git a/src/main/target/SPRACINGF4EVO/target.h b/src/main/target/SPRACINGF4EVO/target.h index 027e9c3f8a..df20a803c4 100644 --- a/src/main/target/SPRACINGF4EVO/target.h +++ b/src/main/target/SPRACINGF4EVO/target.h @@ -125,11 +125,10 @@ #define RTC6705_SPI_INSTANCE SPI3 #define USE_SDCARD -#define USE_SDCARD_SPI2 #define SDCARD_DETECT_INVERTED - #define SDCARD_DETECT_PIN PC14 + #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN diff --git a/src/main/target/SPRACINGF4NEO/target.h b/src/main/target/SPRACINGF4NEO/target.h index b687037715..e1fc7fa6a4 100644 --- a/src/main/target/SPRACINGF4NEO/target.h +++ b/src/main/target/SPRACINGF4NEO/target.h @@ -157,11 +157,10 @@ //#define MAX7456_DMA_IRQ_HANDLER_ID DMA1_ST0_HANDLER #define USE_SDCARD -#define USE_SDCARD_SPI2 #define SDCARD_DETECT_INVERTED - #define SDCARD_DETECT_PIN PC14 + #define SDCARD_SPI_INSTANCE SPI2 #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN diff --git a/src/main/target/STM32F3DISCOVERY/target.h b/src/main/target/STM32F3DISCOVERY/target.h index 24add1590b..cbf71e319e 100644 --- a/src/main/target/STM32F3DISCOVERY/target.h +++ b/src/main/target/STM32F3DISCOVERY/target.h @@ -123,7 +123,6 @@ #define CMS //#define USE_SDCARD -//#define USE_SDCARD_SPI2 // //#define SDCARD_SPI_INSTANCE SPI2 //#define SDCARD_SPI_CS_PIN PB12