From e4a73edec8930bbef8d10b7de26c8db93209de59 Mon Sep 17 00:00:00 2001 From: zhaoxingyu1 Date: Tue, 3 Jun 2025 17:29:18 +0800 Subject: [PATCH] mtdconfig: lomtdconfig device change to depends on !MTD_CONFIG_NONE The structure of mtd_config in Kconfig has changed. Signed-off-by: zhaoxingyu1 --- drivers/mtd/filemtd.c | 10 +++++----- include/nuttx/fs/loopmtd.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/filemtd.c b/drivers/mtd/filemtd.c index 149062c9efd..5b6d8c9d692 100644 --- a/drivers/mtd/filemtd.c +++ b/drivers/mtd/filemtd.c @@ -42,7 +42,7 @@ #include #include #include -#ifdef CONFIG_MTD_CONFIG +#ifndef CONFIG_MTD_CONFIG_NONE # include #endif @@ -554,7 +554,7 @@ static int filemtd_ioctl(FAR struct mtd_dev_s *dev, int cmd, ****************************************************************************/ #ifdef CONFIG_MTD_LOOP -# ifdef CONFIG_MTD_CONFIG +# ifndef CONFIG_MTD_CONFIG_NONE static int mtd_loop_setup(FAR const char *devname, FAR const char *filename, int sectsize, int erasesize, off_t offset, int configdata) @@ -572,7 +572,7 @@ static int mtd_loop_setup(FAR const char *devname, FAR const char *filename, return -ENOENT; } -# ifdef CONFIG_MTD_CONFIG +# ifndef CONFIG_MTD_CONFIG_NONE if (configdata) { if (configdata == 2) @@ -647,7 +647,7 @@ static int mtd_loop_teardown(FAR const char *devname) filemtd_teardown(&dev->mtd); -# ifdef CONFIG_MTD_CONFIG +# ifndef CONFIG_MTD_CONFIG_NONE if (inode->i_private) { mtdconfig_unregister_by_path(devname); @@ -715,7 +715,7 @@ static int mtd_loop_ioctl(FAR struct file *filep, int cmd, } else { -# ifdef CONFIG_MTD_CONFIG +# ifndef CONFIG_MTD_CONFIG_NONE ret = mtd_loop_setup(setup->devname, setup->filename, setup->sectsize, setup->erasesize, setup->offset, setup->configdata); diff --git a/include/nuttx/fs/loopmtd.h b/include/nuttx/fs/loopmtd.h index b3c5e05dd9e..bf0c8809664 100644 --- a/include/nuttx/fs/loopmtd.h +++ b/include/nuttx/fs/loopmtd.h @@ -75,7 +75,7 @@ struct mtd_losetup_s size_t erasesize; /* The erase size to use on the file */ size_t sectsize; /* The sector / page size of the file */ off_t offset; /* An offset that may be applied to the device */ -# ifdef CONFIG_MTD_CONFIG +# ifndef CONFIG_MTD_CONFIG_NONE int configdata; /* 1: register mtdconfig device, 2: erase before register */ # endif };