From ad17b4b8c53ac6f31e7cc92f1697754c12485040 Mon Sep 17 00:00:00 2001
From: Antoine Drouin <poinix@gmail.com>
Date: Sun, 5 Dec 2010 02:51:22 +0100
Subject: [PATCH] moved spi to mcu_periph/spi

---
 conf/autopilot/csc_baro.makefile                           | 2 +-
 conf/autopilot/subsystems/fixedwing/autopilot.makefile     | 4 ++--
 conf/autopilot/subsystems/fixedwing/spi.makefile           | 4 ++--
 sw/airborne/arch/avr/{spi_hw.c => mcu_periph/spi_arch.c}   | 2 +-
 sw/airborne/arch/avr/{spi_hw.h => mcu_periph/spi_arch.h}   | 0
 sw/airborne/arch/lpc21/ADS8344.c                           | 2 +-
 sw/airborne/arch/lpc21/{spi_hw.c => mcu_periph/spi_arch.c} | 2 +-
 sw/airborne/arch/lpc21/{spi_hw.h => mcu_periph/spi_arch.h} | 0
 sw/airborne/arch/lpc21/modules/display/lcd_dogm_hw.h       | 2 +-
 .../arch/lpc21/modules/sensors/mag_micromag_fw_hw.h        | 4 ++--
 sw/airborne/arch/sim/mcu_periph/spi_arch.c                 | 3 +++
 sw/airborne/arch/sim/{spi_hw.h => mcu_periph/spi_arch.h}   | 0
 sw/airborne/arch/sim/spi_hw.c                              | 3 ---
 sw/airborne/firmwares/fixedwing/main_ap.c                  | 2 +-
 sw/airborne/firmwares/fixedwing/main_fbw.c                 | 2 +-
 sw/airborne/link_mcu.c                                     | 2 +-
 sw/airborne/{ => mcu_periph}/spi.c                         | 2 +-
 sw/airborne/{ => mcu_periph}/spi.h                         | 4 ++--
 sw/airborne/modules/display/lcd_dogm.h                     | 2 +-
 sw/airborne/modules/ins/fw_ins_vn100.c                     | 4 ++--
 sw/airborne/modules/max3100/max3100_hw.h                   | 2 +-
 sw/airborne/modules/sensors/baro_MS5534A.c                 | 4 ++--
 sw/airborne/modules/sensors/baro_scp.c                     | 7 +++----
 sw/airborne/sd_card/main.c                                 | 2 +-
 24 files changed, 30 insertions(+), 31 deletions(-)
 rename sw/airborne/arch/avr/{spi_hw.c => mcu_periph/spi_arch.c} (99%)
 rename sw/airborne/arch/avr/{spi_hw.h => mcu_periph/spi_arch.h} (100%)
 rename sw/airborne/arch/lpc21/{spi_hw.c => mcu_periph/spi_arch.c} (99%)
 rename sw/airborne/arch/lpc21/{spi_hw.h => mcu_periph/spi_arch.h} (100%)
 create mode 100644 sw/airborne/arch/sim/mcu_periph/spi_arch.c
 rename sw/airborne/arch/sim/{spi_hw.h => mcu_periph/spi_arch.h} (100%)
 delete mode 100644 sw/airborne/arch/sim/spi_hw.c
 rename sw/airborne/{ => mcu_periph}/spi.c (97%)
 rename sw/airborne/{ => mcu_periph}/spi.h (96%)

diff --git a/conf/autopilot/csc_baro.makefile b/conf/autopilot/csc_baro.makefile
index cb2444b04d..c233cdc6f0 100644
--- a/conf/autopilot/csc_baro.makefile
+++ b/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
 
