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

@@ -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 += \

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"

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"
 

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;

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"

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"

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"

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

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"
 

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"

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"
 

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"

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"

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"

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"

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"