rusefi
/
ChibiOS
mirror of https://github.com/rusefi/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reorganized configuration files, reorganized headers. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@15150 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2021-11-29 12:57:32 +00:00
parent 99a4ca309a
commit 8119b966d0
11 changed files with 213 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
demos/STM32/RT-VFS-FATFS/cfg/stm32g474re_nucleo64/vfsconf.h
View File

@ -28,20 +28,68 @@
#define _CHIBIOS_VFS_CONF_
#define _CHIBIOS_VFS_CONF_VER_1_0_
/*===========================================================================*/
/**
* @brief Maximum of drivers to be registered in VFS.
* @name VFS general settings
* @{
*/
#if !defined(VFS_CFG_MAX_DRIVERS) || defined(__DOXYGEN__)
#define VFS_CFG_MAX_DRIVERS 2
#endif
/*===========================================================================*/
/**
* @brief Maximum file names handled in VFS.
* @brief Maximum filename length.
*/
#if !defined(VFS_CFG_MAX_NAMELEN) || defined(__DOXYGEN__)
#define VFS_CFG_MAX_NAMELEN 15
#endif
/** @} */
/*===========================================================================*/
/**
* @name Overlay driver settings
* @{
*/
/*===========================================================================*/
/**
* @brief Maximum number of overlay directories.
*/
#if !defined(DRV_CFG_OVERLAY_DRV_MAX) || defined(__DOXYGEN__)
#define DRV_CFG_OVERLAY_DRV_MAX 2
#endif
/**
* @brief Number of directory nodes pre-allocated in the pool.
*/
#if !defined(DRV_CFG_OVERLAY_NODES_NUM) || defined(__DOXYGEN__)
#define DRV_CFG_OVERLAY_DIR_NODES_NUM 1
#endif
/** @} */
/*===========================================================================*/
/**
* @name Streams driver settings
* @{
*/
/*===========================================================================*/
/**
* @brief Number of directory nodes pre-allocated in the pool.
*/
#if !defined(DRV_CFG_STREAMS_DIR_NODES_NUM) || defined(__DOXYGEN__)
#define DRV_CFG_STREAMS_DIR_NODES_NUM 1
#endif
/**
* @brief Number of file nodes pre-allocated in the pool.
*/
#if !defined(DRV_CFG_STREAMS_FILE_NODES_NUM) || defined(__DOXYGEN__)
#define DRV_CFG_STREAMS_FILE_NODES_NUM 2
#endif
/** @} */
#endif /* VFSCONF_H */
/** @} */

58
demos/STM32/RT-VFS-FATFS/cfg/stm32l4r9ai_discovery/vfsconf.h
View File

@ -28,20 +28,68 @@
#define _CHIBIOS_VFS_CONF_
#define _CHIBIOS_VFS_CONF_VER_1_0_
/*===========================================================================*/
/**
* @brief Maximum of drivers to be registered in VFS.
* @name VFS general settings
* @{
*/
#if !defined(VFS_CFG_MAX_DRIVERS) || defined(__DOXYGEN__)
#define VFS_CFG_MAX_DRIVERS 2
#endif
/*===========================================================================*/
/**
* @brief Maximum file names handled in VFS.
* @brief Maximum filename length.
*/
#if !defined(VFS_CFG_MAX_NAMELEN) || defined(__DOXYGEN__)
#define VFS_CFG_MAX_NAMELEN 15
#endif
/** @} */
/*===========================================================================*/
/**
* @name Overlay driver settings
* @{
*/
/*===========================================================================*/
/**
* @brief Maximum number of overlay directories.
*/
#if !defined(DRV_CFG_OVERLAY_DRV_MAX) || defined(__DOXYGEN__)
#define DRV_CFG_OVERLAY_DRV_MAX 2
#endif
/**
* @brief Number of directory nodes pre-allocated in the pool.
*/
#if !defined(DRV_CFG_OVERLAY_NODES_NUM) || defined(__DOXYGEN__)
#define DRV_CFG_OVERLAY_DIR_NODES_NUM 1
#endif
/** @} */
/*===========================================================================*/
/**
* @name Streams driver settings
* @{
*/
/*===========================================================================*/
/**
* @brief Number of directory nodes pre-allocated in the pool.
*/
#if !defined(DRV_CFG_STREAMS_DIR_NODES_NUM) || defined(__DOXYGEN__)
#define DRV_CFG_STREAMS_DIR_NODES_NUM 1
#endif
/**
* @brief Number of file nodes pre-allocated in the pool.
*/
#if !defined(DRV_CFG_STREAMS_FILE_NODES_NUM) || defined(__DOXYGEN__)
#define DRV_CFG_STREAMS_FILE_NODES_NUM 2
#endif
/** @} */
#endif /* VFSCONF_H */
/** @} */

