git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9455 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
Giovanni Di Sirio 2016-05-09 11:59:51 +00:00
parent f0d90404d9
commit 0deff4750e
5 changed files with 225 additions and 3 deletions

View File

@ -137,11 +137,11 @@
*/
typedef struct {
/**
* @brief SPI driver associated to this L3GD20.
* @brief SPI driver associated to this L3GD20.
*/
SPIDriver *spip;
/**
* @brief SPI configuration associated to this L3GD20.
* @brief SPI configuration associated to this L3GD20.
*/
const SPIConfig *spicfg;
} N25Q128Config;

104
os/ex/subsystems/mfs/mfs.c Normal file
View File

@ -0,0 +1,104 @@
/*
Managed Flash Storage - Copyright (C) 2016 Giovanni Di Sirio
This file is part of ChibiOS.
ChibiOS is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
ChibiOS is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file mfs.c
* @brief Managed Flash Storage module code.
*
* @addtogroup mfs
* @{
*/
#include "hal.h"
#include "mfs.h"
/*===========================================================================*/
/* Driver local definitions. */
/*===========================================================================*/
/*===========================================================================*/
/* Driver exported variables. */
/*===========================================================================*/
/*===========================================================================*/
/* Driver local variables and types. */
/*===========================================================================*/
/*===========================================================================*/
/* Driver local functions. */
/*===========================================================================*/
/*===========================================================================*/
/* Driver exported functions. */
/*===========================================================================*/
/**
* @brief Initializes an instance.
*
* @param[out] devp pointer to the @p MFSDriver object
*
* @init
*/
void mfsObjectInit(MFSDriver *devp) {
osalDbgCheck(devp != NULL);
devp->state = MFS_STOP;
devp->config = NULL;
}
/**
* @brief Configures and activates a MFS driver.
*
* @param[in] devp pointer to the @p MFSDriver object
* @param[in] config pointer to the configuration
*
* @api
*/
void mfsStart(MFSDriver *devp, const MFSConfig *config) {
osalDbgCheck((devp != NULL) && (config != NULL));
osalDbgAssert(devp->state != MFS_UNINIT, "invalid state");
if (devp->state == MFS_STOP) {
devp->state = MFS_READY;
}
}
/**
* @brief Deactivates a MFS driver.
*
* @param[in] devp pointer to the @p MFSDriver object
*
* @api
*/
void mfsStop(MFSDriver *devp) {
osalDbgCheck(devp != NULL);
osalDbgAssert(devp->state != MFS_UNINIT, "invalid state");
if (devp->state != MFS_STOP) {
devp->state = MFS_STOP;
}
}
/** @} */

111
os/ex/subsystems/mfs/mfs.h Normal file
View File

@ -0,0 +1,111 @@
/*
Managed Flash Storage - Copyright (C) 2016 Giovanni Di Sirio
This file is part of ChibiOS.
ChibiOS is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
ChibiOS is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file mfs.h
* @brief Managed Flash Storage module header.
*
* @{
*/
#ifndef MFS_H
#define MFS_H
#include "hal_flash.h"
/*===========================================================================*/
/* Driver constants. */
/*===========================================================================*/
/*===========================================================================*/
/* Driver pre-compile time settings. */
/*===========================================================================*/
/**
* @name Configuration options
* @{
*/
/** @} */
/*===========================================================================*/
/* Derived constants and error checks. */
/*===========================================================================*/
/*===========================================================================*/
/* Driver data structures and types. */
/*===========================================================================*/
/**
* @brief Driver state machine possible states.
*/
typedef enum {
MFS_UNINIT = 0,
MFS_STOP = 1,
MFS_READY = 2,
MFS_ACTIVE = 3
} mfs_state_t;
/**
* @brief Type of a MFS configuration structure.
*/
typedef struct {
/**
* @brief Flash driver associated to this MFS instance.
*/
BaseFlash *flashp;
} MFSConfig;
/**
* @extends BaseFlash
*
* @brief Type of an MFS instance.
*/
typedef struct {
/**
* @brief Driver state.
*/
mfs_state_t state;
/**
* @brief Current configuration data.
*/
const MFSConfig *config;
} MFSDriver;
/*===========================================================================*/
/* Driver macros. */
/*===========================================================================*/
/*===========================================================================*/
/* External declarations. */
/*===========================================================================*/
#ifdef __cplusplus
extern "C" {
#endif
void mfsObjectInit(MFSDriver *devp);
void mfsStart(MFSDriver *devp, const MFSConfig *config);
void mfsStop(MFSDriver *devp);
#ifdef __cplusplus
}
#endif
#endif /* MFS_H */
/** @} */

View File

@ -0,0 +1,5 @@
# List of all the MFS subsystem files.
MFSSRC := $(CHIBIOS)/os/ex/subsystems/mfs/mfs.c
# Required include directories
MFSINC := $(CHIBIOS)/os/ex/subsystems/mfs

View File

@ -99,6 +99,7 @@ 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/subsystems/mfs/mfs.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/STM32F303xC.ld
@ -113,6 +114,7 @@ CSRC = $(STARTUPSRC) \
$(PLATFORMSRC) \
$(BOARDSRC) \
$(N25Q128SRC) \
$(MFSSRC) \
main.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
@ -146,7 +148,7 @@ ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
INCDIR = $(CHIBIOS)/os/license \
$(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) \
$(N25Q128INC)
$(N25Q128INC) $(MFSINC)
#
# Project, sources and paths