From 8bd7175893bc05ed967b44da1977d6c5108c6afa Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sun, 7 Oct 2018 12:06:42 +0000 Subject: [PATCH] Renamed for consistency. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12347 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- os/hal/lib/complex/mfs/{mfs.c => hal_mfs.c} | 6 +++--- os/hal/lib/complex/mfs/{mfs.h => hal_mfs.h} | 10 +++++----- os/hal/lib/complex/mfs/{mfs.mk => hal_mfs.mk} | 2 +- .../serial_nor/devices/micron_n25q/hal_flash_device.c | 2 +- .../serial_nor/devices/micron_n25q/hal_flash_device.h | 2 +- os/hal/lib/complex/serial_nor/hal_serial_nor.c | 8 ++++---- test/mfs/configuration.xml | 8 ++++---- test/mfs/source/test/mfs_test_root.c | 2 +- test/mfs/source/test/mfs_test_root.h | 2 +- test/mfs/source/test/mfs_test_sequence_001.c | 2 +- test/mfs/source/test/mfs_test_sequence_002.c | 2 +- testhal/STM32/multi/WSPI-MFS/main.c | 2 +- .../STM32/multi/WSPI-MFS/make/stm32l476_discovery.make | 2 +- 13 files changed, 25 insertions(+), 25 deletions(-) rename os/hal/lib/complex/mfs/{mfs.c => hal_mfs.c} (96%) rename os/hal/lib/complex/mfs/{mfs.h => hal_mfs.h} (95%) rename os/hal/lib/complex/mfs/{mfs.mk => hal_mfs.mk} (73%) diff --git a/os/hal/lib/complex/mfs/mfs.c b/os/hal/lib/complex/mfs/hal_mfs.c similarity index 96% rename from os/hal/lib/complex/mfs/mfs.c rename to os/hal/lib/complex/mfs/hal_mfs.c index 32ae2432a..d37326134 100644 --- a/os/hal/lib/complex/mfs/mfs.c +++ b/os/hal/lib/complex/mfs/hal_mfs.c @@ -18,7 +18,7 @@ */ /** - * @file mfs.c + * @file hal_mfs.c * @brief Managed Flash Storage module code. * @details This module manages a flash partition as a generic storage where * arbitrary data records can be created, updated, deleted and @@ -30,7 +30,7 @@ * banks (where possible) caused by power loss during operations. * Both operations are transparent to the user. * - * @addtogroup MFS + * @addtogroup HAL_MFS * @{ */ @@ -38,7 +38,7 @@ #include "hal.h" -#include "mfs.h" +#include "hal_mfs.h" /*===========================================================================*/ /* Driver local definitions. */ diff --git a/os/hal/lib/complex/mfs/mfs.h b/os/hal/lib/complex/mfs/hal_mfs.h similarity index 95% rename from os/hal/lib/complex/mfs/mfs.h rename to os/hal/lib/complex/mfs/hal_mfs.h index d41dcf9bf..19c9b195f 100644 --- a/os/hal/lib/complex/mfs/mfs.h +++ b/os/hal/lib/complex/mfs/hal_mfs.h @@ -18,15 +18,15 @@ */ /** - * @file mfs.h + * @file hal_mfs.h * @brief Managed Flash Storage module header. * - * @addtogroup MFS + * @addtogroup HAL_MFS * @{ */ -#ifndef MFS_H -#define MFS_H +#ifndef HAL_MFS_H +#define HAL_MFS_H #include "hal_flash.h" @@ -364,7 +364,7 @@ extern "C" { } #endif -#endif /* MFS_H */ +#endif /* HAL_MFS_H */ /** @} */ diff --git a/os/hal/lib/complex/mfs/mfs.mk b/os/hal/lib/complex/mfs/hal_mfs.mk similarity index 73% rename from os/hal/lib/complex/mfs/mfs.mk rename to os/hal/lib/complex/mfs/hal_mfs.mk index b1b67bb61..6448737b8 100644 --- a/os/hal/lib/complex/mfs/mfs.mk +++ b/os/hal/lib/complex/mfs/hal_mfs.mk @@ -1,5 +1,5 @@ # List of all the MFS subsystem files. -MFSSRC := $(CHIBIOS)/os/hal/lib/complex/mfs/mfs.c +MFSSRC := $(CHIBIOS)/os/hal/lib/complex/mfs/hal_mfs.c # Required include directories MFSINC := $(CHIBIOS)/os/hal/lib/complex/mfs diff --git a/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.c b/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.c index 1bba8f99a..e82af004d 100644 --- a/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.c +++ b/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.c @@ -15,7 +15,7 @@ */ /** - * @file flash_device.c + * @file hal_flash_device.c * @brief Micron N25Q serial flash driver code. * * @addtogroup MICRON_N25Q diff --git a/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.h b/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.h index 22b024b95..1f13f0c82 100644 --- a/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.h +++ b/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.h @@ -15,7 +15,7 @@ */ /** - * @file flash_device.h + * @file hal_flash_device.h * @brief Micron N25Q serial flash driver header. * * @addtogroup MICRON_N25Q diff --git a/os/hal/lib/complex/serial_nor/hal_serial_nor.c b/os/hal/lib/complex/serial_nor/hal_serial_nor.c index b21d09694..95d4ac267 100644 --- a/os/hal/lib/complex/serial_nor/hal_serial_nor.c +++ b/os/hal/lib/complex/serial_nor/hal_serial_nor.c @@ -15,11 +15,11 @@ */ /** - * @file m25q.c - * @brief M25Q serial flash driver code. + * @file hal_serial_nor.c + * @brief Serial NOR serial flash driver code. * - * @addtogroup M25Q - * @ingroup M25Q + * @addtogroup HAL_SERIAL_NOR + * @ingroup HAL_SERIAL_NOR * @{ */ diff --git a/test/mfs/configuration.xml b/test/mfs/configuration.xml index d89368ebc..a222033f8 100644 --- a/test/mfs/configuration.xml +++ b/test/mfs/configuration.xml @@ -38,7 +38,7 @@ mfs_ - - -#include "mfs.h" +#include "hal_mfs.h" static const uint8_t pattern1[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 @@ -879,7 +879,7 @@ test_assert(bank_verify_erased(MFS_BANK_0) == FLASH_NO_ERROR, "bank 0 not erased - + diff --git a/test/mfs/source/test/mfs_test_root.c b/test/mfs/source/test/mfs_test_root.c index ce23aaac6..447278610 100644 --- a/test/mfs/source/test/mfs_test_root.c +++ b/test/mfs/source/test/mfs_test_root.c @@ -61,7 +61,7 @@ const testsuite_t mfs_test_suite = { /* Shared code. */ /*===========================================================================*/ -#include "mfs.h" +#include "hal_mfs.h" MFSDriver mfs1; uint8_t mfs_buffer[512]; diff --git a/test/mfs/source/test/mfs_test_root.h b/test/mfs/source/test/mfs_test_root.h index 4679c0c96..672b7da80 100644 --- a/test/mfs/source/test/mfs_test_root.h +++ b/test/mfs/source/test/mfs_test_root.h @@ -46,7 +46,7 @@ extern "C" { /* Shared definitions. */ /*===========================================================================*/ -#include "mfs.h" +#include "hal_mfs.h" #define TEST_SUITE_NAME "ChibiOS/HAL MFS Test Suite" diff --git a/test/mfs/source/test/mfs_test_sequence_001.c b/test/mfs/source/test/mfs_test_sequence_001.c index 7804fcd80..272924bd4 100644 --- a/test/mfs/source/test/mfs_test_sequence_001.c +++ b/test/mfs/source/test/mfs_test_sequence_001.c @@ -45,7 +45,7 @@ ****************************************************************************/ #include -#include "mfs.h" +#include "hal_mfs.h" static const uint8_t pattern1[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 diff --git a/test/mfs/source/test/mfs_test_sequence_002.c b/test/mfs/source/test/mfs_test_sequence_002.c index c8cbfe6d5..735b359df 100644 --- a/test/mfs/source/test/mfs_test_sequence_002.c +++ b/test/mfs/source/test/mfs_test_sequence_002.c @@ -39,7 +39,7 @@ * Shared code. ****************************************************************************/ -#include "mfs.h" +#include "hal_mfs.h" /**************************************************************************** * Test cases. diff --git a/testhal/STM32/multi/WSPI-MFS/main.c b/testhal/STM32/multi/WSPI-MFS/main.c index eb964184b..826daab70 100644 --- a/testhal/STM32/multi/WSPI-MFS/main.c +++ b/testhal/STM32/multi/WSPI-MFS/main.c @@ -20,7 +20,7 @@ #include "hal.h" #include "hal_serial_nor.h" -#include "mfs.h" +#include "hal_mfs.h" #include "mfs_test_root.h" diff --git a/testhal/STM32/multi/WSPI-MFS/make/stm32l476_discovery.make b/testhal/STM32/multi/WSPI-MFS/make/stm32l476_discovery.make index ad212eca6..e4860c5a3 100644 --- a/testhal/STM32/multi/WSPI-MFS/make/stm32l476_discovery.make +++ b/testhal/STM32/multi/WSPI-MFS/make/stm32l476_discovery.make @@ -114,7 +114,7 @@ include $(CHIBIOS)/tools/mk/autobuild.mk include $(CHIBIOS)/test/lib/test.mk include $(CHIBIOS)/test/mfs/mfs_test.mk include $(CHIBIOS)/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.mk -include $(CHIBIOS)/os/hal/lib/complex/mfs/mfs.mk +include $(CHIBIOS)/os/hal/lib/complex/mfs/hal_mfs.mk include $(CHIBIOS)/os/hal/lib/streams/streams.mk # Define linker script file here