Fix include syntax

Interface header includes have acquired the interface prefix, to
distinguish them from regular header includes.

meson.build

@@ -27,9 +27,8 @@ else
   openrtx_src += 'openrtx/src/main.c'
 endif
 
-openrtx_inc = ['openrtx/include/interfaces',
+openrtx_inc = ['openrtx/include',
                'openrtx/include/calibration',
-               'openrtx/include',
                'platform/drivers/ADC',
                'platform/drivers/NVM',
                'platform/drivers/tones',

openrtx/include/cps.h

@@ -22,7 +22,7 @@
 #define CPS_H
 
 #include <stdint.h>
-#include <rtx.h>
+#include <interfaces/rtx.h>
 #include <datatypes.h>
 
 /**

openrtx/include/interfaces/graphics.h

@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <display.h>
+#include <interfaces/display.h>
 #include "gfxfont.h"
 #include "TomThumb.h"
 #include "FreeSans6pt7b.h"

openrtx/include/state.h

@@ -23,7 +23,7 @@
 
 #include <datatypes.h>
 #include <stdbool.h>
-#include <rtc.h>
+#include <interfaces/rtc.h>
 #include <cps.h>
 
 /**

openrtx/include/ui.h

@@ -22,7 +22,7 @@
 
 #include <stdbool.h>
 #include <state.h>
-#include <keyboard.h>
+#include <interfaces/keyboard.h>
 #include <stdint.h>
 #include <event.h>
 

openrtx/src/graphics.c

@@ -26,8 +26,8 @@
 #include <string.h>
 #include <stdio.h>
 #include <hwconfig.h>
-#include <display.h>
-#include <graphics.h>
+#include <interfaces/display.h>
+#include <interfaces/graphics.h>
 
 #ifdef PIX_FMT_RGB565
 /* This specialization is meant for an RGB565 little endian pixel format.

openrtx/src/main.c

@@ -23,9 +23,9 @@
 #include <stdlib.h>
 #include <inttypes.h>
 #include <threads.h>
-#include <platform.h>
+#include <interfaces/platform.h>
 #include <battery.h>
-#include <graphics.h>
+#include <interfaces/graphics.h>
 #include <hwconfig.h>
 
 int main(void)

openrtx/src/state.c

@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include <state.h>
-#include <platform.h>
+#include <interfaces/platform.h>
 
 state_t state;
 

openrtx/src/threads.c

@@ -22,12 +22,12 @@
 #include <ui.h>
 #include <state.h>
 #include <threads.h>
-#include <keyboard.h>
-#include <graphics.h>
-#include <platform.h>
+#include <interfaces/keyboard.h>
+#include <interfaces/graphics.h>
+#include <interfaces/platform.h>
 #include <hwconfig.h>
 #include <event.h>
-#include <rtx.h>
+#include <interfaces/rtx.h>
 
 /* Mutex for concurrent access to state variable */
 static OS_MUTEX state_mutex;

openrtx/src/ui.c

@@ -66,11 +66,11 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <ui.h>
-#include <rtx.h>
-#include <delays.h>
-#include <graphics.h>
-#include <keyboard.h>
-#include <platform.h>
+#include <interfaces/rtx.h>
+#include <interfaces/delays.h>
+#include <interfaces/graphics.h>
+#include <interfaces/keyboard.h>
+#include <interfaces/platform.h>
 #include <hwconfig.h>
 #include <string.h>
 #include <battery.h>

platform/drivers/ADC/ADC1_MDx.c

@@ -15,7 +15,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <gpio.h>
+#include <interfaces/gpio.h>
 #include "hwconfig.h"
 #include "ADC1_MDx.h"
 

platform/drivers/NVM/extFlash_MDx.c

@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "extFlash_MDx.h"
-#include <gpio.h>
+#include <interfaces/gpio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>

platform/drivers/NVM/nvmem_MD3x0.c

@@ -18,8 +18,8 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <nvmem.h>
-#include <delays.h>
+#include <interfaces/nvmem.h>
+#include <interfaces/delays.h>
 #include "extFlash_MDx.h"
 #include "calibInfo_MDx.h"
 

platform/drivers/NVM/nvmem_MDUV3x0.c

@@ -18,8 +18,8 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <nvmem.h>
-#include <delays.h>
+#include <interfaces/nvmem.h>
+#include <interfaces/delays.h>
 #include "calibInfo_MDx.h"
 #include "extFlash_MDx.h"
 

platform/drivers/baseband/HR-C5000_MD3x0.c

@@ -20,8 +20,8 @@
 
 #include "HR-C5000_MD3x0.h"
 #include <hwconfig.h>
-#include <gpio.h>
-#include <delays.h>
+#include <interfaces/gpio.h>
+#include <interfaces/delays.h>
 #include <hwconfig.h>
 #include <os.h>
 

platform/drivers/baseband/pll_MD3x0.c

@@ -17,8 +17,8 @@
 
 #include "pll_MD3x0.h"
 #include <math.h>
-#include "gpio.h"
-#include "delays.h"
+#include <interfaces/gpio.h>
+#include <interfaces/delays.h>
 #include "hwconfig.h"
 
 #define REF_CLK 16800000.0F  /* Reference clock: 16.8MHz                 */

platform/drivers/baseband/rtx_GDx.c

@@ -20,11 +20,11 @@
 
 #include <datatypes.h>
 #include <hwconfig.h>
-#include <platform.h>
+#include <interfaces/platform.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdlib.h>
-#include <rtx.h>
+#include <interfaces/rtx.h>
 #include <stdio.h>
 
 OS_MUTEX *cfgMutex;               /* Mutex for incoming config messages */

platform/drivers/baseband/rtx_MD3x0.c

@@ -23,13 +23,13 @@
 #include <calibUtils.h>
 #include <datatypes.h>
 #include <hwconfig.h>
-#include <platform.h>
+#include <interfaces/platform.h>
 #include <ADC1_MDx.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdlib.h>
-#include <gpio.h>
-#include <rtx.h>
+#include <interfaces/gpio.h>
+#include <interfaces/rtx.h>
 #include "HR-C5000_MD3x0.h"
 #include "pll_MD3x0.h"
 

platform/drivers/baseband/rtx_UV3x0.c

@@ -20,11 +20,11 @@
 
 #include <datatypes.h>
 #include <hwconfig.h>
-#include <platform.h>
+#include <interfaces/platform.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdlib.h>
-#include <rtx.h>
+#include <interfaces/rtx.h>
 
 OS_MUTEX *cfgMutex;               /* Mutex for incoming config messages */
 OS_Q cfgMailbox;                  /* Queue for incoming config messages */

platform/drivers/baseband/rtx_linux.c

@@ -20,11 +20,11 @@
 
 #include <datatypes.h>
 #include <hwconfig.h>
-#include <platform.h>
+#include <interfaces/platform.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdlib.h>
-#include <rtx.h>
+#include <interfaces/rtx.h>
 #include <stdio.h>
 
 OS_MUTEX *cfgMutex;               /* Mutex for incoming config messages */

platform/drivers/display/HX83XX_MDx.c

@@ -20,9 +20,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <os.h>
-#include "gpio.h"
-#include "display.h"
-#include "delays.h"
+#include <interfaces/gpio.h>
+#include <interfaces/display.h>
+#include <interfaces/delays.h>
 #include "hwconfig.h"
 #include "stm32f4xx.h"
 

platform/drivers/display/UC1701_GD77.c

@@ -23,9 +23,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <os.h>
-#include "gpio.h"
-#include "display.h"
-#include "delays.h"
+#include <interfaces/gpio.h>
+#include <interfaces/display.h>
+#include <interfaces/delays.h>
 #include "hwconfig.h"
 
 /*

platform/drivers/display/display_libSDL.c

@@ -24,7 +24,7 @@
  * this driver.
  */
 
-#include "display.h"
+#include <interfaces/display.h>
 #include <stdio.h>
 #include <string.h>
 #include <SDL2/SDL.h>

platform/drivers/keyboard/keyboard_GD77.c

@@ -18,9 +18,9 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include "gpio.h"
-#include "delays.h"
-#include "keyboard.h"
+#include <interfaces/gpio.h>
+#include <interfaces/delays.h>
+#include <interfaces/keyboard.h>
 #include "hwconfig.h"
 
 void kbd_init()

platform/drivers/keyboard/keyboard_MDx.c

@@ -20,9 +20,9 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include "gpio.h"
-#include "delays.h"
-#include "keyboard.h"
+#include <interfaces/gpio.h>
+#include <interfaces/delays.h>
+#include <interfaces/keyboard.h>
 #include "hwconfig.h"
 
 void kbd_init()

platform/drivers/keyboard/keyboard_linux.c

@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include "keyboard.h"
+#include <interfaces/keyboard.h>
 #include <SDL2/SDL.h>
 
 void kbd_init()

platform/drivers/tones/toneGenerator_MDx.c

@@ -20,7 +20,7 @@
 
 #include "toneGenerator_MDx.h"
 #include <hwconfig.h>
-#include <gpio.h>
+#include <interfaces/gpio.h>
 #include <os.h>
 
 /*

platform/mcu/MK22FN512xxx12/drivers/delays.c

@@ -15,7 +15,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include "delays.h"
+#include <interfaces/delays.h>
 
 /**
  * Implementation of the delay functions for STM32F405 MCU.

platform/mcu/MK22FN512xxx12/drivers/gpio.c

@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include "MK22F51212.h"
-#include "gpio.h"
+#include <interfaces/gpio.h>
 
 /*
  * MK22 GPIO management is a bit convoluted: instead of having all the registers

platform/mcu/MK22FN512xxx12/drivers/rtc.c

@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <os.h>
-#include "rtc.h"
+#include <interfaces/rtc.h>
 
 /*
  * NOTE: even if the MK22FN512 MCU has an RTC, it is unusable in GDx platforms

platform/mcu/MK22FN512xxx12/drivers/usb_vcom.c

@@ -28,7 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <gpio.h>
+#include <interfaces/gpio.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>

platform/mcu/STM32F4xx/drivers/delays.c

@@ -15,7 +15,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include "delays.h"
+#include <interfaces/delays.h>
 
 /**
  * Implementation of the delay functions for STM32F405 MCU.

platform/mcu/STM32F4xx/drivers/gpio.c

@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include "stm32f4xx.h"
-#include "gpio.h"
+#include <interfaces/gpio.h>
 
 void gpio_setMode(void *port, uint8_t pin, enum Mode mode)
 {

platform/mcu/STM32F4xx/drivers/rtc.c

@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 #include <os.h>
-#include "rtc.h"
+#include <interfaces/rtc.h>
 #include "stm32f4xx.h"
 
 void rtc_init()

platform/mcu/STM32F4xx/drivers/usb/usb_bsp.c

@@ -30,9 +30,9 @@
 #include "usb_bsp.h"
 #include "usbd_conf.h"
 #include "stm32f4xx.h"
-#include "gpio.h"
+#include <interfaces/gpio.h>
 #include <os.h>
-#include <delays.h>
+#include <interfaces/delays.h>
 
 extern USB_OTG_CORE_HANDLE           USB_OTG_dev;
 extern uint32_t USBD_OTG_ISR_Handler(USB_OTG_CORE_HANDLE *pdev);

platform/mcu/x86_64/drivers/delays.c

@@ -15,7 +15,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include "delays.h"
+#include <interfaces/delays.h>
 #include <unistd.h>
 #include <stdio.h>
 

platform/mcu/x86_64/drivers/gpio.c

@@ -15,7 +15,7 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include "gpio.h"
+#include <interfaces/gpio.h>
 #include <stdio.h>
 
 void gpio_setMode(void *port, uint8_t pin, enum Mode mode)

platform/mcu/x86_64/drivers/rtc.c

@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include <time.h>
-#include "rtc.h"
+#include <interfaces/rtc.h>
 
 void rtc_init()
 {

platform/targets/DM-1801/platform.c

@@ -18,9 +18,9 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <platform.h>
+#include <interfaces/platform.h>
 #include <ADC0_GDx.h>
-#include <gpio.h>
+#include <interfaces/gpio.h>
 #include <os.h>
 #include "hwconfig.h"
 

platform/targets/GD77/platform.c

@@ -18,9 +18,9 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <platform.h>
+#include <interfaces/platform.h>
 #include <ADC0_GDx.h>
-#include <gpio.h>
+#include <interfaces/gpio.h>
 #include <os.h>
 #include "hwconfig.h"
 

platform/targets/MD-380/platform.c

@@ -17,9 +17,9 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <gpio.h>
-#include <nvmem.h>
-#include <platform.h>
+#include <interfaces/gpio.h>
+#include <interfaces/nvmem.h>
+#include <interfaces/platform.h>
 #include <hwconfig.h>
 #include <ADC1_MDx.h>
 #include <calibInfo_MDx.h>

platform/targets/MD-390/platform.c

@@ -17,9 +17,9 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <gpio.h>
-#include <nvmem.h>
-#include <platform.h>
+#include <interfaces/gpio.h>
+#include <interfaces/nvmem.h>
+#include <interfaces/platform.h>
 #include <hwconfig.h>
 #include <ADC1_MDx.h>
 #include <calibInfo_MDx.h>

platform/targets/MD-UV380/platform.c

@@ -17,13 +17,13 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <platform.h>
-#include <gpio.h>
+#include <interfaces/platform.h>
+#include <interfaces/gpio.h>
 #include <os.h>
 #include <hwconfig.h>
 #include <ADC1_MDx.h>
 #include <calibInfo_MDx.h>
-#include <nvmem.h>
+#include <interfaces/nvmem.h>
 
 mduv3x0Calib_t calibration;
 

platform/targets/linux/platform.c

@@ -15,8 +15,8 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include "platform.h"
-#include "gpio.h"
+#include <interfaces/platform.h>
+#include <interfaces/gpio.h>
 #include <stdio.h>
 #include "emulator.h"
 

tests/platform/MD380_FM_simpleRtx.c

@@ -23,10 +23,10 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <os.h>
-#include "gpio.h"
-#include "delays.h"
-#include "rtx.h"
-#include "platform.h"
+#include <interfaces/gpio.h>
+#include <interfaces/delays.h>
+#include <interfaces/rtx.h>
+#include <interfaces/platform.h>
 #include "hwconfig.h"
 #include "toneGenerator_MDx.h"
 

tests/platform/MD380_blink.c

@@ -23,8 +23,8 @@
 #include <os.h>
 #include <stdio.h>
 #include "stm32f4xx.h"
-#include "gpio.h"
-#include "delays.h"
+#include <interfaces/gpio.h>
+#include <interfaces/delays.h>
 #include <lib_mem.h>
 
 static OS_TCB        t1TCB;

tests/platform/MD380_display.c

@@ -23,11 +23,11 @@
 #include <os.h>
 #include <lib_mem.h>
 #include <stdio.h>
-#include "gpio.h"
-#include "delays.h"
-#include "display.h"
+#include <interfaces/gpio.h>
+#include <interfaces/delays.h>
+#include <interfaces/display.h>
 #include "hwconfig.h"
-#include "platform.h"
+#include <interfaces/platform.h>
 
 static OS_TCB        t1TCB;
 static CPU_STK_SIZE  t1Stk[128];

tests/platform/boot_test.c

@@ -20,7 +20,7 @@
 
 #include <os.h>
 #include <stdio.h>
-#include <platform.h>
+#include <interfaces/platform.h>
 
 int main()
 {

tests/platform/display_test_SDL.c

@@ -25,7 +25,7 @@
  * the driver source file.
  */
 
-#include "display.h"
+#include <interfaces/display.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdint.h>

tests/platform/gpio_demo.c

@@ -20,10 +20,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <os.h>
-#include "gpio.h"
-#include "graphics.h"
+#include <interfaces/gpio.h>
+#include <interfaces/graphics.h>
 #include "hwconfig.h"
-#include "platform.h"
+#include <interfaces/platform.h>
 
 void printBits(uint16_t value, point_t pos)
 {

tests/platform/gui_demo.c

@@ -20,12 +20,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <os.h>
-#include "gpio.h"
-#include "graphics.h"
+#include <interfaces/gpio.h>
+#include <interfaces/graphics.h>
 #include "hwconfig.h"
-#include "platform.h"
+#include <interfaces/platform.h>
 #include "state.h"
-#include "keyboard.h"
+#include <interfaces/keyboard.h>
 #include "ui.h"
 
 

tests/platform/kek_demo.c

@@ -7,7 +7,7 @@
 #include <SDL2/SDL.h>
 #undef main
 
-#include "graphics.h"
+#include <interfaces/graphics.h>
 
 static OS_TCB        App_TaskStartTCB;
 static CPU_STK_SIZE  App_TaskStartStk[APP_CFG_TASK_START_STK_SIZE];

tests/platform/keyboard_demo.c

@@ -22,12 +22,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <os.h>
-#include "gpio.h"
-#include "graphics.h"
+#include <interfaces/gpio.h>
+#include <interfaces/graphics.h>
 #include "hwconfig.h"
-#include "platform.h"
+#include <interfaces/platform.h>
 #include "state.h"
-#include "keyboard.h"
+#include <interfaces/keyboard.h>
 #include "ui.h"
 
 color_t color_yellow_fab413 = {250, 180, 19};

tests/platform/platform_demo.c

@@ -20,10 +20,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <os.h>
-#include "gpio.h"
-#include "graphics.h"
+#include <interfaces/gpio.h>
+#include <interfaces/graphics.h>
 #include "hwconfig.h"
-#include "platform.h"
+#include <interfaces/platform.h>
 
 void platform_test()
 {

tests/platform/printCalib_MDx.c

@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <sys/types.h>
-#include <nvmem.h>
+#include <interfaces/nvmem.h>
 #include <calibInfo_MDx.h>
 
 void printMD3x0calibration()

tests/platform/printContacts_MDx.c

@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <sys/types.h>
-#include <nvmem.h>
+#include <interfaces/nvmem.h>
 #include <cps.h>
 
 int main()