aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2016-05-11 14:02:06 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2016-05-11 14:02:06 +0000
commitc5fc09cf76bf00428716cdd9bb9d7c48da4475ae (patch)
treee57fe415bba3812a0c2ed3d002592c46d3239b6b
parente6864865cc672b314ee987f1bf4fd3e793ffd0f6 (diff)
downloadChibiOS-c5fc09cf76bf00428716cdd9bb9d7c48da4475ae.tar.gz
ChibiOS-c5fc09cf76bf00428716cdd9bb9d7c48da4475ae.tar.bz2
ChibiOS-c5fc09cf76bf00428716cdd9bb9d7c48da4475ae.zip
N25Q128 driver files renamed for consistency.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9466 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/ex/Micron/n25q128_spi.c (renamed from os/ex/Micron/n25q128.c)8
-rw-r--r--os/ex/Micron/n25q128_spi.h (renamed from os/ex/Micron/n25q128.h)5
-rw-r--r--os/ex/Micron/n25q128_spi.mk (renamed from os/ex/Micron/n25q128.mk)2
-rw-r--r--testhal/STM32/STM32F3xx/SPI-N25Q128/Makefile2
-rw-r--r--testhal/STM32/STM32F3xx/SPI-N25Q128/main.c2
5 files changed, 10 insertions, 9 deletions
diff --git a/os/ex/Micron/n25q128.c b/os/ex/Micron/n25q128_spi.c
index 9ec25ae8b..9bc5bf295 100644
--- a/os/ex/Micron/n25q128.c
+++ b/os/ex/Micron/n25q128_spi.c
@@ -18,16 +18,16 @@
*/
/**
- * @file n25q128.c
- * @brief N25Q128 flash interface module code.
+ * @file n25q128_spi.c
+ * @brief N25Q128 over SPI driver code.
*
- * @addtogroup n25q128
+ * @addtogroup n25q128_spi
* @{
*/
#include "hal.h"
-#include "n25q128.h"
+#include "n25q128_spi.h"
/*===========================================================================*/
/* Driver local definitions. */
diff --git a/os/ex/Micron/n25q128.h b/os/ex/Micron/n25q128_spi.h
index c6bff3797..0dd019e35 100644
--- a/os/ex/Micron/n25q128.h
+++ b/os/ex/Micron/n25q128_spi.h
@@ -18,9 +18,10 @@
*/
/**
- * @file n25q128.h
- * @brief N25Q128 flash interface module header.
+ * @file n25q128_spi.h
+ * @brief N25Q128 over SPI driver header.
*
+ * @addtogroup n25q128_spi
* @{
*/
diff --git a/os/ex/Micron/n25q128.mk b/os/ex/Micron/n25q128_spi.mk
index 2e81cd919..a2ad6bcbd 100644
--- a/os/ex/Micron/n25q128.mk
+++ b/os/ex/Micron/n25q128_spi.mk
@@ -1,6 +1,6 @@
# List of all the N25Q128 device files.
N25Q128SRC := $(CHIBIOS)/os/hal/lib/peripherals/flash/hal_flash.c \
- $(CHIBIOS)/os/ex/Micron/n25q128.c
+ $(CHIBIOS)/os/ex/Micron/n25q128_spi.c
# Required include directories
N25Q128INC := $(CHIBIOS)/os/hal/lib/peripherals/flash \
diff --git a/testhal/STM32/STM32F3xx/SPI-N25Q128/Makefile b/testhal/STM32/STM32F3xx/SPI-N25Q128/Makefile
index be1072f8a..da75f7dc1 100644
--- a/testhal/STM32/STM32F3xx/SPI-N25Q128/Makefile
+++ b/testhal/STM32/STM32F3xx/SPI-N25Q128/Makefile
@@ -98,7 +98,7 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
-include $(CHIBIOS)/os/ex/Micron/n25q128.mk
+include $(CHIBIOS)/os/ex/Micron/n25q128_spi.mk
include $(CHIBIOS)/os/ex/subsystems/mfs/mfs.mk
# Define linker script file here
diff --git a/testhal/STM32/STM32F3xx/SPI-N25Q128/main.c b/testhal/STM32/STM32F3xx/SPI-N25Q128/main.c
index ef9a06a41..daababdf8 100644
--- a/testhal/STM32/STM32F3xx/SPI-N25Q128/main.c
+++ b/testhal/STM32/STM32F3xx/SPI-N25Q128/main.c
@@ -17,7 +17,7 @@
#include "ch.h"
#include "hal.h"
-#include "n25q128.h"
+#include "n25q128_spi.h"
/*
* Maximum speed SPI configuration (18MHz, CPHA=0, CPOL=0, MSb first).