【修改】函数和宏命名,移除添加的文件

MrYangMouren · MrYangMouren · commit 2ac8bc88643a · 2021-08-05T10:47:34.000+08:00
diff --git a/bsp/stm32/stm32f407-atk-explorer/board/Kconfig b/bsp/stm32/stm32f407-atk-explorer/board/Kconfig
@@ -92,12 +92,12 @@ menu "Onboard Peripheral Drivers"
             depends on BSP_USING_SDCARD
             default 1000000
 
-        config BSP_USING_NOR_MTD_FS
+        config BSP_USING_SPI_FLASH_LITTLEFS
             bool "Enable LITTLEFS"
             select RT_USING_DFS
+            select RT_USING_DFS_ROMFS
             select RT_USING_MTD_NOR
-            select BSP_USING_ON_CHIP_FLASH
-            select BSP_USING_SPI_FLASH
+            select BSP_USING_SPI_FLASH            
             select BSP_USING_FS
             select RT_USING_SYSTEM_WORKQUEUE
             default n
diff --git a/bsp/stm32/stm32f407-atk-explorer/board/SConscript b/bsp/stm32/stm32f407-atk-explorer/board/SConscript
@@ -20,7 +20,6 @@ if GetDepend(['BSP_USING_SPI_FLASH']):
 
 if GetDepend(['BSP_USING_FS']):
     src += Glob('ports/drv_filesystem.c')
-    src += Glob('ports/dfs_romfs.h')
 
 if GetDepend(['BSP_USING_SRAM']):
     src += Glob('ports/drv_sram.c')
diff --git a/bsp/stm32/stm32f407-atk-explorer/board/ports/dfs_romfs.h b/bsp/stm32/stm32f407-atk-explorer/board/ports/dfs_romfs.h
diff --git a/bsp/stm32/stm32f407-atk-explorer/board/ports/drv_filesystem.c b/bsp/stm32/stm32f407-atk-explorer/board/ports/drv_filesystem.c
@@ -18,8 +18,6 @@
 #include <dfs_posix.h>
 #include <fal.h>
 
-#define BSP_USING_NOR_MTD_FS
-
 #if DFS_FILESYSTEMS_MAX < 4
 #error "Please define DFS_FILESYSTEMS_MAX more than 4"
 #endif
@@ -78,11 +76,11 @@ static int onboard_sdcard_mount(void)
 }
 #endif
 
-#ifdef BSP_USING_NOR_MTD_FS
+#ifdef BSP_USING_SPI_FLASH_LITTLEFS
 
 #define FS_PARTITION_NAME              "filesystem"
 
-static void mtd_mount(void *parameter)
+static void spiflash_mount(void *parameter)
 {
     struct rt_device *mtd_dev = RT_NULL;
     fal_init();
@@ -98,36 +96,36 @@ static void mtd_mount(void *parameter)
         {
             if (dfs_mount(FS_PARTITION_NAME, "/flash", "lfs", 0, 0) == RT_EOK)
             {
-                LOG_I("mtd nor flash mount to '/flash'");
+                LOG_I("spi flash mount to '/flash'");
                 break;
             }
             else
             {
-                LOG_W("mtd nor flash mount to '/flash' failed!");
+                LOG_W("spi flash mount to '/flash' failed!");
             }
         }
     }
 }
 