6
os/vfs/drivers/overlay/drvoverlay.c
View File

@ -194,7 +194,7 @@ static msg_t node_dir_first(void *instance, vfs_node_info_t *nip) {
static msg_t node_dir_next(void *instance, vfs_node_info_t *nip) {
vfs_overlay_dir_node_t *odnp = (vfs_overlay_dir_node_t *)instance;
if (odnp->index < VFS_CFG_MAX_DRIVERS) {
if (odnp->index < DRV_CFG_OVERLAY_DRV_MAX) {
nip->attr = VFS_NODE_ATTR_ISDIR | VFS_NODE_ATTR_READONLY;
nip->size = (vfs_offset_t)0;
strcpy(nip->name,
@ -236,7 +236,7 @@ vfs_driver_t *drvOverlayObjectInit(vfs_overlay_driver_t *vodp,
/* Preloading pools.*/
chPoolLoadArray(&vodp->dir_nodes_pool,
&vodp->dir_nodes[0],
DRV_CFG_OVERLAY_NODES_NUM);
DRV_CFG_OVERLAY_DIR_NODES_NUM);
return (vfs_driver_t *)vodp;
}
@ -253,7 +253,7 @@ msg_t drvOverlayRegisterDriver(vfs_overlay_driver_t *vodp,
vfs_driver_t *vdp) {
msg_t err;
if (vodp->next_driver >= &vodp->drivers[VFS_CFG_MAX_DRIVERS]) {
if (vodp->next_driver >= &vodp->drivers[DRV_CFG_OVERLAY_DRV_MAX]) {
err = VFS_RET_NO_RESOURCE;
}
else {

27
os/vfs/drivers/overlay/drvoverlay.h
View File

@ -38,24 +38,19 @@
/* Module pre-compile time settings. */
/*===========================================================================*/
/**
* @brief Number of directory nodes pre-allocated in the pool.
*/
#if !defined(DRV_CFG_OVERLAY_NODES_NUM) || defined(__DOXYGEN__)
#define DRV_CFG_OVERLAY_NODES_NUM 1
#endif
/**
* @brief Maximum number of overlayed directories.
*/
#if !defined(DRV_CFG_OVERLAY_DIR_MAX) || defined(__DOXYGEN__)
#define DRV_CFG_OVERLAY_DIR_MAX 2
#endif
/*===========================================================================*/
/* Derived constants and error checks. */
/*===========================================================================*/
/* Configuration options checks.*/
#if DRV_CFG_OVERLAY_DIR_NODES_NUM < 1
#error "invalid value for DRV_CFG_OVERLAY_DIR_NODES_NUM"
#endif
#if (DRV_CFG_OVERLAY_DRV_MAX < 1) || (DRV_CFG_OVERLAY_DRV_MAX > 16)
#error "invalid value for DRV_CFG_OVERLAY_DRV_MAX"
#endif
/*===========================================================================*/
/* Module data structures and types. */
/*===========================================================================*/
@ -105,11 +100,11 @@ typedef struct vfs_overlay_dir_node {
/* Pool of directory nodes.*/ \
memory_pool_t dir_nodes_pool; \
/* Static storage of directory nodes.*/ \
vfs_overlay_dir_node_t dir_nodes[DRV_CFG_OVERLAY_NODES_NUM]; \
vfs_overlay_dir_node_t dir_nodes[DRV_CFG_OVERLAY_DIR_NODES_NUM]; \
/* Next registration slot.*/ \
vfs_driver_t **next_driver; \
/* Registration slots.*/ \
vfs_driver_t *drivers[DRV_CFG_OVERLAY_DIR_MAX];
vfs_driver_t *drivers[DRV_CFG_OVERLAY_DRV_MAX];
/**
* @brief @p vfs_overlay_driver_t virtual methods table.

23
os/vfs/drivers/streams/drvstreams.h
View File

@ -38,24 +38,19 @@
/* Module pre-compile time settings. */
/*===========================================================================*/
/**
* @brief Number of directory nodes pre-allocated in the pool.
*/
#if !defined(DRV_CFG_STREAMS_DIR_NODES_NUM) || defined(__DOXYGEN__)
#define DRV_CFG_STREAMS_DIR_NODES_NUM 1
#endif
/**
* @brief Number of file nodes pre-allocated in the pool.
*/
#if !defined(DRV_CFG_STREAMS_FILE_NODES_NUM) || defined(__DOXYGEN__)
#define DRV_CFG_STREAMS_FILE_NODES_NUM 2
#endif
/*===========================================================================*/
/* Derived constants and error checks. */
/*===========================================================================*/
/* Configuration options checks.*/
#if DRV_CFG_STREAMS_DIR_NODES_NUM < 1
#error "invalid value for DRV_CFG_STREAMS_DIR_NODES_NUM"
#endif
#if DRV_CFG_STREAMS_FILE_NODES_NUM < 1
#error "invalid value for DRV_CFG_STREAMS_FILE_NODES_NUM"
#endif
/*===========================================================================*/
/* Module data structures and types. */
/*===========================================================================*/

29
os/vfs/include/vfs.h
View File

@ -19,7 +19,7 @@
/**
* @file vfs/include/vfs.h
* @brief VFS main header file.
* @brief VFS header file.
* @details Main header of the ChibiOS Virtual File System.
*
* @addtogroup VFS
@ -83,7 +83,32 @@
#include "vfsparser.h"
#include "vfsnodes.h"
#include "vfsdrivers.h"
#include "vfssystem.h"
#ifdef __cplusplus
extern "C" {
#endif
msg_t vfsOpenDirectory(vfs_driver_t *vdp,
const char *name,
vfs_directory_node_t **vdnpp);
void vfsCloseDirectory(vfs_directory_node_t *vdnp);
msg_t vfsReadDirectoryFirst(vfs_directory_node_t *vdnp,
vfs_node_info_t *nip);
msg_t vfsReadDirectoryNext(vfs_directory_node_t *vdnp,
vfs_node_info_t *nip);
msg_t vfsOpenFile(vfs_driver_t *vdp,
const char *name,
unsigned mode,
vfs_file_node_t **vfnpp);
void vfsCloseFile(vfs_file_node_t *vfnp);
ssize_t vfsReadFile(vfs_file_node_t *vfnp, uint8_t *buf, size_t n);
ssize_t vfsWriteFile(vfs_file_node_t *vfnp, const uint8_t *buf, size_t n);
msg_t vfsSetFilePosition(vfs_file_node_t *vfnp, vfs_offset_t offset);
vfs_offset_t vfsGetFilePosition(vfs_file_node_t *vfnp);
vfs_offset_t vfsGetFileSize(vfs_file_node_t *vfnp);
BaseSequentialStream *vfsGetFileStream(vfs_file_node_t *vfnp);
#ifdef __cplusplus
}
#endif
#endif /* VFS_H */

9
os/vfs/include/vfschecks.h
View File

@ -48,15 +48,6 @@
#error "obsolete or unknown configuration file"
#endif
/* Configuration options checks.*/
#if !defined(VFS_CFG_MAX_DRIVERS)
#error "VFS_CFG_MAX_DRIVERS not defined in chconf.h"
#endif
#if (VFS_CFG_MAX_DRIVERS < 1) || (VFS_CFG_MAX_DRIVERS > 16)
#error "invalid value for VFS_CFG_MAX_DRIVERS"
#endif
/*===========================================================================*/
/* Derived constants and error checks. */
/*===========================================================================*/

87
os/vfs/include/vfssystem.h
View File

@ -1,87 +0,0 @@
/*
ChibiOS - Copyright (C) 2006,2007,2008,2009,2010,2011,2012,2013,2014,
2015,2016,2017,2018,2019,2020,2021 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 version 3 of the License.
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 vfs/include/vfssystem.h
* @brief VFS system header file.
*
* @addtogroup VFS_SYSTEM
* @{
*/
#ifndef VFSSYSTEM_H
#define VFSSYSTEM_H
/*===========================================================================*/
/* Module constants. */
/*===========================================================================*/
/*===========================================================================*/
/* Module pre-compile time settings. */
/*===========================================================================*/
/*===========================================================================*/
/* Derived constants and error checks. */
/*===========================================================================*/
/*===========================================================================*/
/* Module data structures and types. */
/*===========================================================================*/
/*===========================================================================*/
/* Module macros. */
/*===========================================================================*/
/*===========================================================================*/
/* External declarations. */
/*===========================================================================*/
#ifdef __cplusplus
extern "C" {
#endif
msg_t vfsOpenDirectory(vfs_driver_t *vdp,
const char *name,
vfs_directory_node_t **vdnpp);
void vfsCloseDirectory(vfs_directory_node_t *vdnp);
msg_t vfsReadDirectoryFirst(vfs_directory_node_t *vdnp,
vfs_node_info_t *nip);
msg_t vfsReadDirectoryNext(vfs_directory_node_t *vdnp,
vfs_node_info_t *nip);
msg_t vfsOpenFile(vfs_driver_t *vdp,
const char *name,
unsigned mode,
vfs_file_node_t **vfnpp);
void vfsCloseFile(vfs_file_node_t *vfnp);
ssize_t vfsReadFile(vfs_file_node_t *vfnp, uint8_t *buf, size_t n);
ssize_t vfsWriteFile(vfs_file_node_t *vfnp, const uint8_t *buf, size_t n);
msg_t vfsSetFilePosition(vfs_file_node_t *vfnp, vfs_offset_t offset);
vfs_offset_t vfsGetFilePosition(vfs_file_node_t *vfnp);
vfs_offset_t vfsGetFileSize(vfs_file_node_t *vfnp);
BaseSequentialStream *vfsGetFileStream(vfs_file_node_t *vfnp);
#ifdef __cplusplus
}
#endif
/*===========================================================================*/
/* Module inline functions. */
/*===========================================================================*/
#endif /* VFSSYSTEM_H */
/** @} */

6
os/vfs/src/vfssystem.c → os/vfs/src/vfs.c
View File

@ -18,10 +18,10 @@
*/
/**
* @file vfs/src/chsystem.c
* @brief VFS system code.
* @file vfs/src/vfs.c
* @brief VFS API code.
*
* @addtogroup VFS_SYSTEM
* @addtogroup VFS
* @{
*/

58
os/vfs/templates/vfsconf.h
View File

@ -28,20 +28,68 @@
#define _CHIBIOS_VFS_CONF_
#define _CHIBIOS_VFS_CONF_VER_1_0_
/*===========================================================================*/
/**
* @brief Maximum of drivers to be registered in VFS.
* @name VFS general settings
* @{
*/
#if !defined(VFS_CFG_MAX_DRIVERS) || defined(__DOXYGEN__)
#define VFS_CFG_MAX_DRIVERS 2
#endif
/*===========================================================================*/
/**
* @brief Maximum file names handled in VFS.
* @brief Maximum filename length.
*/
#if !defined(VFS_CFG_MAX_NAMELEN) || defined(__DOXYGEN__)
#define VFS_CFG_MAX_NAMELEN 15
#endif
/** @} */
/*===========================================================================*/
/**
* @name Overlay driver settings
* @{
*/
/*===========================================================================*/
/**
* @brief Maximum number of overlay directories.
*/
#if !defined(DRV_CFG_OVERLAY_DRV_MAX) || defined(__DOXYGEN__)
#define DRV_CFG_OVERLAY_DRV_MAX 2
#endif
/**
* @brief Number of directory nodes pre-allocated in the pool.
*/
#if !defined(DRV_CFG_OVERLAY_NODES_NUM) || defined(__DOXYGEN__)
#define DRV_CFG_OVERLAY_DIR_NODES_NUM 1
#endif
/** @} */
/*===========================================================================*/
/**
* @name Streams driver settings
* @{
*/
/*===========================================================================*/
/**
* @brief Number of directory nodes pre-allocated in the pool.
*/
#if !defined(DRV_CFG_STREAMS_DIR_NODES_NUM) || defined(__DOXYGEN__)
#define DRV_CFG_STREAMS_DIR_NODES_NUM 1
#endif
/**
* @brief Number of file nodes pre-allocated in the pool.
*/
#if !defined(DRV_CFG_STREAMS_FILE_NODES_NUM) || defined(__DOXYGEN__)
#define DRV_CFG_STREAMS_FILE_NODES_NUM 2
#endif
/** @} */
#endif /* VFSCONF_H */
/** @} */

2
os/vfs/vfs.mk
View File

@ -1,6 +1,6 @@
# List of all the ChibiOS/VFS files.
VFSSRC := $(CHIBIOS)/os/vfs/src/vfsparser.c \
$(CHIBIOS)/os/vfs/src/vfssystem.c
$(CHIBIOS)/os/vfs/src/vfs.c
# Required include directories
VFSINC := $(CHIBIOS)/os/vfs/include