moved spi to mcu_periph/spi

conf/autopilot/csc_baro.makefile

@@ -1,4 +1,4 @@
 # baro scp bits
 ap.CFLAGS += -DUSE_BARO_SCP -DUSE_SPI -DSPI_MASTER -DUSE_SPI_SLAVE0 
-ap.srcs += $(SRC_CSC)/csc_baro.c spi.c $(SRC_ARCH)/spi_hw.c
+ap.srcs += $(SRC_CSC)/csc_baro.c mcu_periph/spi.c $(SRC_ARCH)/mcu_periph/spi_arch.c
 

conf/autopilot/subsystems/fixedwing/autopilot.makefile

@@ -208,9 +208,9 @@ jsbsim.srcs 		+= downlink.c datalink.c $(SRC_ARCH)/jsbsim_hw.c $(SRC_ARCH)/jsbsi
 
 ifeq ($(BOARD),classix)
   fbw.CFLAGS 		+= -DMCU_SPI_LINK -DUSE_SPI -DSPI_SLAVE
-  fbw.srcs 		+= $(SRC_FIXEDWING)/link_mcu.c $(SRC_FIXEDWING)/spi.c $(SRC_ARCH)/spi_hw.c
+  fbw.srcs 		+= $(SRC_FIXEDWING)/link_mcu.c mcu_periph/spi.c $(SRC_ARCH)/mcu_periph/spi_arch.c
   ap.CFLAGS 		+= -DMCU_SPI_LINK -DUSE_SPI -DSPI_MASTER -DUSE_SPI_SLAVE0
-  ap.srcs 		+= $(SRC_FIXEDWING)/link_mcu.c $(SRC_FIXEDWING)/spi.c $(SRC_ARCH)/spi_hw.c
+  ap.srcs 		+= $(SRC_FIXEDWING)/link_mcu.c mcu_periph/spi.c $(SRC_ARCH)/mcu_periph/spi_arch.c
 else
   # Single MCU's run both
   ap.CFLAGS 		+= $(fbw_CFLAGS)

conf/autopilot/subsystems/fixedwing/spi.makefile

@@ -1,5 +1,5 @@
 #generic spi driver
 $(TARGET).CFLAGS += -DUSE_SPI
 
-ap.srcs += spi.c $(SRC_ARCH)/spi_hw.c
+ap.srcs += mcu_periph/spi.c $(SRC_ARCH)/mcu_periph/spi_arch.c
-sim.srcs += spi.c $(SRC_ARCH)/spi_hw.c
+sim.srcs += mcu_periph/spi.c $(SRC_ARCH)/mcu_periph/spi_arch.c

sw/airborne/arch/avr/mcu_periph/spi_arch.c

@@ -27,7 +27,7 @@
  */
 
 #include CONFIG
-#include "spi.h"
+#include "mcu_periph/spi.h"
 
 #include <inttypes.h>
 #include <avr/io.h>

sw/airborne/arch/lpc21/ADS8344.c

@@ -27,7 +27,7 @@
 #include "armVIC.h"
 #include BOARD_CONFIG
 #include "led.h"
-#include "spi_hw.h"
+#include "mcu_periph/spi.h"
 
 #define ADS8344_SS_IODIR IO0DIR
 #define ADS8344_SS_IOSET IO0SET

sw/airborne/arch/lpc21/mcu_periph/spi_arch.c

@@ -25,7 +25,7 @@
  *  for now only SPI1 ( aka SSP )
  */
 
-#include "spi.h"
+#include "mcu_periph/spi.h"
 
 #include "std.h"
 #include "LPC21xx.h"

sw/airborne/arch/lpc21/modules/display/lcd_dogm_hw.h

@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 #include "std.h"
-#include "spi_hw.h"
+#include "mcu_periph/spi.h"
 #include "led.h"
 
 

sw/airborne/arch/lpc21/modules/sensors/mag_micromag_fw_hw.h

@@ -5,9 +5,9 @@
 
 #include "std.h"
 #include "LPC21xx.h"
-#include "interrupt_hw.h"
+#include "mcu.h"
 
-#include "spi_hw.h"
+#include "mcu_periph/spi.h"
 #include BOARD_CONFIG
 
 #include "generated/airframe.h"

sw/airborne/arch/sim/mcu_periph/spi_arch.c