-static int onboard_mtd_mount(void)
+static int onboard_spiflash_mount(void)
 {
     rt_thread_t tid;
 
     if (dfs_mount(FS_PARTITION_NAME, "/flash", "lfs", 0, 0) == RT_EOK)
     {
-        LOG_I("mtd nor flash mount to '/flash'");
+        LOG_I("spi flash mount to '/flash'");
     }
     else
     {
-        tid = rt_thread_create("mtd_mount", mtd_mount, RT_NULL,
+        tid = rt_thread_create("spiflash_mount", spiflash_mount, RT_NULL,
                                1024, RT_THREAD_PRIORITY_MAX - 3, 20);
         if (tid != RT_NULL)
         {
             rt_thread_startup(tid);
         }
         else
         {
-            LOG_E("create mtd_mount thread err!");
+            LOG_E("create spiflash_mount thread err!");
         }
     }
 
@@ -141,11 +139,10 @@ static const struct romfs_dirent _romfs_root[] =
 #ifdef BSP_USING_SDCARD
     {ROMFS_DIRENT_DIR, "sdcard", RT_NULL, 0},
 #endif
-#ifdef BSP_USING_NOR_MTD_FS
+
+#ifdef BSP_USING_SPI_FLASH_LITTLEFS
     {ROMFS_DIRENT_DIR, "flash", RT_NULL, 0},
 #endif
-    
-//  {ROMFS_DIRENT_DIR, "flash", RT_NULL, 0},
 };
 
 const struct romfs_dirent romfs_root =
@@ -163,8 +160,8 @@ static int filesystem_mount(void)
     onboard_sdcard_mount();
 #endif
     
-#ifdef BSP_USING_NOR_MTD_FS
-    onboard_mtd_mount();
+#ifdef BSP_USING_SPI_FLASH_LITTLEFS
+    onboard_spiflash_mount();
 #endif
     
     return RT_EOK;
diff --git a/bsp/stm32/stm32f407-atk-explorer/board/ports/fal_cfg.h b/bsp/stm32/stm32f407-atk-explorer/board/ports/fal_cfg.h
@@ -14,25 +14,24 @@
 #include <rtthread.h>
 #include <board.h>
 
+#ifdef BSP_USING_SPI_FLASH_LITTLEFS
+extern struct fal_flash_dev nor_flash0;
+#else
 #define FLASH_SIZE_GRANULARITY_16K   (4 * 16 * 1024)
 #define FLASH_SIZE_GRANULARITY_64K   (64 * 1024)
 #define FLASH_SIZE_GRANULARITY_128K  (7 * 128 * 1024)
-
 #define STM32_FLASH_START_ADRESS_16K  STM32_FLASH_START_ADRESS
 #define STM32_FLASH_START_ADRESS_64K  (STM32_FLASH_START_ADRESS_16K + FLASH_SIZE_GRANULARITY_16K)
 #define STM32_FLASH_START_ADRESS_128K (STM32_FLASH_START_ADRESS_64K + FLASH_SIZE_GRANULARITY_64K)
 
-#ifdef BSP_USING_NOR_MTD_FS
-extern struct fal_flash_dev nor_flash0;
-#else
 extern const struct fal_flash_dev stm32_onchip_flash_16k;
 extern const struct fal_flash_dev stm32_onchip_flash_64k;
 extern const struct fal_flash_dev stm32_onchip_flash_128k;
 #endif
 
 
 /* flash device table */
-#ifdef BSP_USING_NOR_MTD_FS
+#ifdef BSP_USING_SPI_FLASH_LITTLEFS
 #define FAL_FLASH_DEV_TABLE                                          \
 {                                                                    \
     &nor_flash0,                                                     \
@@ -50,10 +49,10 @@ extern const struct fal_flash_dev stm32_onchip_flash_128k;
 #ifdef FAL_PART_HAS_TABLE_CFG
 
 /* partition table */
-#ifdef BSP_USING_NOR_MTD_FS
+#ifdef BSP_USING_SPI_FLASH_LITTLEFS
 #define FAL_PART_TABLE                                                                                                     \
 {                                                                                                                          \
-    {FAL_PART_MAGIC_WROD, "filesystem",FAL_USING_NOR_FLASH_DEV_NAME, 0 , 1024 * 1024, 0}, \
+    {FAL_PART_MAGIC_WROD, "filesystem",FAL_USING_NOR_FLASH_DEV_NAME, 0 , 16 * 1024 * 1024, 0}, \
 }
 #else
 #define FAL_PART_TABLE                                                                                                     \

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@`
`18`	`18`	`#include <dfs_posix.h>`
`19`	`19`	`#include <fal.h>`
`20`	`20`
`21`		`-#define BSP_USING_NOR_MTD_FS`
`22`		`-`
`23`	`21`	`#if DFS_FILESYSTEMS_MAX < 4`
`24`	`22`	`#error "Please define DFS_FILESYSTEMS_MAX more than 4"`
`25`	`23`	`#endif`
`@@ -78,11 +76,11 @@ static int onboard_sdcard_mount(void)`
`78`	`76`	`}`
`79`	`77`	`#endif`
`80`	`78`
`81`		`-#ifdef BSP_USING_NOR_MTD_FS`
	`79`	`+#ifdef BSP_USING_SPI_FLASH_LITTLEFS`
`82`	`80`
`83`	`81`	`#define FS_PARTITION_NAME "filesystem"`
`84`	`82`
`85`		`-static void mtd_mount(void *parameter)`
	`83`	`+static void spiflash_mount(void *parameter)`
`86`	`84`	`{`
`87`	`85`	`struct rt_device *mtd_dev = RT_NULL;`
`88`	`86`	`fal_init();`
`@@ -98,36 +96,36 @@ static void mtd_mount(void *parameter)`
`98`	`96`	`{`
`99`	`97`	`if (dfs_mount(FS_PARTITION_NAME, "/flash", "lfs", 0, 0) == RT_EOK)`
`100`	`98`	`{`
`101`		`- LOG_I("mtd nor flash mount to '/flash'");`
	`99`	`+ LOG_I("spi flash mount to '/flash'");`
`102`	`100`	`break;`
`103`	`101`	`}`
`104`	`102`	`else`
`105`	`103`	`{`
`106`		`- LOG_W("mtd nor flash mount to '/flash' failed!");`
	`104`	`+ LOG_W("spi flash mount to '/flash' failed!");`
`107`	`105`	`}`
`108`	`106`	`}`
`109`	`107`	`}`
`110`	`108`	`}`
`111`	`109`
`112`		`-static int onboard_mtd_mount(void)`
	`110`	`+static int onboard_spiflash_mount(void)`
`113`	`111`	`{`
`114`	`112`	`rt_thread_t tid;`
`115`	`113`
`116`	`114`	`if (dfs_mount(FS_PARTITION_NAME, "/flash", "lfs", 0, 0) == RT_EOK)`
`117`	`115`	`{`
`118`		`- LOG_I("mtd nor flash mount to '/flash'");`
	`116`	`+ LOG_I("spi flash mount to '/flash'");`
`119`	`117`	`}`
`120`	`118`	`else`
`121`	`119`	`{`
`122`		`- tid = rt_thread_create("mtd_mount", mtd_mount, RT_NULL,`
	`120`	`+ tid = rt_thread_create("spiflash_mount", spiflash_mount, RT_NULL,`
`123`	`121`	`1024, RT_THREAD_PRIORITY_MAX - 3, 20);`
`124`	`122`	`if (tid != RT_NULL)`
`125`	`123`	`{`
`126`	`124`	`rt_thread_startup(tid);`
`127`	`125`	`}`
`128`	`126`	`else`
`129`	`127`	`{`
`130`		`- LOG_E("create mtd_mount thread err!");`
	`128`	`+ LOG_E("create spiflash_mount thread err!");`
`131`	`129`	`}`
`132`	`130`	`}`
`133`	`131`
`@@ -141,11 +139,10 @@ static const struct romfs_dirent _romfs_root[] =`
`141`	`139`	`#ifdef BSP_USING_SDCARD`
`142`	`140`	`{ROMFS_DIRENT_DIR, "sdcard", RT_NULL, 0},`
`143`	`141`	`#endif`
`144`		`-#ifdef BSP_USING_NOR_MTD_FS`
	`142`	`+`
	`143`	`+#ifdef BSP_USING_SPI_FLASH_LITTLEFS`
`145`	`144`	`{ROMFS_DIRENT_DIR, "flash", RT_NULL, 0},`
`146`	`145`	`#endif`
`147`		`-`
`148`		`-// {ROMFS_DIRENT_DIR, "flash", RT_NULL, 0},`
`149`	`146`	`};`
`150`	`147`
`151`	`148`	`const struct romfs_dirent romfs_root =`
`@@ -163,8 +160,8 @@ static int filesystem_mount(void)`
`163`	`160`	`onboard_sdcard_mount();`
`164`	`161`	`#endif`
`165`	`162`
`166`		`-#ifdef BSP_USING_NOR_MTD_FS`
`167`		`- onboard_mtd_mount();`
	`163`	`+#ifdef BSP_USING_SPI_FLASH_LITTLEFS`
	`164`	`+ onboard_spiflash_mount();`
`168`	`165`	`#endif`
`169`	`166`
`170`	`167`	`return RT_EOK;`