From 2cad6263608bd904153c1a0879480b34bf6c52e0 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Fri, 2 Mar 2018 20:37:28 +0000
Subject: [PATCH] Rename new SPI API to spi.[ch]

---
 arch/cpu/cc2538/dev/spi-arch.c        | 2 +-
 arch/cpu/cc26xx-cc13xx/dev/spi-arch.c | 2 +-
 os/dev/ext-flash.c                    | 2 +-
 os/dev/ext-flash.h                    | 3 +--
 os/dev/{spi-hal.c => spi.c}           | 3 +--
 os/dev/{spi-hal.h => spi.h}           | 6 +++---
 6 files changed, 8 insertions(+), 10 deletions(-)
 rename os/dev/{spi-hal.c => spi.c} (99%)
 rename os/dev/{spi-hal.h => spi.h} (99%)

diff --git a/arch/cpu/cc2538/dev/spi-arch.c b/arch/cpu/cc2538/dev/spi-arch.c
index 49563e15e..5dc44524a 100644
--- a/arch/cpu/cc2538/dev/spi-arch.c
+++ b/arch/cpu/cc2538/dev/spi-arch.c
@@ -32,7 +32,7 @@
 #include <stdint.h>
 #include "contiki.h"
 #include "reg.h"
-#include "spi-hal.h"
+#include "dev/spi.h"
 #include "gpio-hal-arch.h"
 #include "sys/cc.h"
 #include "ioc.h"
diff --git a/arch/cpu/cc26xx-cc13xx/dev/spi-arch.c b/arch/cpu/cc26xx-cc13xx/dev/spi-arch.c
index cab47d9fa..bda3abbe2 100644
--- a/arch/cpu/cc26xx-cc13xx/dev/spi-arch.c
+++ b/arch/cpu/cc26xx-cc13xx/dev/spi-arch.c
@@ -29,7 +29,7 @@
  */
 #include "contiki.h"
 #include "ti-lib.h"
-#include "spi-hal.h"
+#include "dev/spi.h"
 #include "sys/mutex.h"
 
 #include <stdint.h>
diff --git a/os/dev/ext-flash.c b/os/dev/ext-flash.c
index b1f428e11..7a0e6735b 100644
--- a/os/dev/ext-flash.c
+++ b/os/dev/ext-flash.c
@@ -38,7 +38,7 @@
 /*---------------------------------------------------------------------------*/
 #include "contiki.h"
 #include "ext-flash.h"
-#include "spi-hal.h"
+#include "dev/spi.h"
 #include "gpio-hal.h"
 #include "sys/log.h"
 
diff --git a/os/dev/ext-flash.h b/os/dev/ext-flash.h
index a14ccdbf0..14017ab46 100644
--- a/os/dev/ext-flash.h
+++ b/os/dev/ext-flash.h
@@ -42,8 +42,7 @@
 #ifndef EXT_FLASH_H_
 #define EXT_FLASH_H_
 /*---------------------------------------------------------------------------*/
-#include "spi-hal.h"
-
+#include "dev/spi.h"
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdbool.h>
diff --git a/os/dev/spi-hal.c b/os/dev/spi.c
similarity index 99%
rename from os/dev/spi-hal.c
rename to os/dev/spi.c
index f4810a97a..d1d678a18 100644
--- a/os/dev/spi-hal.c
+++ b/os/dev/spi.c
@@ -37,9 +37,8 @@
  *     Implementation of the platform-independent aspects of the SPI HAL
  */
 /*---------------------------------------------------------------------------*/
+#include <dev/spi.h>
 #include "contiki.h"
-#include "spi-hal.h"
-
 #include <stdint.h>
 #include <stdbool.h>
 /*---------------------------------------------------------------------------*/
diff --git a/os/dev/spi-hal.h b/os/dev/spi.h
similarity index 99%
rename from os/dev/spi-hal.h
rename to os/dev/spi.h
index b8172bd57..95d079263 100644
--- a/os/dev/spi-hal.h
+++ b/os/dev/spi.h
@@ -45,8 +45,8 @@
  *     Header file for the SPI HAL
  */
 /*---------------------------------------------------------------------------*/
-#ifndef SPI_HAL_H_
-#define SPI_HAL_H_
+#ifndef SPI_H_
+#define SPI_H_
 /*---------------------------------------------------------------------------*/
 #include "contiki.h"
 #include "gpio-hal.h"
@@ -358,7 +358,7 @@ spi_status_t spi_arch_select(spi_device_t *dev);
  */
 spi_status_t spi_arch_deselect(spi_device_t *dev);
 
-#endif /* SPI_HAL_H_ */
+#endif /* SPI_H_ */
 /*---------------------------------------------------------------------------*/
 /**
  * @}