Renamed for consistency.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12347 110e8d01-0319-4d1e-a829-52ad28d1bb01
This commit is contained in:
Giovanni Di Sirio 2018-10-07 12:06:42 +00:00
parent dc7ae21c74
commit 8bd7175893
13 changed files with 25 additions and 25 deletions

View File

@ -18,7 +18,7 @@
*/ */
/** /**
* @file mfs.c * @file hal_mfs.c
* @brief Managed Flash Storage module code. * @brief Managed Flash Storage module code.
* @details This module manages a flash partition as a generic storage where * @details This module manages a flash partition as a generic storage where
* arbitrary data records can be created, updated, deleted and * arbitrary data records can be created, updated, deleted and
@ -30,7 +30,7 @@
* banks (where possible) caused by power loss during operations. * banks (where possible) caused by power loss during operations.
* Both operations are transparent to the user. * Both operations are transparent to the user.
* *
* @addtogroup MFS * @addtogroup HAL_MFS
* @{ * @{
*/ */
@ -38,7 +38,7 @@
#include "hal.h" #include "hal.h"
#include "mfs.h" #include "hal_mfs.h"
/*===========================================================================*/ /*===========================================================================*/
/* Driver local definitions. */ /* Driver local definitions. */

View File

@ -18,15 +18,15 @@
*/ */
/** /**
* @file mfs.h * @file hal_mfs.h
* @brief Managed Flash Storage module header. * @brief Managed Flash Storage module header.
* *
* @addtogroup MFS * @addtogroup HAL_MFS
* @{ * @{
*/ */
#ifndef MFS_H #ifndef HAL_MFS_H
#define MFS_H #define HAL_MFS_H
#include "hal_flash.h" #include "hal_flash.h"
@ -364,7 +364,7 @@ extern "C" {
} }
#endif #endif
#endif /* MFS_H */ #endif /* HAL_MFS_H */
/** @} */ /** @} */

View File

@ -1,5 +1,5 @@
# List of all the MFS subsystem files. # 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 # Required include directories
MFSINC := $(CHIBIOS)/os/hal/lib/complex/mfs MFSINC := $(CHIBIOS)/os/hal/lib/complex/mfs

View File

@ -15,7 +15,7 @@
*/ */
/** /**
* @file flash_device.c * @file hal_flash_device.c
* @brief Micron N25Q serial flash driver code. * @brief Micron N25Q serial flash driver code.
* *
* @addtogroup MICRON_N25Q * @addtogroup MICRON_N25Q

View File

@ -15,7 +15,7 @@
*/ */
/** /**
* @file flash_device.h * @file hal_flash_device.h
* @brief Micron N25Q serial flash driver header. * @brief Micron N25Q serial flash driver header.
* *
* @addtogroup MICRON_N25Q * @addtogroup MICRON_N25Q

View File

@ -15,11 +15,11 @@
*/ */
/** /**
* @file m25q.c * @file hal_serial_nor.c
* @brief M25Q serial flash driver code. * @brief Serial NOR serial flash driver code.
* *
* @addtogroup M25Q * @addtogroup HAL_SERIAL_NOR
* @ingroup M25Q * @ingroup HAL_SERIAL_NOR
* @{ * @{
*/ */

View File

@ -38,7 +38,7 @@
<value>mfs_</value> <value>mfs_</value>
</code_prefix> </code_prefix>
<global_definitions> <global_definitions>
<value><![CDATA[#include "mfs.h" <value><![CDATA[#include "hal_mfs.h"
#define TEST_SUITE_NAME "ChibiOS/HAL MFS Test Suite" #define TEST_SUITE_NAME "ChibiOS/HAL MFS Test Suite"
@ -53,7 +53,7 @@ flash_error_t bank_verify_erased(mfs_bank_t bank);
void test_print_mfs_info(void);]]></value> void test_print_mfs_info(void);]]></value>
</global_definitions> </global_definitions>
<global_code> <global_code>
<value><![CDATA[#include "mfs.h" <value><![CDATA[#include "hal_mfs.h"
MFSDriver mfs1; MFSDriver mfs1;
uint8_t mfs_buffer[512]; uint8_t mfs_buffer[512];
@ -128,7 +128,7 @@ flash_error_t bank_verify_erased(mfs_bank_t bank) {
</condition> </condition>
<shared_code> <shared_code>
<value><![CDATA[#include <string.h> <value><![CDATA[#include <string.h>
#include "mfs.h" #include "hal_mfs.h"
static const uint8_t pattern1[] = { static const uint8_t pattern1[] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 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
<value /> <value />
</condition> </condition>
<shared_code> <shared_code>
<value><![CDATA[#include "mfs.h"]]></value> <value><![CDATA[#include "hal_mfs.h"]]></value>
</shared_code> </shared_code>
<cases> <cases>
<case> <case>

View File

@ -61,7 +61,7 @@ const testsuite_t mfs_test_suite = {
/* Shared code. */ /* Shared code. */
/*===========================================================================*/ /*===========================================================================*/
#include "mfs.h" #include "hal_mfs.h"
MFSDriver mfs1; MFSDriver mfs1;
uint8_t mfs_buffer[512]; uint8_t mfs_buffer[512];

View File

@ -46,7 +46,7 @@ extern "C" {
/* Shared definitions. */ /* Shared definitions. */
/*===========================================================================*/ /*===========================================================================*/
#include "mfs.h" #include "hal_mfs.h"
#define TEST_SUITE_NAME "ChibiOS/HAL MFS Test Suite" #define TEST_SUITE_NAME "ChibiOS/HAL MFS Test Suite"

View File

@ -45,7 +45,7 @@
****************************************************************************/ ****************************************************************************/
#include <string.h> #include <string.h>
#include "mfs.h" #include "hal_mfs.h"
static const uint8_t pattern1[] = { static const uint8_t pattern1[] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15

View File

@ -39,7 +39,7 @@
* Shared code. * Shared code.
****************************************************************************/ ****************************************************************************/
#include "mfs.h" #include "hal_mfs.h"
/**************************************************************************** /****************************************************************************
* Test cases. * Test cases.

View File

@ -20,7 +20,7 @@
#include "hal.h" #include "hal.h"
#include "hal_serial_nor.h" #include "hal_serial_nor.h"
#include "mfs.h" #include "hal_mfs.h"
#include "mfs_test_root.h" #include "mfs_test_root.h"

View File

@ -114,7 +114,7 @@ include $(CHIBIOS)/tools/mk/autobuild.mk
include $(CHIBIOS)/test/lib/test.mk include $(CHIBIOS)/test/lib/test.mk
include $(CHIBIOS)/test/mfs/mfs_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/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 include $(CHIBIOS)/os/hal/lib/streams/streams.mk
# Define linker script file here # Define linker script file here