Rename old SPI API to -legacy.h

arch/cpu/cc2538/dev/spi-arch-legacy.h

@@ -138,7 +138,7 @@
 #define SPI_WAITFOREOTx()               SPIX_WAITFOREOTx(SPI_DEFAULT_INSTANCE)
 #define SPI_WAITFOREORx()               SPIX_WAITFOREORx(SPI_DEFAULT_INSTANCE)
 #ifdef SPI_FLUSH
-#error You must include spi-arch-legacy.h before spi.h for the CC2538
+#error You must include spi-arch-legacy.h before spi-legacy.h for the CC2538
 #else
 #define SPI_FLUSH()                     SPIX_FLUSH(SPI_DEFAULT_INSTANCE)
 #endif

arch/cpu/cc2538/dev/spi-arch.c

@@ -37,7 +37,6 @@
 #include "sys/cc.h"
 #include "ioc.h"
 #include "sys-ctrl.h"
-#include "spi.h"
 #include "ssi.h"
 #include "gpio.h"
 #include "sys/log.h"

arch/cpu/cc2538/dev/spi-legacy.c

@@ -43,7 +43,7 @@
 #include "sys/cc.h"
 #include "dev/ioc.h"
 #include "dev/sys-ctrl.h"
-#include "dev/spi.h"
+#include "dev/spi-legacy.h"
 #include "dev/ssi.h"
 #include "dev/gpio.h"
 /*---------------------------------------------------------------------------*/

arch/cpu/msp430/cc2420-arch-sfd.c

@@ -29,7 +29,7 @@
  */
 
 #include "contiki.h"
-#include "dev/spi.h"
+#include "dev/spi-legacy.h"
 #include "cc2420.h"
 #include "isr_compat.h"
 

arch/cpu/msp430/cc2420-arch.c

@@ -31,7 +31,7 @@
 #include "contiki.h"
 #include "contiki-net.h"
 
-#include "dev/spi.h"
+#include "dev/spi-legacy.h"
 #include "cc2420.h"
 #include "isr_compat.h"
 

arch/cpu/msp430/cc2520-arch-sfd.c

@@ -28,7 +28,7 @@
  */
 
 #include "contiki.h"
-#include "dev/spi.h"
+#include "dev/spi-legacy.h"
 #include "dev/cc2520/cc2520.h"
 #include "isr_compat.h"
 

arch/cpu/msp430/cc2520-arch.c

@@ -30,7 +30,7 @@
 #include "contiki.h"
 #include "contiki-net.h"
 
-#include "dev/spi.h"
+#include "dev/spi-legacy.h"
 #include "dev/cc2520/cc2520.h"
 #include "isr_compat.h"
 

arch/dev/cc2420/cc2420.c

@@ -39,7 +39,7 @@
 #include "sys/energest.h"
 
 #include "dev/leds.h"
-#include "dev/spi.h"
+#include "dev/spi-legacy.h"
 #include "cc2420.h"
 #include "cc2420_const.h"
 

arch/dev/cc2420/cc2420.h

@@ -43,7 +43,7 @@
 #define CC2420_H_
 
 #include "contiki.h"
-#include "dev/spi.h"
+#include "dev/spi-legacy.h"
 #include "dev/radio.h"
 #include "cc2420_const.h"
 #include "lib/aes-128.h"

arch/platform/sky/dev/i2c.c

@@ -41,7 +41,7 @@
 
 #include <stdio.h>
 #include <contiki.h>
-#include <dev/spi.h>
+#include "dev/spi-legacy.h"
 #include <dev/leds.h>
 
 #include "dev/i2c.h"

arch/platform/sky/dev/xmem.c

@@ -43,7 +43,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "dev/spi.h"
+#include "dev/spi-legacy.h"
 #include "dev/xmem.h"
 #include "dev/watchdog.h"
 

arch/platform/zoul/dev/cc1200-zoul-arch.c

@@ -49,7 +49,7 @@
 #include "dev/spi-arch-legacy.h"
 #include "dev/ioc.h"
 #include "dev/sys-ctrl.h"
-#include "dev/spi.h"
+#include "dev/spi-legacy.h"
 #include "dev/ssi.h"
 #include "dev/gpio.h"
 #include "dev/gpio-hal.h"

arch/platform/zoul/dev/mmc-arch.c

@@ -42,7 +42,7 @@
 #include "dev/spi-arch-legacy.h"
 #include "dev/ioc.h"
 #include "dev/gpio.h"
-#include "dev/spi.h"
+#include "dev/spi-legacy.h"
 #include "mmc-arch.h"
 
 #define USD_SEL_PORT_BASE       GPIO_PORT_TO_BASE(USD_SEL_PORT)

arch/platform/zoul/orion/enc28j60-arch-spi.c

@@ -44,7 +44,7 @@
  */
 /*---------------------------------------------------------------------------*/
 #include "dev/spi-arch-legacy.h"
-#include "spi.h"
+#include "dev/spi-legacy.h"
 #include "dev/gpio.h"
 /*---------------------------------------------------------------------------*/
 #define RESET_PORT  GPIO_PORT_TO_BASE(ETH_RESET_PORT)

os/dev/spi-legacy.h

@@ -36,8 +36,8 @@
  *         Niclas Finne <nfi@sics.se>
  */
 
-#ifndef SPI_H_
+#ifndef SPI_LEGACY_H_
-#define SPI_H_
+#define SPI_LEGACY_H_
 
 /* Define macros to use for checking SPI transmission status depending
    on if it is possible to wait for TX buffer ready. This is possible
@@ -89,4 +89,4 @@ void spi_init(void);
   } while(0)
 #endif
 
-#endif /* SPI_H_ */
+#endif /* SPI_LEGACY_H_ */