Fix incorrect include paths for platform-unique header files

openrtx/src/core/backup.c

@@ -21,7 +21,7 @@
 #include "core/backup.h"
 #include "core/xmodem.h"
 #include <string.h>
-#include "W25Qx.h"
+#include "drivers/NVM/W25Qx.h"
 
 #if defined(PLATFORM_GD77) || defined(PLATFORM_DM1801)
 static const size_t EFLASH_SIZE = 1024*1024;    // 1 MB

openrtx/src/core/xmodem.c

@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include "drivers/USB/usb_vcom.h"
+#include "drivers/usb_vcom.h"
 #include <stdbool.h>
 #include <stdlib.h>
 #include "core/xmodem.h"

openrtx/src/protocols/M17/M17Demodulator.cpp

@@ -35,7 +35,7 @@ using namespace M17;
 #include "core/ringbuf.hpp"
 #include <atomic>
 #ifndef PLATFORM_LINUX
-#include "drivers/USB/usb_vcom.h"
+#include "drivers/usb_vcom.h"
 #endif
 
 typedef struct

platform/drivers/CPS/cps_io_native_GDx.c

@@ -24,8 +24,8 @@
 #include "interfaces/cps_io.h"
 #include "core/nvmem_access.h"
 #include "core/utils.h"
-#include "AT24Cx.h"
-#include "W25Qx.h"
+#include "drivers/NVM/AT24Cx.h"
+#include "drivers/NVM/W25Qx.h"
 #include "cps_data_GDx.h"
 
 //static const uint32_t zoneBaseAddr        = 0x149e0;  /**< Base address of zones                */

platform/drivers/CPS/cps_io_native_MD3x0.c

@@ -25,7 +25,7 @@
 #include "wchar.h"
 #include "core/utils.h"
 #include "cps_data_MD3x0.h"
-#include "W25Qx.h"
+#include "drivers/NVM/W25Qx.h"
 
 extern const struct nvmDevice eflash;
 

platform/drivers/CPS/cps_io_native_MD9600.c

@@ -25,7 +25,7 @@
 #include "core/nvmem_access.h"
 #include "core/utils.h"
 #include "cps_data_MDUV3x0.h"
-#include "W25Qx.h"
+#include "drivers/NVM/W25Qx.h"
 
 extern const struct nvmDevice eflash;
 

platform/drivers/CPS/cps_io_native_MDUV3x0.c

@@ -25,7 +25,7 @@
 #include "interfaces/cps_io.h"
 #include "core/utils.h"
 #include "cps_data_MDUV3x0.h"
-#include "W25Qx.h"
+#include "drivers/NVM/W25Qx.h"
 
 extern const struct nvmDevice eflash;
 

platform/drivers/NVM/AT24Cx_GDx.c

@@ -23,7 +23,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "I2C0.h"
-#include "AT24Cx.h"
+#include "drivers/NVM/AT24Cx.h"
 
 static const uint8_t DEV_ADDR  = 0xA0;    /* EEPROM I2C address */
 static const size_t  PAGE_SIZE = 128;

platform/drivers/NVM/W25Qx.c

@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include "W25Qx.h"
+#include "drivers/NVM/W25Qx.h"
 #include <errno.h>
 #include <stdint.h>
 #include <stdlib.h>

platform/drivers/NVM/nvmem_GDx.c

@@ -27,8 +27,8 @@
 #include "drivers/SPI/spi_bitbang.h"
 #include "hwconfig.h"
 #include "core/utils.h"
-#include "AT24Cx.h"
-#include "W25Qx.h"
+#include "drivers/NVM/AT24Cx.h"
+#include "drivers/NVM/W25Qx.h"
 
 static const struct W25QxCfg eflashCfg =
 {

platform/drivers/NVM/nvmem_MDx.c

@@ -26,7 +26,7 @@
 #include <string.h>
 #include "wchar.h"
 #include "core/utils.h"
-#include "W25Qx.h"
+#include "drivers/NVM/W25Qx.h"
 
 #define SECREG_READ(dev, offs, data, len) \
     nvm_devRead((const struct nvmDevice *) dev, offs, data, len)

platform/drivers/audio/audio_MDx.cpp

@@ -26,7 +26,7 @@
 #include "hwconfig.h"
 #include "core/threads.h"
 #include "core/state.h"
-#include "toneGenerator_MDx.h"
+#include "drivers/tones/toneGenerator_MDx.h"
 #include "stm32_pwm.h"
 #include "stm32_adc.h"
 

platform/drivers/tones/toneGenerator_MDx.cpp

@@ -18,7 +18,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include "toneGenerator_MDx.h"
+#include "drivers/tones/toneGenerator_MDx.h"
 #include <miosix.h>
 #include "hwconfig.h"
 #include "peripherals/gpio.h"

platform/mcu/MK22FN512xxx12/boot/libc_integration.cpp

@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 #include <reent.h>
-#include "drivers/USB/usb_vcom.h"
+#include "drivers/usb_vcom.h"
 #include "filesystem/file_access.h"
 
 using namespace std;

tests/platform/tonegen.c

@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include "interfaces/gpio.h"
 #include "interfaces/delays.h"
-#include "toneGenerator_MDx.h"
+#include "drivers/tones/toneGenerator_MDx.h"
 #include "hwconfig.h"
 
 int main()