@@ -0,0 +1,3 @@
+#include "mcu_periph/spi.h"
+
+void spi_init( void ) {}

sw/airborne/arch/sim/spi_hw.c

@@ -1,3 +0,0 @@
-#include "spi.h"
-
-void spi_init( void ) {}

sw/airborne/firmwares/fixedwing/main_ap.c

@@ -61,7 +61,7 @@
 
 
 #ifdef USE_SPI
-#include "spi.h"
+#include "mcu_periph/spi.h"
 #endif
 
 #ifdef TRAFFIC_INFO

sw/airborne/firmwares/fixedwing/main_fbw.c

@@ -37,7 +37,7 @@
 #include "mcu.h"
 
 #include "led.h"
-#include "spi.h"
+#include "mcu_periph/spi.h"
 #include "mcu_periph/adc.h"
 
 #ifdef USE_USB_SERIAL

sw/airborne/link_mcu.c

@@ -23,7 +23,7 @@
  */
 
 #include "link_mcu.h"
-#include "spi.h"
+#include "mcu_periph/spi.h"
 
 struct link_mcu_msg link_mcu_from_ap_msg;
 struct link_mcu_msg link_mcu_from_fbw_msg;

sw/airborne/mcu_periph/spi.c

@@ -23,7 +23,7 @@
  */
 
 #include "std.h"
-#include "spi.h"
+#include "mcu_periph/spi.h"
 
 uint8_t* spi_buffer_input;
 uint8_t* spi_buffer_output;

sw/airborne/mcu_periph/spi.h

@@ -22,7 +22,7 @@
  *
  */
 
-/** \file spi.h
+/** \file mcu_periph/spi.h
  * \brief arch independant SPI (Serial Peripheral Interface) API */
 
 
@@ -32,7 +32,7 @@
 #ifdef USE_SPI
 
 #include "std.h"
-#include "spi_hw.h"
+#include "mcu_periph/spi_arch.h"
 
 extern uint8_t* spi_buffer_input;
 extern uint8_t* spi_buffer_output;

sw/airborne/modules/display/lcd_dogm.h

@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 #include "std.h"
-#include "spi_hw.h"
+#include "mcu_periph/spi.h"
 #include "led.h"
 
 /* EA DOGM163, 3 line LCD at 3.3V */

sw/airborne/modules/ins/fw_ins_vn100.c

@@ -26,8 +26,8 @@
  * \brief driver for the VectorNav VN100 (Fixed-Wing part)
  */
 
-#include "ins_vn100.h"
+#include "modules/ins/ins_vn100.h"
-#include "spi.h"
+#include "mcu_periph/spi.h"
 
 void ins_init( void ) {
 

sw/airborne/modules/max3100/max3100_hw.h

@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 #include "std.h"
-#include "spi_hw.h"
+#include "mcu_periph/spi_hw.h"
 #include "led.h"
 
 /* Pin configuration for max3100 IRQ */

sw/airborne/modules/sensors/baro_MS5534A.c

@@ -28,8 +28,8 @@
  * uses: MOSI, MISO, SCK and 32kHz @ P0.7 with 5V for the -A type
  */
 
-#include "baro_MS5534A.h"
+#include "modules/sensors/baro_MS5534A.h"
-#include "spi.h"
+#include "mcu_periph/spi.h"
 #include "mcu_periph/uart.h"
 #ifndef BARO_NO_DOWNLINK
 #include "ap_downlink.h"

sw/airborne/modules/sensors/baro_scp.c

@@ -1,16 +1,15 @@
 #include "std.h"
-#include "init_hw.h"
 #include "sys_time.h"
 #include "led.h"
-#include "interrupt_hw.h"
+#include "mcu.h"
 
 #include "mcu_periph/uart.h"
 #include "messages.h"
 #include "downlink.h"
 
-#include "spi_hw.h"
+#include "mcu_periph/spi.h"
 
-#include "baro_scp.h"
+#include "modules/sensors/baro_scp.h"
 
 #ifndef SENSOR_SYNC_SEND
 #warning set SENSOR_SYNC_SEND to use baro_scp

sw/airborne/sd_card/main.c

@@ -11,7 +11,7 @@
 #include "generated/settings.h"
 #include "dl_protocol.h"
 
-#include "spi.h"
+#include "mcu_periph/spi.h"
 #include "sd_card.h"
 
 static inline void main_init( void );