diff --git a/conf/autopilot/subsystems/fixedwing/autopilot.makefile b/conf/autopilot/subsystems/fixedwing/autopilot.makefile
index 186f441ee8..075eae6ae9 100644
--- a/conf/autopilot/subsystems/fixedwing/autopilot.makefile
+++ b/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)
diff --git a/conf/autopilot/subsystems/fixedwing/spi.makefile b/conf/autopilot/subsystems/fixedwing/spi.makefile
index 42106f69f5..d6ff15a24a 100644
--- a/conf/autopilot/subsystems/fixedwing/spi.makefile
+++ b/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
-sim.srcs += spi.c $(SRC_ARCH)/spi_hw.c
+ap.srcs += mcu_periph/spi.c $(SRC_ARCH)/mcu_periph/spi_arch.c
+sim.srcs += mcu_periph/spi.c $(SRC_ARCH)/mcu_periph/spi_arch.c
diff --git a/sw/airborne/arch/avr/spi_hw.c b/sw/airborne/arch/avr/mcu_periph/spi_arch.c
similarity index 99%
rename from sw/airborne/arch/avr/spi_hw.c
rename to sw/airborne/arch/avr/mcu_periph/spi_arch.c
index eb30bcc7af..558b06a7e2 100644
--- a/sw/airborne/arch/avr/spi_hw.c
+++ b/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>
diff --git a/sw/airborne/arch/avr/spi_hw.h b/sw/airborne/arch/avr/mcu_periph/spi_arch.h
similarity index 100%
rename from sw/airborne/arch/avr/spi_hw.h
rename to sw/airborne/arch/avr/mcu_periph/spi_arch.h
diff --git a/sw/airborne/arch/lpc21/ADS8344.c b/sw/airborne/arch/lpc21/ADS8344.c
index dd72abcac8..49ce4dd027 100644
--- a/sw/airborne/arch/lpc21/ADS8344.c
+++ b/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
diff --git a/sw/airborne/arch/lpc21/spi_hw.c b/sw/airborne/arch/lpc21/mcu_periph/spi_arch.c
similarity index 99%
rename from sw/airborne/arch/lpc21/spi_hw.c
rename to sw/airborne/arch/lpc21/mcu_periph/spi_arch.c
index 5c29360fe6..614704b944 100644
--- a/sw/airborne/arch/lpc21/spi_hw.c
+++ b/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"
diff --git a/sw/airborne/arch/lpc21/spi_hw.h b/sw/airborne/arch/lpc21/mcu_periph/spi_arch.h
similarity index 100%
rename from sw/airborne/arch/lpc21/spi_hw.h
rename to sw/airborne/arch/lpc21/mcu_periph/spi_arch.h
diff --git a/sw/airborne/arch/lpc21/modules/display/lcd_dogm_hw.h b/sw/airborne/arch/lpc21/modules/display/lcd_dogm_hw.h
index 3897cf2a0d..14f6640e49 100644
--- a/sw/airborne/arch/lpc21/modules/display/lcd_dogm_hw.h
+++ b/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"
 
 
diff --git a/sw/airborne/arch/lpc21/modules/sensors/mag_micromag_fw_hw.h b/sw/airborne/arch/lpc21/modules/sensors/mag_micromag_fw_hw.h
index 9f9b38e6ae..2ea2218424 100644
--- a/sw/airborne/arch/lpc21/modules/sensors/mag_micromag_fw_hw.h
+++ b/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"
diff --git a/sw/airborne/arch/sim/mcu_periph/spi_arch.c b/sw/airborne/arch/sim/mcu_periph/spi_arch.c
new file mode 100644
index 0000000000..43ec2e48d4
--- /dev/null
+++ b/sw/airborne/arch/sim/mcu_periph/spi_arch.c
@@ -0,0 +1,3 @@
+#include "mcu_periph/spi.h"
+
+void spi_init( void ) {}
diff --git a/sw/airborne/arch/sim/spi_hw.h b/sw/airborne/arch/sim/mcu_periph/spi_arch.h
similarity index 100%
rename from sw/airborne/arch/sim/spi_hw.h
rename to sw/airborne/arch/sim/mcu_periph/spi_arch.h
diff --git a/sw/airborne/arch/sim/spi_hw.c b/sw/airborne/arch/sim/spi_hw.c
deleted file mode 100644
index cd0b3ece6e..0000000000
--- a/sw/airborne/arch/sim/spi_hw.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "spi.h"
-
-void spi_init( void ) {}
diff --git a/sw/airborne/firmwares/fixedwing/main_ap.c b/sw/airborne/firmwares/fixedwing/main_ap.c
index e7c0259272..b3f2cf590b 100644
--- a/sw/airborne/firmwares/fixedwing/main_ap.c
+++ b/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
diff --git a/sw/airborne/firmwares/fixedwing/main_fbw.c b/sw/airborne/firmwares/fixedwing/main_fbw.c
index 4d9489e658..f4bba8c24f 100644
--- a/sw/airborne/firmwares/fixedwing/main_fbw.c
+++ b/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
diff --git a/sw/airborne/link_mcu.c b/sw/airborne/link_mcu.c
index 1bb27affce..f7cbcc9322 100644
--- a/sw/airborne/link_mcu.c
+++ b/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;
diff --git a/sw/airborne/spi.c b/sw/airborne/mcu_periph/spi.c
similarity index 97%
rename from sw/airborne/spi.c
rename to sw/airborne/mcu_periph/spi.c
index 5ca6193333..2451ed7e79 100644
--- a/sw/airborne/spi.c
+++ b/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;
diff --git a/sw/airborne/spi.h b/sw/airborne/mcu_periph/spi.h
similarity index 96%
rename from sw/airborne/spi.h
rename to sw/airborne/mcu_periph/spi.h
index dd6b0fe8f9..9cdd614a4b 100644
--- a/sw/airborne/spi.h
+++ b/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;
diff --git a/sw/airborne/modules/display/lcd_dogm.h b/sw/airborne/modules/display/lcd_dogm.h
index 8dfa74d1fb..17f68f753d 100644
--- a/sw/airborne/modules/display/lcd_dogm.h
+++ b/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 */
diff --git a/sw/airborne/modules/ins/fw_ins_vn100.c b/sw/airborne/modules/ins/fw_ins_vn100.c
index 5ec9cf2c62..1b08545606 100644
--- a/sw/airborne/modules/ins/fw_ins_vn100.c
+++ b/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 "spi.h"
+#include "modules/ins/ins_vn100.h"
+#include "mcu_periph/spi.h"
 
 void ins_init( void ) {
 
diff --git a/sw/airborne/modules/max3100/max3100_hw.h b/sw/airborne/modules/max3100/max3100_hw.h
index fb3f831334..0847bedf04 100644
--- a/sw/airborne/modules/max3100/max3100_hw.h
+++ b/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 */
diff --git a/sw/airborne/modules/sensors/baro_MS5534A.c b/sw/airborne/modules/sensors/baro_MS5534A.c
index 5d931dec48..10e97df7d4 100644
--- a/sw/airborne/modules/sensors/baro_MS5534A.c
+++ b/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 "spi.h"
+#include "modules/sensors/baro_MS5534A.h"
+#include "mcu_periph/spi.h"
 #include "mcu_periph/uart.h"
 #ifndef BARO_NO_DOWNLINK
 #include "ap_downlink.h"
diff --git a/sw/airborne/modules/sensors/baro_scp.c b/sw/airborne/modules/sensors/baro_scp.c
index 1698a77f3e..edcaa34ae1 100644
--- a/sw/airborne/modules/sensors/baro_scp.c
+++ b/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
diff --git a/sw/airborne/sd_card/main.c b/sw/airborne/sd_card/main.c
index b8f400b780..a77f922b58 100644
--- a/sw/airborne/sd_card/main.c
+++ b/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 );