From d2ddddf478170fc4efc4f07fd94052bd6d91151d Mon Sep 17 00:00:00 2001 From: Ryan Turner Date: Tue, 30 Sep 2025 21:55:30 -0500 Subject: [PATCH] Fix incorrect include paths for platform-unique header files --- openrtx/src/core/backup.c | 2 +- openrtx/src/core/xmodem.c | 2 +- openrtx/src/protocols/M17/M17Demodulator.cpp | 2 +- platform/drivers/CPS/cps_io_native_GDx.c | 4 ++-- platform/drivers/CPS/cps_io_native_MD3x0.c | 2 +- platform/drivers/CPS/cps_io_native_MD9600.c | 2 +- platform/drivers/CPS/cps_io_native_MDUV3x0.c | 2 +- platform/drivers/NVM/AT24Cx_GDx.c | 2 +- platform/drivers/NVM/W25Qx.c | 2 +- platform/drivers/NVM/nvmem_GDx.c | 4 ++-- platform/drivers/NVM/nvmem_MDx.c | 2 +- platform/drivers/audio/audio_MDx.cpp | 2 +- platform/drivers/tones/toneGenerator_MDx.cpp | 2 +- platform/mcu/MK22FN512xxx12/boot/libc_integration.cpp | 2 +- tests/platform/tonegen.c | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/openrtx/src/core/backup.c b/openrtx/src/core/backup.c index 32d17ea4..9fea9dac 100644 --- a/openrtx/src/core/backup.c +++ b/openrtx/src/core/backup.c @@ -21,7 +21,7 @@ #include "core/backup.h" #include "core/xmodem.h" #include -#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 diff --git a/openrtx/src/core/xmodem.c b/openrtx/src/core/xmodem.c index 8ae352e7..563fd792 100644 --- a/openrtx/src/core/xmodem.c +++ b/openrtx/src/core/xmodem.c @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include "drivers/USB/usb_vcom.h" +#include "drivers/usb_vcom.h" #include #include #include "core/xmodem.h" diff --git a/openrtx/src/protocols/M17/M17Demodulator.cpp b/openrtx/src/protocols/M17/M17Demodulator.cpp index 6c202ff0..20ee12f4 100644 --- a/openrtx/src/protocols/M17/M17Demodulator.cpp +++ b/openrtx/src/protocols/M17/M17Demodulator.cpp @@ -35,7 +35,7 @@ using namespace M17; #include "core/ringbuf.hpp" #include #ifndef PLATFORM_LINUX -#include "drivers/USB/usb_vcom.h" +#include "drivers/usb_vcom.h" #endif typedef struct diff --git a/platform/drivers/CPS/cps_io_native_GDx.c b/platform/drivers/CPS/cps_io_native_GDx.c index 3ce649f8..70891a37 100644 --- a/platform/drivers/CPS/cps_io_native_GDx.c +++ b/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 */ diff --git a/platform/drivers/CPS/cps_io_native_MD3x0.c b/platform/drivers/CPS/cps_io_native_MD3x0.c index 2fec8dd9..04332f23 100644 --- a/platform/drivers/CPS/cps_io_native_MD3x0.c +++ b/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; diff --git a/platform/drivers/CPS/cps_io_native_MD9600.c b/platform/drivers/CPS/cps_io_native_MD9600.c index c60c7b4e..d40acb9f 100644 --- a/platform/drivers/CPS/cps_io_native_MD9600.c +++ b/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; diff --git a/platform/drivers/CPS/cps_io_native_MDUV3x0.c b/platform/drivers/CPS/cps_io_native_MDUV3x0.c index 982bf948..bf16624a 100644 --- a/platform/drivers/CPS/cps_io_native_MDUV3x0.c +++ b/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; diff --git a/platform/drivers/NVM/AT24Cx_GDx.c b/platform/drivers/NVM/AT24Cx_GDx.c index b7d80691..7406d472 100644 --- a/platform/drivers/NVM/AT24Cx_GDx.c +++ b/platform/drivers/NVM/AT24Cx_GDx.c @@ -23,7 +23,7 @@ #include #include #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; diff --git a/platform/drivers/NVM/W25Qx.c b/platform/drivers/NVM/W25Qx.c index cb36c024..2d2f0069 100644 --- a/platform/drivers/NVM/W25Qx.c +++ b/platform/drivers/NVM/W25Qx.c @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include "W25Qx.h" +#include "drivers/NVM/W25Qx.h" #include #include #include diff --git a/platform/drivers/NVM/nvmem_GDx.c b/platform/drivers/NVM/nvmem_GDx.c index 3cef60c3..be9c9838 100644 --- a/platform/drivers/NVM/nvmem_GDx.c +++ b/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 = { diff --git a/platform/drivers/NVM/nvmem_MDx.c b/platform/drivers/NVM/nvmem_MDx.c index bbb56388..09d956fa 100644 --- a/platform/drivers/NVM/nvmem_MDx.c +++ b/platform/drivers/NVM/nvmem_MDx.c @@ -26,7 +26,7 @@ #include #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) diff --git a/platform/drivers/audio/audio_MDx.cpp b/platform/drivers/audio/audio_MDx.cpp index 8a6a9039..1ecae2d5 100644 --- a/platform/drivers/audio/audio_MDx.cpp +++ b/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" diff --git a/platform/drivers/tones/toneGenerator_MDx.cpp b/platform/drivers/tones/toneGenerator_MDx.cpp index d4f30091..e9e95f84 100644 --- a/platform/drivers/tones/toneGenerator_MDx.cpp +++ b/platform/drivers/tones/toneGenerator_MDx.cpp @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include "toneGenerator_MDx.h" +#include "drivers/tones/toneGenerator_MDx.h" #include #include "hwconfig.h" #include "peripherals/gpio.h" diff --git a/platform/mcu/MK22FN512xxx12/boot/libc_integration.cpp b/platform/mcu/MK22FN512xxx12/boot/libc_integration.cpp index 2c205041..2cc06e61 100644 --- a/platform/mcu/MK22FN512xxx12/boot/libc_integration.cpp +++ b/platform/mcu/MK22FN512xxx12/boot/libc_integration.cpp @@ -17,7 +17,7 @@ #include #include -#include "drivers/USB/usb_vcom.h" +#include "drivers/usb_vcom.h" #include "filesystem/file_access.h" using namespace std; diff --git a/tests/platform/tonegen.c b/tests/platform/tonegen.c index 3b8f1b3a..e212c96d 100644 --- a/tests/platform/tonegen.c +++ b/tests/platform/tonegen.c @@ -21,7 +21,7 @@ #include #include "interfaces/gpio.h" #include "interfaces/delays.h" -#include "toneGenerator_MDx.h" +#include "drivers/tones/toneGenerator_MDx.h" #include "hwconfig.h" int main()