This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 5e9d6d56fb5c4ed58bde7bb75a4dedf28e93b4c7 Author: Bowen Wang <[email protected]> AuthorDate: Tue Jan 7 10:48:09 2025 +0800 misc/ramdisk: support register ramdisk with config Allow registering a ramdisk with a custom device path and file mode. Signed-off-by: Bowen Wang <[email protected]> Signed-off-by: wangjianyu3 <[email protected]> --- drivers/misc/ramdisk.c | 65 ++++++++++++++++++++++++++++------------- include/nuttx/drivers/ramdisk.h | 26 +++++++++++++++++ 2 files changed, 71 insertions(+), 20 deletions(-) diff --git a/drivers/misc/ramdisk.c b/drivers/misc/ramdisk.c index 96bb2f0f4a7..d534dd42ba2 100644 --- a/drivers/misc/ramdisk.c +++ b/drivers/misc/ramdisk.c @@ -401,37 +401,32 @@ static int rd_unlink(FAR struct inode *inode) ****************************************************************************/ /**************************************************************************** - * Name: ramdisk_register or romdisk_register + * Name: ramdisk_register_with_config * * Description: * Non-standard function to register a ramdisk or a romdisk * * Input Parameters: - * minor: Selects suffix of device named /dev/ramN, N={1,2,3...} - * nsectors: Number of sectors on device - * sectize: The size of one sector - * rdflags: See RDFLAG_* definitions - * buffer: RAM disk backup memory + * config: Ramdisk configuration * * Returned Value: * Zero on success; a negated errno value on failure. * ****************************************************************************/ -int ramdisk_register(int minor, FAR uint8_t *buffer, uint32_t nsectors, - uint16_t sectsize, uint8_t rdflags) +int ramdisk_register_with_config(FAR const struct ramdisk_config_s *config) { FAR struct rd_struct_s *dev; - char devname[16]; int ret = -ENOMEM; finfo("buffer: %p nsectors: %" PRIu32 " sectsize: %" PRIu16 "\n", - buffer, nsectors, sectsize); + config->buffer, config->nsectors, config->sectsize); /* Sanity check */ #ifdef CONFIG_DEBUG_FEATURES - if (minor < 0 || minor > 255 || !buffer || !nsectors || !sectsize) + if (!config->name || !config->buffer || !config->nsectors || + !config->sectsize) { return -EINVAL; } @@ -444,18 +439,14 @@ int ramdisk_register(int minor, FAR uint8_t *buffer, uint32_t nsectors, { /* Initialize the ramdisk device structure */ - dev->rd_nsectors = nsectors; /* Number of sectors on device */ - dev->rd_sectsize = sectsize; /* The size of one sector */ - dev->rd_buffer = buffer; /* RAM disk backup memory */ - dev->rd_flags = rdflags & RDFLAG_USER; - - /* Create a ramdisk device name */ - - snprintf(devname, sizeof(devname), "/dev/ram%d", minor); + dev->rd_nsectors = config->nsectors; /* Number of sectors on device */ + dev->rd_sectsize = config->sectsize; /* The size of one sector */ + dev->rd_buffer = config->buffer; /* RAM disk backup memory */ + dev->rd_flags = config->rdflags & RDFLAG_USER; /* Inode private data is a reference to the ramdisk device structure */ - ret = register_blockdriver(devname, &g_bops, 0, dev); + ret = register_blockdriver(config->name, &g_bops, config->mode, dev); if (ret < 0) { ferr("register_blockdriver failed: %d\n", -ret); @@ -465,3 +456,37 @@ int ramdisk_register(int minor, FAR uint8_t *buffer, uint32_t nsectors, return ret; } + +/**************************************************************************** + * Name: ramdisk_register or romdisk_register + * + * Description: + * Non-standard function to register a ramdisk or a romdisk + * + * Input Parameters: + * minor: Selects suffix of device named /dev/ramN, N={1,2,3...} + * nsectors: Number of sectors on device + * sectize: The size of one sector + * rdflags: See RDFLAG_* definitions + * buffer: RAM disk backup memory + * + * Returned Value: + * Zero on success; a negated errno value on failure. + * + ****************************************************************************/ + +int ramdisk_register(int minor, FAR uint8_t *buffer, uint32_t nsectors, + uint16_t sectsize, uint8_t rdflags) +{ + struct ramdisk_config_s config; + char devname[16]; + + snprintf(devname, sizeof(devname), "/dev/ram%d", minor); + config.name = devname; + config.buffer = buffer; + config.nsectors = nsectors; + config.sectsize = sectsize; + config.mode = 0; + config.rdflags = rdflags; + return ramdisk_register_with_config(&config); +} diff --git a/include/nuttx/drivers/ramdisk.h b/include/nuttx/drivers/ramdisk.h index 2da77b1b918..523c7c5f3e6 100644 --- a/include/nuttx/drivers/ramdisk.h +++ b/include/nuttx/drivers/ramdisk.h @@ -49,6 +49,16 @@ * Type Definitions ****************************************************************************/ +struct ramdisk_config_s +{ + FAR const char *name; + FAR uint8_t *buffer; + uint32_t nsectors; + uint16_t sectsize; + mode_t mode; + uint8_t rdflags; +}; + /**************************************************************************** * Public Function Prototypes ****************************************************************************/ @@ -58,6 +68,22 @@ extern "C" { #endif +/**************************************************************************** + * Name: ramdisk_register_with_config + * + * Description: + * Non-standard function to register a ramdisk or a romdisk + * + * Input Parameters: + * config: Ramdisk configuration + * + * Returned Value: + * Zero on success; a negated errno value on failure. + * + ****************************************************************************/ + +int ramdisk_register_with_config(FAR const struct ramdisk_config_s *config); + /**************************************************************************** * Name: ramdisk_register or romdisk_register *
