From ee4e287fc5d3e34bb5e1f97c880af111ecd30340 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Fri, 2 Mar 2018 20:17:46 +0000 Subject: [PATCH] Rename old SPI API to -legacy.h --- arch/cpu/cc2538/dev/spi-arch-legacy.h | 2 +- arch/cpu/cc2538/dev/spi-arch.c | 1 - arch/cpu/cc2538/dev/spi-legacy.c | 2 +- arch/cpu/msp430/cc2420-arch-sfd.c | 2 +- arch/cpu/msp430/cc2420-arch.c | 2 +- arch/cpu/msp430/cc2520-arch-sfd.c | 2 +- arch/cpu/msp430/cc2520-arch.c | 2 +- arch/dev/cc2420/cc2420.c | 2 +- arch/dev/cc2420/cc2420.h | 2 +- arch/platform/sky/dev/i2c.c | 2 +- arch/platform/sky/dev/xmem.c | 2 +- arch/platform/zoul/dev/cc1200-zoul-arch.c | 2 +- arch/platform/zoul/dev/mmc-arch.c | 2 +- arch/platform/zoul/orion/enc28j60-arch-spi.c | 2 +- os/dev/{spi.h => spi-legacy.h} | 6 +++--- 15 files changed, 16 insertions(+), 17 deletions(-) rename os/dev/{spi.h => spi-legacy.h} (97%) diff --git a/arch/cpu/cc2538/dev/spi-arch-legacy.h b/arch/cpu/cc2538/dev/spi-arch-legacy.h index 0204baefa..de7a765bb 100644 --- a/arch/cpu/cc2538/dev/spi-arch-legacy.h +++ b/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 diff --git a/arch/cpu/cc2538/dev/spi-arch.c b/arch/cpu/cc2538/dev/spi-arch.c index 3493af509..49563e15e 100644 --- a/arch/cpu/cc2538/dev/spi-arch.c +++ b/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" diff --git a/arch/cpu/cc2538/dev/spi-legacy.c b/arch/cpu/cc2538/dev/spi-legacy.c index 417886638..0070df6ef 100644 --- a/arch/cpu/cc2538/dev/spi-legacy.c +++ b/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" /*---------------------------------------------------------------------------*/ diff --git a/arch/cpu/msp430/cc2420-arch-sfd.c b/arch/cpu/msp430/cc2420-arch-sfd.c index 6ab9a1365..d1db81ce0 100644 --- a/arch/cpu/msp430/cc2420-arch-sfd.c +++ b/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" diff --git a/arch/cpu/msp430/cc2420-arch.c b/arch/cpu/msp430/cc2420-arch.c index 8a6f0234d..c35ce949f 100644 --- a/arch/cpu/msp430/cc2420-arch.c +++ b/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" diff --git a/arch/cpu/msp430/cc2520-arch-sfd.c b/arch/cpu/msp430/cc2520-arch-sfd.c index e2671ca58..dc0561f94 100644 --- a/arch/cpu/msp430/cc2520-arch-sfd.c +++ b/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" diff --git a/arch/cpu/msp430/cc2520-arch.c b/arch/cpu/msp430/cc2520-arch.c index 855f8bc7e..e63735271 100644 --- a/arch/cpu/msp430/cc2520-arch.c +++ b/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" diff --git a/arch/dev/cc2420/cc2420.c b/arch/dev/cc2420/cc2420.c index 00ec64675..9310ec9e4 100644 --- a/arch/dev/cc2420/cc2420.c +++ b/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" diff --git a/arch/dev/cc2420/cc2420.h b/arch/dev/cc2420/cc2420.h index 74b641ad6..a030632a6 100644 --- a/arch/dev/cc2420/cc2420.h +++ b/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" diff --git a/arch/platform/sky/dev/i2c.c b/arch/platform/sky/dev/i2c.c index b9d10a9c7..1acbe897a 100644 --- a/arch/platform/sky/dev/i2c.c +++ b/arch/platform/sky/dev/i2c.c @@ -41,7 +41,7 @@ #include #include -#include +#include "dev/spi-legacy.h" #include #include "dev/i2c.h" diff --git a/arch/platform/sky/dev/xmem.c b/arch/platform/sky/dev/xmem.c index 21814ad04..4ff525bb8 100644 --- a/arch/platform/sky/dev/xmem.c +++ b/arch/platform/sky/dev/xmem.c @@ -43,7 +43,7 @@ #include #include -#include "dev/spi.h" +#include "dev/spi-legacy.h" #include "dev/xmem.h" #include "dev/watchdog.h" diff --git a/arch/platform/zoul/dev/cc1200-zoul-arch.c b/arch/platform/zoul/dev/cc1200-zoul-arch.c index fb60d1efc..8c9d8cdd7 100644 --- a/arch/platform/zoul/dev/cc1200-zoul-arch.c +++ b/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" diff --git a/arch/platform/zoul/dev/mmc-arch.c b/arch/platform/zoul/dev/mmc-arch.c index 2896448b0..f1eca8d32 100644 --- a/arch/platform/zoul/dev/mmc-arch.c +++ b/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) diff --git a/arch/platform/zoul/orion/enc28j60-arch-spi.c b/arch/platform/zoul/orion/enc28j60-arch-spi.c index e68452f89..bc9c9dadd 100644 --- a/arch/platform/zoul/orion/enc28j60-arch-spi.c +++ b/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) diff --git a/os/dev/spi.h b/os/dev/spi-legacy.h similarity index 97% rename from os/dev/spi.h rename to os/dev/spi-legacy.h index 5960c411b..d1600c785 100644 --- a/os/dev/spi.h +++ b/os/dev/spi-legacy.h @@ -36,8 +36,8 @@ * Niclas Finne */ -#ifndef SPI_H_ -#define SPI_H_ +#ifndef SPI_LEGACY_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_ */