Upstream Nuttx restructured directories use micro_hal

src/drivers/device/spi.cpp

@@ -45,8 +45,9 @@
  * non-interrupt-mode client.
  */
 
+#include <px4_config.h>
 #include <nuttx/arch.h>
-
+#include <stm32_spi.h>
 #include "spi.h"
 
 #ifndef CONFIG_SPI_EXCHANGE

src/modules/mavlink/mavlink_shell.cpp

@@ -47,7 +47,7 @@
 
 
 #ifdef __PX4_NUTTX
-#include <apps/nsh.h>
+#include <nshlib/nshlib.h>
 #endif /* __PX4_NUTTX */
 
 

src/platforms/px4_spi.h

@@ -1,7 +1,8 @@
 #pragma once
 
 #ifdef __PX4_NUTTX
-#include <nuttx/spi.h>
+#include <nuttx/config.h>
+#include <nuttx/spi/spi.h>
 #elif defined(__PX4_POSIX)
 enum spi_dev_e {
 	SPIDEV_NONE = 0,    /* Not a valid value */

src/systemcmds/nshterm/nshterm.c

@@ -47,7 +47,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <apps/nsh.h>
+#include <nshlib/nshlib.h>
 #include <fcntl.h>
 #include <systemlib/err.h>
 #include <drivers/drv_hrt.h>