From 5762688f6d85514d3c07f45b7c0fd58ef8990c1a Mon Sep 17 00:00:00 2001 From: J Blackman Date: Wed, 26 Jun 2024 00:24:40 +1000 Subject: [PATCH] CLEANUP: Move flash drivers to their own directory (#13691) * CLEANUP: Move flash drivers to their own directory * Missed flash_w25q128fv.h. * Directories in #include, and specifying all source files explicitly. * Revert RX driver src file implicit declaration --- mk/source.mk | 28 +++++++++++-------- src/main/cli/cli.c | 2 +- src/main/cms/cms_menu_blackbox.c | 2 +- src/main/config/config_eeprom.c | 2 +- src/main/config/config_streamer.c | 2 +- src/main/drivers/bus_spi_config.c | 2 +- src/main/drivers/{ => flash}/flash.c | 12 ++++---- src/main/drivers/{ => flash}/flash.h | 0 src/main/drivers/{ => flash}/flash_impl.h | 0 src/main/drivers/{ => flash}/flash_m25p16.c | 6 ++-- src/main/drivers/{ => flash}/flash_m25p16.h | 0 src/main/drivers/{ => flash}/flash_w25m.c | 10 +++---- src/main/drivers/{ => flash}/flash_w25m.h | 0 src/main/drivers/{ => flash}/flash_w25n.c | 6 ++-- src/main/drivers/{ => flash}/flash_w25n.h | 0 .../drivers/{ => flash}/flash_w25q128fv.c | 6 ++-- .../drivers/{ => flash}/flash_w25q128fv.h | 0 src/main/fc/init.c | 2 +- src/main/io/flashfs.c | 2 +- src/main/msc/emfat_file.c | 2 +- src/main/msp/msp.c | 2 +- src/main/osd/osd.c | 2 +- 22 files changed, 46 insertions(+), 42 deletions(-) rename src/main/drivers/{ => flash}/flash.c (98%) rename src/main/drivers/{ => flash}/flash.h (100%) rename src/main/drivers/{ => flash}/flash_impl.h (100%) rename src/main/drivers/{ => flash}/flash_m25p16.c (99%) rename src/main/drivers/{ => flash}/flash_m25p16.h (100%) rename src/main/drivers/{ => flash}/flash_w25m.c (97%) rename src/main/drivers/{ => flash}/flash_w25m.h (100%) rename src/main/drivers/{ => flash}/flash_w25n.c (99%) rename src/main/drivers/{ => flash}/flash_w25n.h (100%) rename src/main/drivers/{ => flash}/flash_w25q128fv.c (99%) rename src/main/drivers/{ => flash}/flash_w25q128fv.h (100%) diff --git a/mk/source.mk b/mk/source.mk index 50ab954566..4200ed27b1 100644 --- a/mk/source.mk +++ b/mk/source.mk @@ -332,6 +332,16 @@ endif endif RX_SRC = \ + drivers/rx/expresslrs_driver.c \ + drivers/rx/rx_a7105.c \ + drivers/rx/rx_cc2500.c \ + drivers/rx/rx_cyrf6936.c \ + drivers/rx/rx_nrf24l01.c \ + drivers/rx/rx_pwm.c \ + drivers/rx/rx_spi.c \ + drivers/rx/rx_sx127x.c \ + drivers/rx/rx_sx1280.c \ + drivers/rx/rx_xn297.c \ rx/cc2500_common.c \ rx/cc2500_frsky_shared.c \ rx/cc2500_frsky_d.c \ @@ -340,22 +350,16 @@ RX_SRC = \ rx/cc2500_redpine.c \ rx/a7105_flysky.c \ rx/cyrf6936_spektrum.c \ - drivers/rx/expresslrs_driver.c \ rx/expresslrs.c \ rx/expresslrs_common.c \ - rx/expresslrs_telemetry.c \ - drivers/rx/rx_cc2500.c \ - drivers/rx/rx_a7105.c \ - drivers/rx/rx_cyrf6936.c \ - drivers/rx/rx_sx127x.c \ - drivers/rx/rx_sx1280.c + rx/expresslrs_telemetry.c FLASH_SRC += \ - drivers/flash.c \ - drivers/flash_m25p16.c \ - drivers/flash_w25n.c \ - drivers/flash_w25q128fv.c \ - drivers/flash_w25m.c \ + drivers/flash/flash.c \ + drivers/flash/flash_m25p16.c \ + drivers/flash/flash_w25m.c \ + drivers/flash/flash_w25n.c \ + drivers/flash/flash_w25q128fv.c \ io/flashfs.c SDCARD_SRC += \ diff --git a/src/main/cli/cli.c b/src/main/cli/cli.c index 51076b40e2..182a6a8f95 100644 --- a/src/main/cli/cli.c +++ b/src/main/cli/cli.c @@ -74,7 +74,7 @@ bool cliMode = false; #include "drivers/compass/compass.h" #include "drivers/display.h" #include "drivers/dma.h" -#include "drivers/flash.h" +#include "drivers/flash/flash.h" #include "drivers/inverter.h" #include "drivers/io.h" #include "drivers/io_impl.h" diff --git a/src/main/cms/cms_menu_blackbox.c b/src/main/cms/cms_menu_blackbox.c index 7f7e384679..93864693e6 100644 --- a/src/main/cms/cms_menu_blackbox.c +++ b/src/main/cms/cms_menu_blackbox.c @@ -46,7 +46,7 @@ #include "config/feature.h" -#include "drivers/flash.h" +#include "drivers/flash/flash.h" #include "drivers/time.h" #include "drivers/sdcard.h" diff --git a/src/main/config/config_eeprom.c b/src/main/config/config_eeprom.c index 1e166cab7b..9e7553caf7 100644 --- a/src/main/config/config_eeprom.c +++ b/src/main/config/config_eeprom.c @@ -38,7 +38,7 @@ #include "io/asyncfatfs/asyncfatfs.h" #endif -#include "drivers/flash.h" +#include "drivers/flash/flash.h" #include "drivers/system.h" static uint16_t eepromConfigSize; diff --git a/src/main/config/config_streamer.c b/src/main/config/config_streamer.c index c6dc2a21c8..a00fc8aa84 100644 --- a/src/main/config/config_streamer.c +++ b/src/main/config/config_streamer.c @@ -23,7 +23,7 @@ #include "platform.h" #include "drivers/system.h" -#include "drivers/flash.h" +#include "drivers/flash/flash.h" #include "config/config_eeprom.h" #include "config/config_streamer.h" diff --git a/src/main/drivers/bus_spi_config.c b/src/main/drivers/bus_spi_config.c index fc144b2982..8e96b9d49b 100644 --- a/src/main/drivers/bus_spi_config.c +++ b/src/main/drivers/bus_spi_config.c @@ -29,7 +29,7 @@ #include "drivers/resource.h" #include "drivers/system.h" -#include "drivers/flash.h" +#include "drivers/flash/flash.h" #include "drivers/max7456.h" #include "drivers/rx/rx_spi.h" #include "drivers/sdcard.h" diff --git a/src/main/drivers/flash.c b/src/main/drivers/flash/flash.c similarity index 98% rename from src/main/drivers/flash.c rename to src/main/drivers/flash/flash.c index 958cb5f54b..a28e8a5d92 100644 --- a/src/main/drivers/flash.c +++ b/src/main/drivers/flash/flash.c @@ -28,12 +28,12 @@ #ifdef USE_FLASH_CHIP -#include "flash.h" -#include "flash_impl.h" -#include "flash_m25p16.h" -#include "flash_w25n.h" -#include "flash_w25q128fv.h" -#include "flash_w25m.h" +#include "drivers/flash/flash.h" +#include "drivers/flash/flash_impl.h" +#include "drivers/flash/flash_m25p16.h" +#include "drivers/flash/flash_w25n.h" +#include "drivers/flash/flash_w25q128fv.h" +#include "drivers/flash/flash_w25m.h" #include "drivers/bus_spi.h" #include "drivers/bus_quadspi.h" #include "drivers/bus_octospi.h" diff --git a/src/main/drivers/flash.h b/src/main/drivers/flash/flash.h similarity index 100% rename from src/main/drivers/flash.h rename to src/main/drivers/flash/flash.h diff --git a/src/main/drivers/flash_impl.h b/src/main/drivers/flash/flash_impl.h similarity index 100% rename from src/main/drivers/flash_impl.h rename to src/main/drivers/flash/flash_impl.h diff --git a/src/main/drivers/flash_m25p16.c b/src/main/drivers/flash/flash_m25p16.c similarity index 99% rename from src/main/drivers/flash_m25p16.c rename to src/main/drivers/flash/flash_m25p16.c index 5f1b29233e..4b92892d58 100644 --- a/src/main/drivers/flash_m25p16.c +++ b/src/main/drivers/flash/flash_m25p16.c @@ -30,14 +30,14 @@ #include "drivers/bus_spi.h" #include "drivers/bus_quadspi.h" -#include "drivers/flash.h" -#include "drivers/flash_impl.h" +#include "drivers/flash/flash.h" +#include "drivers/flash/flash_impl.h" #include "drivers/io.h" #include "drivers/time.h" #include "pg/flash.h" -#include "flash_m25p16.h" +#include "drivers/flash/flash_m25p16.h" #define M25P16_INSTRUCTION_RDID SPIFLASH_INSTRUCTION_RDID #define M25P16_INSTRUCTION_READ_BYTES 0x03 diff --git a/src/main/drivers/flash_m25p16.h b/src/main/drivers/flash/flash_m25p16.h similarity index 100% rename from src/main/drivers/flash_m25p16.h rename to src/main/drivers/flash/flash_m25p16.h diff --git a/src/main/drivers/flash_w25m.c b/src/main/drivers/flash/flash_w25m.c similarity index 97% rename from src/main/drivers/flash_w25m.c rename to src/main/drivers/flash/flash_w25m.c index 80d61c4387..d0024e050f 100644 --- a/src/main/drivers/flash_w25m.c +++ b/src/main/drivers/flash/flash_w25m.c @@ -36,14 +36,14 @@ #include "common/maths.h" #include "drivers/bus_spi.h" -#include "drivers/flash.h" -#include "drivers/flash_impl.h" +#include "drivers/flash/flash.h" +#include "drivers/flash/flash_impl.h" #include "drivers/io.h" #include "drivers/time.h" -#include "flash_m25p16.h" -#include "flash_w25m.h" -#include "flash_w25n.h" +#include "drivers/flash/flash_m25p16.h" +#include "drivers/flash/flash_w25m.h" +#include "drivers/flash/flash_w25n.h" #include "pg/flash.h" diff --git a/src/main/drivers/flash_w25m.h b/src/main/drivers/flash/flash_w25m.h similarity index 100% rename from src/main/drivers/flash_w25m.h rename to src/main/drivers/flash/flash_w25m.h diff --git a/src/main/drivers/flash_w25n.c b/src/main/drivers/flash/flash_w25n.c similarity index 99% rename from src/main/drivers/flash_w25n.c rename to src/main/drivers/flash/flash_w25n.c index f5096a6ac9..cb1c055941 100644 --- a/src/main/drivers/flash_w25n.c +++ b/src/main/drivers/flash/flash_w25n.c @@ -27,9 +27,9 @@ #ifdef USE_FLASH_W25N -#include "flash.h" -#include "flash_impl.h" -#include "flash_w25n.h" +#include "drivers/flash/flash.h" +#include "drivers/flash/flash_impl.h" +#include "drivers/flash/flash_w25n.h" #include "drivers/bus_spi.h" #include "drivers/bus_quadspi.h" #include "drivers/io.h" diff --git a/src/main/drivers/flash_w25n.h b/src/main/drivers/flash/flash_w25n.h similarity index 100% rename from src/main/drivers/flash_w25n.h rename to src/main/drivers/flash/flash_w25n.h diff --git a/src/main/drivers/flash_w25q128fv.c b/src/main/drivers/flash/flash_w25q128fv.c similarity index 99% rename from src/main/drivers/flash_w25q128fv.c rename to src/main/drivers/flash/flash_w25q128fv.c index 4e09815020..a6be812223 100644 --- a/src/main/drivers/flash_w25q128fv.c +++ b/src/main/drivers/flash/flash_w25q128fv.c @@ -34,9 +34,9 @@ #include "common/utils.h" #include "drivers/time.h" -#include "drivers/flash.h" -#include "drivers/flash_impl.h" -#include "drivers/flash_w25q128fv.h" +#include "drivers/flash/flash.h" +#include "drivers/flash/flash_impl.h" +#include "drivers/flash/flash_w25q128fv.h" #include "drivers/bus_quadspi.h" #include "drivers/bus_octospi.h" diff --git a/src/main/drivers/flash_w25q128fv.h b/src/main/drivers/flash/flash_w25q128fv.h similarity index 100% rename from src/main/drivers/flash_w25q128fv.h rename to src/main/drivers/flash/flash_w25q128fv.h diff --git a/src/main/fc/init.c b/src/main/fc/init.c index a1e9d6fd51..770d4e108f 100644 --- a/src/main/fc/init.c +++ b/src/main/fc/init.c @@ -56,7 +56,7 @@ #include "drivers/dma.h" #include "drivers/dshot.h" #include "drivers/exti.h" -#include "drivers/flash.h" +#include "drivers/flash/flash.h" #include "drivers/inverter.h" #include "drivers/io.h" #include "drivers/light_led.h" diff --git a/src/main/io/flashfs.c b/src/main/io/flashfs.c index 06f53f9b88..b53e287817 100644 --- a/src/main/io/flashfs.c +++ b/src/main/io/flashfs.c @@ -42,7 +42,7 @@ #include "build/debug.h" #include "common/printf.h" -#include "drivers/flash.h" +#include "drivers/flash/flash.h" #include "drivers/light_led.h" #include "io/flashfs.h" diff --git a/src/main/msc/emfat_file.c b/src/main/msc/emfat_file.c index e129f86eea..3d27be94c1 100644 --- a/src/main/msc/emfat_file.c +++ b/src/main/msc/emfat_file.c @@ -31,7 +31,7 @@ #include "common/time.h" #include "common/utils.h" -#include "drivers/flash.h" +#include "drivers/flash/flash.h" #include "drivers/light_led.h" #include "drivers/time.h" #include "drivers/usb_msc.h" diff --git a/src/main/msp/msp.c b/src/main/msp/msp.c index 46beec7f2d..2204758a55 100644 --- a/src/main/msp/msp.c +++ b/src/main/msp/msp.c @@ -58,7 +58,7 @@ #include "drivers/display.h" #include "drivers/dshot.h" #include "drivers/dshot_command.h" -#include "drivers/flash.h" +#include "drivers/flash/flash.h" #include "drivers/io.h" #include "drivers/motor.h" #include "drivers/osd.h" diff --git a/src/main/osd/osd.c b/src/main/osd/osd.c index da9cf3f9a8..1bf0da2add 100644 --- a/src/main/osd/osd.c +++ b/src/main/osd/osd.c @@ -55,7 +55,7 @@ #include "drivers/display.h" #include "drivers/dshot.h" -#include "drivers/flash.h" +#include "drivers/flash/flash.h" #include "drivers/osd_symbols.h" #include "drivers/sdcard.h" #include "drivers/time.h"