From d3ab42b8b894c5e259d5bd8ad02e62f6d18f01ea Mon Sep 17 00:00:00 2001
From: Supowang <54426333+Supowang1989@users.noreply.github.com>
Date: Tue, 7 Jun 2022 16:50:00 +0800
Subject: [PATCH] Revert "board_perf:add support for kv and vfs on ch32v307
board"
This reverts commit 4f5c747a63639efbcfff2b9e4f61bd2556c007c8.
---
board/TencentOS_Tiny_CH32V307_EVB/.cproject | 9 +-
board/TencentOS_Tiny_CH32V307_EVB/.project | 57 +--
board/TencentOS_Tiny_CH32V307_EVB/User/main.c | 125 +++---
.../{examples => User}/mqtt_iot_explorer.c | 16 +-
board/TencentOS_Tiny_CH32V307_EVB/User/sdio.h | 11 +-
.../User/spi_flash.c | 34 --
.../User/spi_flash.h | 8 +-
.../User/spi_flash_kv.c | 35 --
.../examples/fatfs_through_vfs_sample.c | 84 ----
.../examples/kv_sample.c | 84 ----
components/fs/fatfs/wrapper/include/ff.h | 406 ------------------
components/fs/fatfs/wrapper/include/ffconf.h | 288 -------------
components/fs/kv/tos_kv.c | 22 +-
components/fs/vfs/tos_vfs_fs.c | 4 +-
platform/hal/wch/ch32v30xx/src/tos_hal_sd.c | 126 ------
15 files changed, 114 insertions(+), 1195 deletions(-)
rename board/TencentOS_Tiny_CH32V307_EVB/{examples => User}/mqtt_iot_explorer.c (97%)
delete mode 100644 board/TencentOS_Tiny_CH32V307_EVB/User/spi_flash_kv.c
delete mode 100644 board/TencentOS_Tiny_CH32V307_EVB/examples/fatfs_through_vfs_sample.c
delete mode 100644 board/TencentOS_Tiny_CH32V307_EVB/examples/kv_sample.c
delete mode 100644 components/fs/fatfs/wrapper/include/ff.h
delete mode 100644 components/fs/fatfs/wrapper/include/ffconf.h
delete mode 100644 platform/hal/wch/ch32v30xx/src/tos_hal_sd.c
diff --git a/board/TencentOS_Tiny_CH32V307_EVB/.cproject b/board/TencentOS_Tiny_CH32V307_EVB/.cproject
index e27e9c7c..d9d977c8 100644
--- a/board/TencentOS_Tiny_CH32V307_EVB/.cproject
+++ b/board/TencentOS_Tiny_CH32V307_EVB/.cproject
@@ -70,12 +70,10 @@
+
-
-
-
@@ -126,7 +124,7 @@
-
+
@@ -134,9 +132,6 @@
-
-
-
diff --git a/board/TencentOS_Tiny_CH32V307_EVB/.project b/board/TencentOS_Tiny_CH32V307_EVB/.project
index dec27522..207673be 100644
--- a/board/TencentOS_Tiny_CH32V307_EVB/.project
+++ b/board/TencentOS_Tiny_CH32V307_EVB/.project
@@ -1,18 +1,18 @@
-
+
TencentOS-Tiny
-
-
+
+
org.eclipse.cdt.managedbuilder.core.genmakebuilder
clean,full,incremental,
-
+
org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
full,incremental,
-
+
@@ -24,58 +24,43 @@
arch
2
- PARENT-2-PROJECT_LOC/arch/risc-v/risc-v3a
-
-
- devices/esp8266_tencent_firmware
- 2
- PARENT-2-PROJECT_LOC/devices/esp8266_tencent_firmware
+ PARENT-2-PROJECT_LOC/arch/risc-v/risc-v3a
kernel/core
2
- PARENT-2-PROJECT_LOC/kernel/core
-
-
- kernel/hal
- 2
- PARENT-2-PROJECT_LOC/kernel/hal
+ PARENT-2-PROJECT_LOC/kernel/core
net/at
2
- PARENT-2-PROJECT_LOC/net/at
+ PARENT-2-PROJECT_LOC/net/at
net/tencent_firmware_module_wrapper
2
- PARENT-2-PROJECT_LOC/net/tencent_firmware_module_wrapper
+ PARENT-2-PROJECT_LOC/net/tencent_firmware_module_wrapper
+
+
+ devices/esp8266_tencent_firmware
+ 2
+ PARENT-2-PROJECT_LOC/devices/esp8266_tencent_firmware
+
+
+ kernel/hal
+ 2
+ PARENT-2-PROJECT_LOC/kernel/hal
platform/hal/wch/ch32v30xx
2
- PARENT-2-PROJECT_LOC/platform/hal/wch/ch32v30xx/src
-
-
- fs/kv
- 2
- PARENT-2-PROJECT_LOC/components/fs/kv
-
-
- fs/vfs
- 2
- PARENT-2-PROJECT_LOC/components/fs/vfs
-
-
- fs/fatfs
- 2
- PARENT-2-PROJECT_LOC/components/fs/fatfs/wrapper
+ PARENT-2-PROJECT_LOC/platform/hal/wch/ch32v30xx/src
1595986042669
-
+
22
org.eclipse.ui.ide.multiFilter
diff --git a/board/TencentOS_Tiny_CH32V307_EVB/User/main.c b/board/TencentOS_Tiny_CH32V307_EVB/User/main.c
index aacec924..b6068087 100644
--- a/board/TencentOS_Tiny_CH32V307_EVB/User/main.c
+++ b/board/TencentOS_Tiny_CH32V307_EVB/User/main.c
@@ -53,30 +53,6 @@ uint8_t get_key(void)
return 0;
}
-void lcd_test()
-{
- u8 i,j;
- float t=0;
-
- LCD_ShowString(0,0,"Welcome TencentOS",WHITE,BLACK,32,0);
- LCD_ShowString(0,40,"LCD_W:",WHITE,BLACK,16,0);
- LCD_ShowIntNum(48,40,LCD_W,3,WHITE,BLACK,16);
- LCD_ShowString(80,40,"LCD_H:",WHITE,BLACK,16,0);
- LCD_ShowIntNum(128,40,LCD_H,3,WHITE,BLACK,16);
- LCD_ShowString(80,40,"LCD_H:",WHITE,BLACK,16,0);
- LCD_ShowString(0,70,"Increaseing Nun:",WHITE,BLACK,16,0);
- LCD_ShowFloatNum1(128,70,t,4,WHITE,BLACK,16);
- t+=0.11;
- for(j=0;j<3;j++)
- {
- for(i=0;i<6;i++)
- {
- LCD_ShowPicture(40*i,120+j*40,40,40,gImage_1);
- }
- }
- printf("lcd test finish\r\n");
-}
-
/*********************************************************************
* @fn show_sdcard_info
*
@@ -133,46 +109,33 @@ void spi_flash_test(void)
default:
printf("Fail!\r\n");
break;
- }
- printf("Start Read W25Qxx before erase....\r\n");
- SPI_Flash_Read(datap,0x0,SIZE);
- for(int16_t i=0;i sizeof(report_topic_name) - 1) {
printf("pub topic content length not enough! content size:%d buf size:%d", size, (int)sizeof(report_topic_name));
}
-
+
while (1) {
tos_sleep_ms(5000);
/* use AT+PUB AT command */
memset(payload, 0, sizeof(payload));
snprintf(payload, sizeof(payload), REPORT_DATA_TEMPLATE, lightness++);
-
+
if (lightness > 100) {
lightness = 0;
}
-
+
if (tos_tf_module_mqtt_pub(report_topic_name, QOS0, payload) != 0) {
printf("module mqtt pub fail\n");
break;
@@ -100,7 +100,7 @@ void mqtt_demo_task(void)
}
}
-void application_entry(void *arg)
+void application_entry1(void *arg)
{
mqtt_demo_task();
while (1) {
diff --git a/board/TencentOS_Tiny_CH32V307_EVB/User/sdio.h b/board/TencentOS_Tiny_CH32V307_EVB/User/sdio.h
index ed46c340..1b9ad379 100644
--- a/board/TencentOS_Tiny_CH32V307_EVB/User/sdio.h
+++ b/board/TencentOS_Tiny_CH32V307_EVB/User/sdio.h
@@ -6,7 +6,7 @@
* Description : This file contains the headers of the SDIO.
*******************************************************************************/
#ifndef __SDIO_H
-#define __SDIO_H
+#define __SDIO_H
#include"debug.h"
@@ -346,3 +346,12 @@ u8 SD_ReadDisk(u8*buf,u32 sector,u8 cnt);
u8 SD_WriteDisk(u8*buf,u32 sector,u8 cnt);
#endif
+
+
+
+
+
+
+
+
+
diff --git a/board/TencentOS_Tiny_CH32V307_EVB/User/spi_flash.c b/board/TencentOS_Tiny_CH32V307_EVB/User/spi_flash.c
index 168b81df..34858f6a 100644
--- a/board/TencentOS_Tiny_CH32V307_EVB/User/spi_flash.c
+++ b/board/TencentOS_Tiny_CH32V307_EVB/User/spi_flash.c
@@ -211,40 +211,6 @@ void SPI_Flash_Erase_Sector(u32 Dst_Addr)
SPI_Flash_Wait_Busy();
}
-/*********************************************************************
- * @fn SPI_Flash_Erase_Sector
- *
- * @brief Erase amount sector(4Kbyte).
- *
- * @param addr - Initial address(24bit).
- * size - Data length.
- *
- * @return errcode
- */
-int SPI_Flash_Erase(u32 Addr, int size)
-{
- uint32_t begin;
- uint32_t end;
- int i;
-
- if (size < 0
- || Addr > SPI_FLASH_TOTAL_SIZE
- || Addr + size > SPI_FLASH_TOTAL_SIZE)
- {
- return -1;
- }
-
- begin = Addr / SPI_FLASH_SECTOR * SPI_FLASH_SECTOR;
- end = (Addr + size - 1) / SPI_FLASH_SECTOR * SPI_FLASH_SECTOR;
-
- for (i = begin; i <= end; i += SPI_FLASH_SECTOR)
- {
- SPI_Flash_Erase_Sector(i);
- }
-
- return 0;
-}
-
/*********************************************************************
* @fn SPI_Flash_Read
*
diff --git a/board/TencentOS_Tiny_CH32V307_EVB/User/spi_flash.h b/board/TencentOS_Tiny_CH32V307_EVB/User/spi_flash.h
index 0b6fa84b..b5271d97 100644
--- a/board/TencentOS_Tiny_CH32V307_EVB/User/spi_flash.h
+++ b/board/TencentOS_Tiny_CH32V307_EVB/User/spi_flash.h
@@ -1,5 +1,5 @@
#ifndef __SPI_FLASH_H
-#define __SPI_FLASH_H
+#define __SPI_FLASH_H
#include "debug.h"
#include "string.h"
@@ -10,11 +10,6 @@
#define W25Q64 0XEF16
#define W25Q128 0XEF17
-/* Winbond W25Q64 */
-#define SPI_FLASH_PAGESIZE 256
-#define SPI_FLASH_SECTOR 4096
-#define SPI_FLASH_TOTAL_SIZE 0x7FFFFF
-
/* Winbond SPIFalsh Instruction List */
#define W25X_WriteEnable 0x06
#define W25X_WriteDisable 0x04
@@ -50,7 +45,6 @@ void SPI_FLASH_Write_Enable(void);
void SPI_FLASH_Write_Disable(void);
u16 SPI_Flash_ReadID(void);
void SPI_Flash_Erase_Sector(u32 Dst_Addr);
-int SPI_Flash_Erase(u32 Addr, int size);
void SPI_Flash_Read(u8* pBuffer,u32 ReadAddr,u16 size);
void SPI_Flash_Write_Page(u8* pBuffer,u32 WriteAddr,u16 size);
void SPI_Flash_Write_NoCheck(u8* pBuffer,u32 WriteAddr,u16 size);
diff --git a/board/TencentOS_Tiny_CH32V307_EVB/User/spi_flash_kv.c b/board/TencentOS_Tiny_CH32V307_EVB/User/spi_flash_kv.c
deleted file mode 100644
index 307359cd..00000000
--- a/board/TencentOS_Tiny_CH32V307_EVB/User/spi_flash_kv.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "tos_kv.h"
-#include "spi_flash.h"
-
-#define SECTOR_SIZE 4096 // sector size for spiflash
-#define SECTOR_SIZE_LOG2 12 // 2 ^ 12 = 4096
-
-int ch32v30x_spiflash_read(uint32_t addr, void *buf, size_t len)
-{
- SPI_Flash_Read(buf, addr, len);
-
- return 0;
-}
-
-int ch32v30x_spiflash_write(uint32_t addr, const void *buf, size_t len)
-{
- SPI_Flash_Write((void*)buf, addr, len);
-
- return 0;
-}
-
-int ch32v30x_spiflash_erase(uint32_t addr, size_t size)
-{
- return SPI_Flash_Erase(addr, size);
-}
-
-kv_flash_drv_t ch32v30x_spiflash_drv = {
- .write = ch32v30x_spiflash_write,
- .read = ch32v30x_spiflash_read,
- .erase = ch32v30x_spiflash_erase,
-};
-
-kv_flash_prop_t ch32v30x_spiflash_prop = {
- .sector_size_log2 = SECTOR_SIZE_LOG2,
- .pgm_type = KV_FLASH_PROGRAM_TYPE_BYTE,
-};
diff --git a/board/TencentOS_Tiny_CH32V307_EVB/examples/fatfs_through_vfs_sample.c b/board/TencentOS_Tiny_CH32V307_EVB/examples/fatfs_through_vfs_sample.c
deleted file mode 100644
index 0cb3f31d..00000000
--- a/board/TencentOS_Tiny_CH32V307_EVB/examples/fatfs_through_vfs_sample.c
+++ /dev/null
@@ -1,84 +0,0 @@
-#include "tos_k.h"
-#include "tos_hal.h"
-#include "ff.h"
-#include "tos_vfs.h"
-#include "tos_fatfs_drv.h"
-#include "tos_fatfs_vfs.h"
-
-char buf[512];
-
-void application_entry(void *arg)
-{
- int fd, ret;
- vfs_err_t err;
- extern vfs_blkdev_ops_t sd_dev;
- extern vfs_fs_ops_t fatfs_ops;
-
- err = tos_vfs_block_device_register("/dev/sd", &sd_dev);
- if (err != VFS_ERR_NONE) {
- printf("/dev/sd block device register failed!\n");
- }
-
- err = tos_vfs_fs_register("fatfs_sd", &fatfs_ops);
- if (err != VFS_ERR_NONE) {
- printf("fatfs_sd fs register failed!\n");
- }
-
- if (tos_vfs_fs_mkfs("/dev/sd", "fatfs_sd", FM_FAT32, 0) != 0) {
- printf("mkfs failed!\n");
- }
-
- if (tos_vfs_fs_mount("/dev/sd", "/fs/fatfs_sd", "fatfs_sd") != 0) {
- printf("mount failed!\n");
- }
-
- fd = tos_vfs_open("/fs/fatfs_sd/test_file.txt", VFS_OFLAG_CREATE_ALWAYS | VFS_OFLAG_WRITE);
- if (fd < 0) {
- printf("open failed!\n");
- }
-
- ret = tos_vfs_write(fd, "fatfs sample content", strlen("fatfs sample content"));
- if (ret >= 0) {
- printf("write ok\n");
- printf("write data:\n%s\n", "fatfs sample content");
- } else {
- printf("write error: %d\n", ret);
- }
- ret = tos_vfs_close(fd);
- if (ret < 0) {
- printf("close failed!\n");
- }
-
- fd = tos_vfs_open("/fs/fatfs_sd/test_file.txt", VFS_OFLAG_EXISTING | VFS_OFLAG_READ);
- if (fd < 0) {
- printf("open file error!\n");
- }
-
- memset(buf, 0, sizeof(buf));
- ret = tos_vfs_read(fd, buf, sizeof(buf));
- if (ret >= 0) {
- printf("read ok: %d\n", ret);
- printf("read data:\n%s\n", buf);
- } else {
- printf("read error: %d\n", ret);
- }
-
- ////////////////////////////////////////////////
- ret = tos_vfs_lseek(fd, 2, VFS_SEEK_CUR);
- if (ret < 0) {
- printf("lseek error\n");
- }
-
- memset(buf, 0, sizeof(buf));
- ret = tos_vfs_read(fd, buf, sizeof(buf));
- if (ret >= 0) {
- printf("read ok: %d\n", ret);
- printf("read data:\n%s\n", buf);
- } else {
- printf("read error: %d\n", ret);
- }
- /////////////////////////////////////////////////
-
- tos_vfs_close(fd);
-}
-
diff --git a/board/TencentOS_Tiny_CH32V307_EVB/examples/kv_sample.c b/board/TencentOS_Tiny_CH32V307_EVB/examples/kv_sample.c
deleted file mode 100644
index 4f720d7c..00000000
--- a/board/TencentOS_Tiny_CH32V307_EVB/examples/kv_sample.c
+++ /dev/null
@@ -1,84 +0,0 @@
-#include "tos_kv.h"
-
-extern kv_flash_drv_t ch32v30x_spiflash_drv;
-extern kv_flash_prop_t ch32v30x_spiflash_prop;
-
-//#define KV_SAMPLE_DEBUG
-
-void disp_value(uint8_t *value, uint32_t value_len)
-{
- int i = 0;
-
- printf("value_len: %d\r\n", value_len);
-
- printf("\"");
- for (i = 0; i < value_len; ++i) {
- printf("%c", value[i]);
- }
- printf("\"\r\n\n");
-}
-
-void kv_test(void)
-{
- int has_key;
- kv_err_t err;
- uint8_t value_buf[40];
- uint32_t value_len;
-
- err = tos_kv_init(0, 2 * 4096, &ch32v30x_spiflash_drv, &ch32v30x_spiflash_prop);
- printf("kv init, rc: %d\r\n", err);
-
- has_key = tos_kv_has_key("key00");
- printf("has key[%s] ? %s\r\n\n", "key00", has_key ? "True" : "False");
-
- err = tos_kv_set("key00", "value_00", strlen("value_00"));
- printf("kv set(%s), rc: %d\r\n\n", "key00", err);
-
- has_key = tos_kv_has_key("key00");
- printf("has key[%s] ? %s\r\n\n", "key00", has_key ? "True" : "False");
-
- if (err == KV_ERR_NONE) {
- err = tos_kv_get("key00", value_buf, sizeof(value_buf), &value_len);
- printf("kv get(%s), rc: %d\r\n\n", "key00", err);
-
- if (err == KV_ERR_NONE) {
- disp_value(value_buf, value_len);
- }
-
-#ifdef KV_SAMPLE_DEBUG
- tos_kv_walkthru();
-#endif
- }
-
- err = tos_kv_set("key00", "value_xx", strlen("value_xx"));
- printf("kv set(%s), rc: %d\r\n\n", "key00", err);
-
- if (err == KV_ERR_NONE) {
- err = tos_kv_get("key00", value_buf, sizeof(value_buf), &value_len);
- printf("kv get(%s), rc: %d\r\n\n", "key00", err);
-
- if (err == KV_ERR_NONE) {
- disp_value(value_buf, value_len);
- }
- }
-
-#ifdef KV_SAMPLE_DEBUG
- tos_kv_walkthru();
-#endif
-
- err = tos_kv_del("key00");
- printf("kv del(%s), rc: %d\r\n\n", "key00", err);
-
- has_key = tos_kv_has_key("key00");
- printf("has key[%s] ? %s\r\n\n", "key00", has_key ? "True" : "False");
-
-#ifdef KV_SAMPLE_DEBUG
- tos_kv_walkthru();
-#endif
-}
-
-void application_entry(void *arg)
-{
- kv_test();
-}
-
diff --git a/components/fs/fatfs/wrapper/include/ff.h b/components/fs/fatfs/wrapper/include/ff.h
deleted file mode 100644
index 1ded9fd6..00000000
--- a/components/fs/fatfs/wrapper/include/ff.h
+++ /dev/null
@@ -1,406 +0,0 @@
-/*----------------------------------------------------------------------------/
-/ FatFs - Generic FAT Filesystem module R0.13c /
-/-----------------------------------------------------------------------------/
-/
-/ Copyright (C) 2018, ChaN, all right reserved.
-/
-/ FatFs module is an open source software. Redistribution and use of FatFs in
-/ source and binary forms, with or without modification, are permitted provided
-/ that the following condition is met:
-
-/ 1. Redistributions of source code must retain the above copyright notice,
-/ this condition and the following disclaimer.
-/
-/ This software is provided by the copyright holder and contributors "AS IS"
-/ and any warranties related to this software are DISCLAIMED.
-/ The copyright owner or contributors be NOT LIABLE for any damages caused
-/ by use of this software.
-/
-/----------------------------------------------------------------------------*/
-
-
-#ifndef FF_DEFINED
-#define FF_DEFINED 86604 /* Revision ID */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "ffconf.h" /* FatFs configuration options */
-
-#if FF_DEFINED != FFCONF_DEF
-#error Wrong configuration file (ffconf.h).
-#endif
-
-
-/* Integer types used for FatFs API */
-
-#if defined(_WIN32) /* Main development platform */
-#define FF_INTDEF 2
-#include
-typedef unsigned __int64 QWORD;
-#elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) /* C99 or later */
-#define FF_INTDEF 2
-#include
-typedef unsigned int UINT; /* int must be 16-bit or 32-bit */
-typedef unsigned char BYTE; /* char must be 8-bit */
-typedef uint16_t WORD; /* 16-bit unsigned integer */
-typedef uint16_t WCHAR; /* 16-bit unsigned integer */
-typedef uint32_t DWORD; /* 32-bit unsigned integer */
-typedef uint64_t QWORD; /* 64-bit unsigned integer */
-#else /* Earlier than C99 */
-#define FF_INTDEF 1
-typedef unsigned int UINT; /* int must be 16-bit or 32-bit */
-typedef unsigned char BYTE; /* char must be 8-bit */
-typedef unsigned short WORD; /* 16-bit unsigned integer */
-typedef unsigned short WCHAR; /* 16-bit unsigned integer */
-typedef unsigned long DWORD; /* 32-bit unsigned integer */
-#endif
-
-
-/* Definitions of volume management */
-
-#if FF_MULTI_PARTITION /* Multiple partition configuration */
-typedef struct {
- BYTE pd; /* Physical drive number */
- BYTE pt; /* Partition: 0:Auto detect, 1-4:Forced partition) */
-} PARTITION;
-extern PARTITION VolToPart[]; /* Volume - Partition resolution table */
-#endif
-
-#if FF_STR_VOLUME_ID
-#ifndef FF_VOLUME_STRS
-extern const char* VolumeStr[FF_VOLUMES]; /* User defied volume ID */
-#endif
-#endif
-
-
-
-/* Type of path name strings on FatFs API */
-
-#ifndef _INC_TCHAR
-#define _INC_TCHAR
-
-#if FF_USE_LFN && FF_LFN_UNICODE == 1 /* Unicode in UTF-16 encoding */
-typedef WCHAR TCHAR;
-#define _T(x) L ## x
-#define _TEXT(x) L ## x
-#elif FF_USE_LFN && FF_LFN_UNICODE == 2 /* Unicode in UTF-8 encoding */
-typedef char TCHAR;
-#define _T(x) u8 ## x
-#define _TEXT(x) u8 ## x
-#elif FF_USE_LFN && FF_LFN_UNICODE == 3 /* Unicode in UTF-32 encoding */
-typedef DWORD TCHAR;
-#define _T(x) U ## x
-#define _TEXT(x) U ## x
-#elif FF_USE_LFN && (FF_LFN_UNICODE < 0 || FF_LFN_UNICODE > 3)
-#error Wrong FF_LFN_UNICODE setting
-#else /* ANSI/OEM code in SBCS/DBCS */
-typedef char TCHAR;
-#define _T(x) x
-#define _TEXT(x) x
-#endif
-
-#endif
-
-
-
-/* Type of file size variables */
-
-#if FF_FS_EXFAT
-#if FF_INTDEF != 2
-#error exFAT feature wants C99 or later
-#endif
-typedef QWORD FSIZE_t;
-#else
-typedef DWORD FSIZE_t;
-#endif
-
-
-
-/* Filesystem object structure (FATFS) */
-
-typedef struct {
- BYTE fs_type; /* Filesystem type (0:not mounted) */
- BYTE pdrv; /* Associated physical drive */
- BYTE n_fats; /* Number of FATs (1 or 2) */
- BYTE wflag; /* win[] flag (b0:dirty) */
- BYTE fsi_flag; /* FSINFO flags (b7:disabled, b0:dirty) */
- WORD id; /* Volume mount ID */
- WORD n_rootdir; /* Number of root directory entries (FAT12/16) */
- WORD csize; /* Cluster size [sectors] */
-#if FF_MAX_SS != FF_MIN_SS
- WORD ssize; /* Sector size (512, 1024, 2048 or 4096) */
-#endif
-#if FF_USE_LFN
- WCHAR* lfnbuf; /* LFN working buffer */
-#endif
-#if FF_FS_EXFAT
- BYTE* dirbuf; /* Directory entry block scratchpad buffer for exFAT */
-#endif
-#if FF_FS_REENTRANT
- FF_SYNC_t sobj; /* Identifier of sync object */
-#endif
-#if !FF_FS_READONLY
- DWORD last_clst; /* Last allocated cluster */
- DWORD free_clst; /* Number of free clusters */
-#endif
-#if FF_FS_RPATH
- DWORD cdir; /* Current directory start cluster (0:root) */
-#if FF_FS_EXFAT
- DWORD cdc_scl; /* Containing directory start cluster (invalid when cdir is 0) */
- DWORD cdc_size; /* b31-b8:Size of containing directory, b7-b0: Chain status */
- DWORD cdc_ofs; /* Offset in the containing directory (invalid when cdir is 0) */
-#endif
-#endif
- DWORD n_fatent; /* Number of FAT entries (number of clusters + 2) */
- DWORD fsize; /* Size of an FAT [sectors] */
- DWORD volbase; /* Volume base sector */
- DWORD fatbase; /* FAT base sector */
- DWORD dirbase; /* Root directory base sector/cluster */
- DWORD database; /* Data base sector */
-#if FF_FS_EXFAT
- DWORD bitbase; /* Allocation bitmap base sector */
-#endif
- DWORD winsect; /* Current sector appearing in the win[] */
- BYTE win[FF_MAX_SS]; /* Disk access window for Directory, FAT (and file data at tiny cfg) */
-} FATFS;
-
-
-
-/* Object ID and allocation information (FFOBJID) */
-
-typedef struct {
- FATFS* fs; /* Pointer to the hosting volume of this object */
- WORD id; /* Hosting volume mount ID */
- BYTE attr; /* Object attribute */
- BYTE stat; /* Object chain status (b1-0: =0:not contiguous, =2:contiguous, =3:fragmented in this session, b2:sub-directory stretched) */
- DWORD sclust; /* Object data start cluster (0:no cluster or root directory) */
- FSIZE_t objsize; /* Object size (valid when sclust != 0) */
-#if FF_FS_EXFAT
- DWORD n_cont; /* Size of first fragment - 1 (valid when stat == 3) */
- DWORD n_frag; /* Size of last fragment needs to be written to FAT (valid when not zero) */
- DWORD c_scl; /* Containing directory start cluster (valid when sclust != 0) */
- DWORD c_size; /* b31-b8:Size of containing directory, b7-b0: Chain status (valid when c_scl != 0) */
- DWORD c_ofs; /* Offset in the containing directory (valid when file object and sclust != 0) */
-#endif
-#if FF_FS_LOCK
- UINT lockid; /* File lock ID origin from 1 (index of file semaphore table Files[]) */
-#endif
-} FFOBJID;
-
-
-
-/* File object structure (FIL) */
-
-typedef struct {
- FFOBJID obj; /* Object identifier (must be the 1st member to detect invalid object pointer) */
- BYTE flag; /* File status flags */
- BYTE err; /* Abort flag (error code) */
- FSIZE_t fptr; /* File read/write pointer (Zeroed on file open) */
- DWORD clust; /* Current cluster of fpter (invalid when fptr is 0) */
- DWORD sect; /* Sector number appearing in buf[] (0:invalid) */
-#if !FF_FS_READONLY
- DWORD dir_sect; /* Sector number containing the directory entry (not used at exFAT) */
- BYTE* dir_ptr; /* Pointer to the directory entry in the win[] (not used at exFAT) */
-#endif
-#if FF_USE_FASTSEEK
- DWORD* cltbl; /* Pointer to the cluster link map table (nulled on open, set by application) */
-#endif
-#if !FF_FS_TINY
- BYTE buf[FF_MAX_SS]; /* File private data read/write window */
-#endif
-} FIL;
-
-
-
-/* Directory object structure (DIR) */
-
-typedef struct {
- FFOBJID obj; /* Object identifier */
- DWORD dptr; /* Current read/write offset */
- DWORD clust; /* Current cluster */
- DWORD sect; /* Current sector (0:Read operation has terminated) */
- BYTE* dir; /* Pointer to the directory item in the win[] */
- BYTE fn[12]; /* SFN (in/out) {body[8],ext[3],status[1]} */
-#if FF_USE_LFN
- DWORD blk_ofs; /* Offset of current entry block being processed (0xFFFFFFFF:Invalid) */
-#endif
-#if FF_USE_FIND
- const TCHAR* pat; /* Pointer to the name matching pattern */
-#endif
-} DIR;
-
-
-
-/* File information structure (FILINFO) */
-
-typedef struct {
- FSIZE_t fsize; /* File size */
- WORD fdate; /* Modified date */
- WORD ftime; /* Modified time */
- BYTE fattrib; /* File attribute */
-#if FF_USE_LFN
- TCHAR altname[FF_SFN_BUF + 1];/* Altenative file name */
- TCHAR fname[FF_LFN_BUF + 1]; /* Primary file name */
-#else
- TCHAR fname[12 + 1]; /* File name */
-#endif
-} FILINFO;
-
-
-
-/* File function return code (FRESULT) */
-
-typedef enum {
- FR_OK = 0, /* (0) Succeeded */
- FR_DISK_ERR, /* (1) A hard error occurred in the low level disk I/O layer */
- FR_INT_ERR, /* (2) Assertion failed */
- FR_NOT_READY, /* (3) The physical drive cannot work */
- FR_NO_FILE, /* (4) Could not find the file */
- FR_NO_PATH, /* (5) Could not find the path */
- FR_INVALID_NAME, /* (6) The path name format is invalid */
- FR_DENIED, /* (7) Access denied due to prohibited access or directory full */
- FR_EXIST, /* (8) Access denied due to prohibited access */
- FR_INVALID_OBJECT, /* (9) The file/directory object is invalid */
- FR_WRITE_PROTECTED, /* (10) The physical drive is write protected */
- FR_INVALID_DRIVE, /* (11) The logical drive number is invalid */
- FR_NOT_ENABLED, /* (12) The volume has no work area */
- FR_NO_FILESYSTEM, /* (13) There is no valid FAT volume */
- FR_MKFS_ABORTED, /* (14) The f_mkfs() aborted due to any problem */
- FR_TIMEOUT, /* (15) Could not get a grant to access the volume within defined period */
- FR_LOCKED, /* (16) The operation is rejected according to the file sharing policy */
- FR_NOT_ENOUGH_CORE, /* (17) LFN working buffer could not be allocated */
- FR_TOO_MANY_OPEN_FILES, /* (18) Number of open files > FF_FS_LOCK */
- FR_INVALID_PARAMETER, /* (19) Given parameter is invalid */
- FR_INVALID_DEV_OPS, /* (20) */
-} FRESULT;
-
-
-
-/*--------------------------------------------------------------*/
-/* FatFs module application interface */
-
-FRESULT f_open (FIL* fp, const TCHAR* path, BYTE mode); /* Open or create a file */
-FRESULT f_close (FIL* fp); /* Close an open file object */
-FRESULT f_read (FIL* fp, void* buff, UINT btr, UINT* br); /* Read data from the file */
-FRESULT f_write (FIL* fp, const void* buff, UINT btw, UINT* bw); /* Write data to the file */
-FRESULT f_lseek (FIL* fp, FSIZE_t ofs); /* Move file pointer of the file object */
-FRESULT f_truncate (FIL* fp); /* Truncate the file */
-FRESULT f_sync (FIL* fp); /* Flush cached data of the writing file */
-FRESULT f_opendir (DIR* dp, const TCHAR* path); /* Open a directory */
-FRESULT f_closedir (DIR* dp); /* Close an open directory */
-FRESULT f_readdir (DIR* dp, FILINFO* fno); /* Read a directory item */
-FRESULT f_findfirst (DIR* dp, FILINFO* fno, const TCHAR* path, const TCHAR* pattern); /* Find first file */
-FRESULT f_findnext (DIR* dp, FILINFO* fno); /* Find next file */
-FRESULT f_mkdir (const TCHAR* path); /* Create a sub directory */
-FRESULT f_unlink (const TCHAR* path); /* Delete an existing file or directory */
-FRESULT f_rename (const TCHAR* path_old, const TCHAR* path_new); /* Rename/Move a file or directory */
-FRESULT f_stat (const TCHAR* path, FILINFO* fno); /* Get file status */
-FRESULT f_chmod (const TCHAR* path, BYTE attr, BYTE mask); /* Change attribute of a file/dir */
-FRESULT f_utime (const TCHAR* path, const FILINFO* fno); /* Change timestamp of a file/dir */
-FRESULT f_chdir (const TCHAR* path); /* Change current directory */
-FRESULT f_chdrive (const TCHAR* path); /* Change current drive */
-FRESULT f_getcwd (TCHAR* buff, UINT len); /* Get current directory */
-FRESULT f_getfree (const TCHAR* path, DWORD* nclst, FATFS** fatfs); /* Get number of free clusters on the drive */
-FRESULT f_getlabel (const TCHAR* path, TCHAR* label, DWORD* vsn); /* Get volume label */
-FRESULT f_setlabel (const TCHAR* label); /* Set volume label */
-FRESULT f_forward (FIL* fp, UINT(*func)(const BYTE*,UINT), UINT btf, UINT* bf); /* Forward data to the stream */
-FRESULT f_expand (FIL* fp, FSIZE_t szf, BYTE opt); /* Allocate a contiguous block to the file */
-FRESULT f_mount (FATFS* fs, const TCHAR* path, BYTE opt); /* Mount/Unmount a logical drive */
-FRESULT f_mkfs (const TCHAR* path, BYTE opt, DWORD au, void* work, UINT len); /* Create a FAT volume */
-FRESULT f_fdisk (BYTE pdrv, const DWORD* szt, void* work); /* Divide a physical drive into some partitions */
-FRESULT f_setcp (WORD cp); /* Set current code page */
-int f_putc (TCHAR c, FIL* fp); /* Put a character to the file */
-int f_puts (const TCHAR* str, FIL* cp); /* Put a string to the file */
-int f_printf (FIL* fp, const TCHAR* str, ...); /* Put a formatted string to the file */
-TCHAR* f_gets (TCHAR* buff, int len, FIL* fp); /* Get a string from the file */
-
-#define f_eof(fp) ((int)((fp)->fptr == (fp)->obj.objsize))
-#define f_error(fp) ((fp)->err)
-#define f_tell(fp) ((fp)->fptr)
-#define f_size(fp) ((fp)->obj.objsize)
-#define f_rewind(fp) f_lseek((fp), 0)
-#define f_rewinddir(dp) f_readdir((dp), 0)
-#define f_rmdir(path) f_unlink(path)
-#define f_unmount(path) f_mount(0, path, 0)
-
-#ifndef EOF
-#define EOF (-1)
-#endif
-
-
-
-
-/*--------------------------------------------------------------*/
-/* Additional user defined functions */
-
-/* RTC function */
-#if !FF_FS_READONLY && !FF_FS_NORTC
-DWORD get_fattime (void);
-#endif
-
-/* LFN support functions */
-#if FF_USE_LFN >= 1 /* Code conversion (defined in unicode.c) */
-WCHAR ff_oem2uni (WCHAR oem, WORD cp); /* OEM code to Unicode conversion */
-WCHAR ff_uni2oem (DWORD uni, WORD cp); /* Unicode to OEM code conversion */
-DWORD ff_wtoupper (DWORD uni); /* Unicode upper-case conversion */
-#endif
-#if FF_USE_LFN == 3 /* Dynamic memory allocation */
-void* ff_memalloc (UINT msize); /* Allocate memory block */
-void ff_memfree (void* mblock); /* Free memory block */
-#endif
-
-/* Sync functions */
-#if FF_FS_REENTRANT
-int ff_cre_syncobj (BYTE vol, FF_SYNC_t* sobj); /* Create a sync object */
-int ff_req_grant (FF_SYNC_t sobj); /* Lock sync object */
-void ff_rel_grant (FF_SYNC_t sobj); /* Unlock sync object */
-int ff_del_syncobj (FF_SYNC_t sobj); /* Delete a sync object */
-#endif
-
-
-
-
-/*--------------------------------------------------------------*/
-/* Flags and offset address */
-
-
-/* File access mode and open method flags (3rd argument of f_open) */
-#define FA_READ 0x01
-#define FA_WRITE 0x02
-#define FA_OPEN_EXISTING 0x00
-#define FA_CREATE_NEW 0x04
-#define FA_CREATE_ALWAYS 0x08
-#define FA_OPEN_ALWAYS 0x10
-#define FA_OPEN_APPEND 0x30
-
-/* Fast seek controls (2nd argument of f_lseek) */
-#define CREATE_LINKMAP ((FSIZE_t)0 - 1)
-
-/* Format options (2nd argument of f_mkfs) */
-#define FM_FAT 0x01
-#define FM_FAT32 0x02
-#define FM_EXFAT 0x04
-#define FM_ANY 0x07
-#define FM_SFD 0x08
-
-/* Filesystem type (FATFS.fs_type) */
-#define FS_FAT12 1
-#define FS_FAT16 2
-#define FS_FAT32 3
-#define FS_EXFAT 4
-
-/* File attribute bits for directory entry (FILINFO.fattrib) */
-#define AM_RDO 0x01 /* Read only */
-#define AM_HID 0x02 /* Hidden */
-#define AM_SYS 0x04 /* System */
-#define AM_DIR 0x10 /* Directory */
-#define AM_ARC 0x20 /* Archive */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* FF_DEFINED */
diff --git a/components/fs/fatfs/wrapper/include/ffconf.h b/components/fs/fatfs/wrapper/include/ffconf.h
deleted file mode 100644
index 2906aeac..00000000
--- a/components/fs/fatfs/wrapper/include/ffconf.h
+++ /dev/null
@@ -1,288 +0,0 @@
-/*---------------------------------------------------------------------------/
-/ FatFs Functional Configurations
-/---------------------------------------------------------------------------*/
-
-#define FFCONF_DEF 86604 /* Revision ID */
-
-/*---------------------------------------------------------------------------/
-/ Function Configurations
-/---------------------------------------------------------------------------*/
-
-#define FF_FS_READONLY 0
-/* This option switches read-only configuration. (0:Read/Write or 1:Read-only)
-/ Read-only configuration removes writing API functions, f_write(), f_sync(),
-/ f_unlink(), f_mkdir(), f_chmod(), f_rename(), f_truncate(), f_getfree()
-/ and optional writing functions as well. */
-
-
-#define FF_FS_MINIMIZE 0
-/* This option defines minimization level to remove some basic API functions.
-/
-/ 0: Basic functions are fully enabled.
-/ 1: f_stat(), f_getfree(), f_unlink(), f_mkdir(), f_truncate() and f_rename()
-/ are removed.
-/ 2: f_opendir(), f_readdir() and f_closedir() are removed in addition to 1.
-/ 3: f_lseek() function is removed in addition to 2. */
-
-
-#define FF_USE_STRFUNC 1
-/* This option switches string functions, f_gets(), f_putc(), f_puts() and f_printf().
-/
-/ 0: Disable string functions.
-/ 1: Enable without LF-CRLF conversion.
-/ 2: Enable with LF-CRLF conversion. */
-
-
-#define FF_USE_FIND 0
-/* This option switches filtered directory read functions, f_findfirst() and
-/ f_findnext(). (0:Disable, 1:Enable 2:Enable with matching altname[] too) */
-
-
-#define FF_USE_MKFS 1
-/* This option switches f_mkfs() function. (0:Disable or 1:Enable) */
-
-
-#define FF_USE_FASTSEEK 1
-/* This option switches fast seek function. (0:Disable or 1:Enable) */
-
-
-#define FF_USE_EXPAND 0
-/* This option switches f_expand function. (0:Disable or 1:Enable) */
-
-
-#define FF_USE_CHMOD 0
-/* This option switches attribute manipulation functions, f_chmod() and f_utime().
-/ (0:Disable or 1:Enable) Also FF_FS_READONLY needs to be 0 to enable this option. */
-
-
-#define FF_USE_LABEL 1
-/* This option switches volume label functions, f_getlabel() and f_setlabel().
-/ (0:Disable or 1:Enable) */
-
-
-#define FF_USE_FORWARD 0
-/* This option switches f_forward() function. (0:Disable or 1:Enable) */
-
-
-/*---------------------------------------------------------------------------/
-/ Locale and Namespace Configurations
-/---------------------------------------------------------------------------*/
-
-#define FF_CODE_PAGE 936
-/* This option specifies the OEM code page to be used on the target system.
-/ Incorrect code page setting can cause a file open failure.
-/
-/ 437 - U.S.
-/ 720 - Arabic
-/ 737 - Greek
-/ 771 - KBL
-/ 775 - Baltic
-/ 850 - Latin 1
-/ 852 - Latin 2
-/ 855 - Cyrillic
-/ 857 - Turkish
-/ 860 - Portuguese
-/ 861 - Icelandic
-/ 862 - Hebrew
-/ 863 - Canadian French
-/ 864 - Arabic
-/ 865 - Nordic
-/ 866 - Russian
-/ 869 - Greek 2
-/ 932 - Japanese (DBCS)
-/ 936 - Simplified Chinese (DBCS)
-/ 949 - Korean (DBCS)
-/ 950 - Traditional Chinese (DBCS)
-/ 0 - Include all code pages above and configured by f_setcp()
-*/
-
-
-#define FF_USE_LFN 3
-#define FF_MAX_LFN 255
-/* The FF_USE_LFN switches the support for LFN (long file name).
-/
-/ 0: Disable LFN. FF_MAX_LFN has no effect.
-/ 1: Enable LFN with static working buffer on the BSS. Always NOT thread-safe.
-/ 2: Enable LFN with dynamic working buffer on the STACK.
-/ 3: Enable LFN with dynamic working buffer on the HEAP.
-/
-/ To enable the LFN, ffunicode.c needs to be added to the project. The LFN function
-/ requiers certain internal working buffer occupies (FF_MAX_LFN + 1) * 2 bytes and
-/ additional (FF_MAX_LFN + 44) / 15 * 32 bytes when exFAT is enabled.
-/ The FF_MAX_LFN defines size of the working buffer in UTF-16 code unit and it can
-/ be in range of 12 to 255. It is recommended to be set 255 to fully support LFN
-/ specification.
-/ When use stack for the working buffer, take care on stack overflow. When use heap
-/ memory for the working buffer, memory management functions, ff_memalloc() and
-/ ff_memfree() in ffsystem.c, need to be added to the project. */
-
-
-#define FF_LFN_UNICODE 0
-/* This option switches the character encoding on the API when LFN is enabled.
-/
-/ 0: ANSI/OEM in current CP (TCHAR = char)
-/ 1: Unicode in UTF-16 (TCHAR = WCHAR)
-/ 2: Unicode in UTF-8 (TCHAR = char)
-/ 3: Unicode in UTF-32 (TCHAR = DWORD)
-/
-/ Also behavior of string I/O functions will be affected by this option.
-/ When LFN is not enabled, this option has no effect. */
-
-
-#define FF_LFN_BUF 255
-#define FF_SFN_BUF 12
-/* This set of options defines size of file name members in the FILINFO structure
-/ which is used to read out directory items. These values should be suffcient for
-/ the file names to read. The maximum possible length of the read file name depends
-/ on character encoding. When LFN is not enabled, these options have no effect. */
-
-
-#define FF_STRF_ENCODE 3
-/* When FF_LFN_UNICODE >= 1 with LFN enabled, string I/O functions, f_gets(),
-/ f_putc(), f_puts and f_printf() convert the character encoding in it.
-/ This option selects assumption of character encoding ON THE FILE to be
-/ read/written via those functions.
-/
-/ 0: ANSI/OEM in current CP
-/ 1: Unicode in UTF-16LE
-/ 2: Unicode in UTF-16BE
-/ 3: Unicode in UTF-8
-*/
-
-
-#define FF_FS_RPATH 0
-/* This option configures support for relative path.
-/
-/ 0: Disable relative path and remove related functions.
-/ 1: Enable relative path. f_chdir() and f_chdrive() are available.
-/ 2: f_getcwd() function is available in addition to 1.
-*/
-
-
-/*---------------------------------------------------------------------------/
-/ Drive/Volume Configurations
-/---------------------------------------------------------------------------*/
-
-#define FF_VOLUMES 3
-/* Number of volumes (logical drives) to be used. (1-10) */
-
-
-#define FF_STR_VOLUME_ID 0
-#define FF_VOLUME_STRS "RAM","NAND","CF","SD","SD2","USB","USB2","USB3"
-/* FF_STR_VOLUME_ID switches support for volume ID in arbitrary strings.
-/ When FF_STR_VOLUME_ID is set to 1 or 2, arbitrary strings can be used as drive
-/ number in the path name. FF_VOLUME_STRS defines the volume ID strings for each
-/ logical drives. Number of items must not be less than FF_VOLUMES. Valid
-/ characters for the volume ID strings are A-Z, a-z and 0-9, however, they are
-/ compared in case-insensitive. If FF_STR_VOLUME_ID >= 1 and FF_VOLUME_STRS is
-/ not defined, a user defined volume string table needs to be defined as:
-/
-/ const char* VolumeStr[FF_VOLUMES] = {"ram","flash","sd","usb",...
-*/
-
-
-#define FF_MULTI_PARTITION 0
-/* This option switches support for multiple volumes on the physical drive.
-/ By default (0), each logical drive number is bound to the same physical drive
-/ number and only an FAT volume found on the physical drive will be mounted.
-/ When this function is enabled (1), each logical drive number can be bound to
-/ arbitrary physical drive and partition listed in the VolToPart[]. Also f_fdisk()
-/ funciton will be available. */
-
-
-#define FF_MIN_SS 512
-#define FF_MAX_SS 512
-/* This set of options configures the range of sector size to be supported. (512,
-/ 1024, 2048 or 4096) Always set both 512 for most systems, generic memory card and
-/ harddisk. But a larger value may be required for on-board flash memory and some
-/ type of optical media. When FF_MAX_SS is larger than FF_MIN_SS, FatFs is configured
-/ for variable sector size mode and disk_ioctl() function needs to implement
-/ GET_SECTOR_SIZE command. */
-
-
-#define FF_USE_TRIM 0
-/* This option switches support for ATA-TRIM. (0:Disable or 1:Enable)
-/ To enable Trim function, also CTRL_TRIM command should be implemented to the
-/ disk_ioctl() function. */
-
-
-#define FF_FS_NOFSINFO 0
-/* If you need to know correct free space on the FAT32 volume, set bit 0 of this
-/ option, and f_getfree() function at first time after volume mount will force
-/ a full FAT scan. Bit 1 controls the use of last allocated cluster number.
-/
-/ bit0=0: Use free cluster count in the FSINFO if available.
-/ bit0=1: Do not trust free cluster count in the FSINFO.
-/ bit1=0: Use last allocated cluster number in the FSINFO if available.
-/ bit1=1: Do not trust last allocated cluster number in the FSINFO.
-*/
-
-
-
-/*---------------------------------------------------------------------------/
-/ System Configurations
-/---------------------------------------------------------------------------*/
-
-#define FF_FS_TINY 0
-/* This option switches tiny buffer configuration. (0:Normal or 1:Tiny)
-/ At the tiny configuration, size of file object (FIL) is shrinked FF_MAX_SS bytes.
-/ Instead of private sector buffer eliminated from the file object, common sector
-/ buffer in the filesystem object (FATFS) is used for the file data transfer. */
-
-
-#define FF_FS_EXFAT 0
-/* This option switches support for exFAT filesystem. (0:Disable or 1:Enable)
-/ To enable exFAT, also LFN needs to be enabled. (FF_USE_LFN >= 1)
-/ Note that enabling exFAT discards ANSI C (C89) compatibility. */
-
-
-#define FF_FS_NORTC 0
-#define FF_NORTC_MON 1
-#define FF_NORTC_MDAY 1
-#define FF_NORTC_YEAR 2018
-/* The option FF_FS_NORTC switches timestamp functiton. If the system does not have
-/ any RTC function or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable
-/ the timestamp function. Every object modified by FatFs will have a fixed timestamp
-/ defined by FF_NORTC_MON, FF_NORTC_MDAY and FF_NORTC_YEAR in local time.
-/ To enable timestamp function (FF_FS_NORTC = 0), get_fattime() function need to be
-/ added to the project to read current time form real-time clock. FF_NORTC_MON,
-/ FF_NORTC_MDAY and FF_NORTC_YEAR have no effect.
-/ These options have no effect at read-only configuration (FF_FS_READONLY = 1). */
-
-
-#define FF_FS_LOCK 0
-/* The option FF_FS_LOCK switches file lock function to control duplicated file open
-/ and illegal operation to open objects. This option must be 0 when FF_FS_READONLY
-/ is 1.
-/
-/ 0: Disable file lock function. To avoid volume corruption, application program
-/ should avoid illegal open, remove and rename to the open objects.
-/ >0: Enable file lock function. The value defines how many files/sub-directories
-/ can be opened simultaneously under file lock control. Note that the file
-/ lock control is independent of re-entrancy. */
-
-
-/* #include // O/S definitions */
-#define FF_FS_REENTRANT 0
-#define FF_FS_TIMEOUT 1000
-#define FF_SYNC_t HANDLE
-/* The option FF_FS_REENTRANT switches the re-entrancy (thread safe) of the FatFs
-/ module itself. Note that regardless of this option, file access to different
-/ volume is always re-entrant and volume control functions, f_mount(), f_mkfs()
-/ and f_fdisk() function, are always not re-entrant. Only file/directory access
-/ to the same volume is under control of this function.
-/
-/ 0: Disable re-entrancy. FF_FS_TIMEOUT and FF_SYNC_t have no effect.
-/ 1: Enable re-entrancy. Also user provided synchronization handlers,
-/ ff_req_grant(), ff_rel_grant(), ff_del_syncobj() and ff_cre_syncobj()
-/ function, must be added to the project. Samples are available in
-/ option/syscall.c.
-/
-/ The FF_FS_TIMEOUT defines timeout period in unit of time tick.
-/ The FF_SYNC_t defines O/S dependent sync object type. e.g. HANDLE, ID, OS_EVENT*,
-/ SemaphoreHandle_t and etc. A header file for O/S definitions needs to be
-/ included somewhere in the scope of ff.h. */
-
-
-
-/*--- End of configuration options ---*/
diff --git a/components/fs/kv/tos_kv.c b/components/fs/kv/tos_kv.c
index 965edd52..b4de95af 100644
--- a/components/fs/kv/tos_kv.c
+++ b/components/fs/kv/tos_kv.c
@@ -1312,44 +1312,44 @@ __DEBUG__ kv_err_t tos_kv_walkthru(void)
uint32_t cur_blk;
kv_blk_hdr_t blk_hdr;
- printf("workspace: 0x%x [%d block]\r\n", KV_MGR_WORKSPACE, KV_BLK_ADDR2IDX(KV_MGR_WORKSPACE));
+ printf("workspace: 0x%x [%d block]\n", KV_MGR_WORKSPACE, KV_BLK_ADDR2IDX(KV_MGR_WORKSPACE));
KV_BLK_FOR_EACH(cur_blk) {
- printf("[%d] block\r\n", i++);
- printf("addr: 0x%x\r\n", cur_blk);
+ printf("[%d] block\n", i++);
+ printf("addr: 0x%x\n", cur_blk);
if (kv_blk_hdr_read(cur_blk, &blk_hdr) != KV_ERR_NONE) {
- printf("block header read failed\r\n");
+ printf("block header read failed\n");
continue;
}
if (!KV_BLK_IS_LEGAL(&blk_hdr)) {
- printf("block not formatted\r\n");
+ printf("block not formatted\n");
continue;
}
if (KV_BLK_IS_GC_SRC(&blk_hdr)) {
- printf("block is gc-src\r\n");
+ printf("block is gc-src\n");
}
if (KV_BLK_IS_GC_DST(&blk_hdr)) {
- printf("block is gc-dst\r\n");
+ printf("block is gc-dst\n");
}
if (KV_BLK_IS_GC_DONE(&blk_hdr)) {
- printf("block is gc-done\r\n");
+ printf("block is gc-done\n");
}
if (KV_BLK_IS_GC_DST_NOT_DONE(&blk_hdr)) {
- printf("block is gc-dst but not done\r\n");
+ printf("block is gc-dst but not done\n");
}
if (kv_block_walkthru(cur_blk) != KV_ERR_NONE) {
- printf("block diagnosis failed\r\n");
+ printf("block diagnosis failed\n");
continue;
}
- printf("\r\n\n");
+ printf("\n\n");
}
return KV_ERR_NONE;
diff --git a/components/fs/vfs/tos_vfs_fs.c b/components/fs/vfs/tos_vfs_fs.c
index 0a278bb6..bad11afa 100644
--- a/components/fs/vfs/tos_vfs_fs.c
+++ b/components/fs/vfs/tos_vfs_fs.c
@@ -178,7 +178,7 @@ __API__ vfs_err_t tos_vfs_fs_mkfs(const char *device_path, const char *fs_name,
{
vfs_fsmap_t *fsmap = K_NULL;
vfs_inode_t *device_inode = K_NULL;
- //vfs_inode_t *fs_inode = K_NULL;
+ vfs_inode_t *fs_inode = K_NULL;
fsmap = vfs_fsmap_get(fs_name);
if (!fsmap) {
@@ -194,7 +194,7 @@ __API__ vfs_err_t tos_vfs_fs_mkfs(const char *device_path, const char *fs_name,
return VFS_ERR_INODE_INVALID;
}
- //device_inode->ops.fs_ops = fsmap->ops;
+ fs_inode->ops.fs_ops = fsmap->ops;
if (!fsmap->ops->mkfs) {
return VFS_ERR_OPS_NULL;
diff --git a/platform/hal/wch/ch32v30xx/src/tos_hal_sd.c b/platform/hal/wch/ch32v30xx/src/tos_hal_sd.c
deleted file mode 100644
index 13ce04c7..00000000
--- a/platform/hal/wch/ch32v30xx/src/tos_hal_sd.c
+++ /dev/null
@@ -1,126 +0,0 @@
-#include "tos_k.h"
-#include "tos_hal.h"
-#include "ch32v30x.h"
-#include "sdio.h"
-
-__API__ int tos_hal_sd_init(hal_sd_t *sd)
-{
- (void)sd;
-
- return SD_Init() == SD_OK ? 0 : -1;
-}
-
-__API__ int tos_hal_sd_read(hal_sd_t *sd, uint8_t *buf, uint32_t blk_addr, uint32_t blk_num, uint32_t timeout)
-{
- uint8_t err;
-
- (void)sd;
-
- if (!buf) {
- return -1;
- }
-
- err = SD_ReadDisk(buf, blk_addr, blk_num);
-
- return err == SD_OK ? 0 : -1;
-}
-
-__API__ int tos_hal_sd_write(hal_sd_t *sd, const uint8_t *buf, uint32_t blk_addr, uint32_t blk_num, uint32_t timeout)
-{
- uint8_t err;
-
- (void)sd;
-
- if (!buf) {
- return -1;
- }
-
- err = SD_WriteDisk((uint8_t *)buf, blk_addr, blk_num);
-
- return err == SD_OK ? 0 : -1;
-}
-
-__API__ int tos_hal_sd_read_dma(hal_sd_t *sd, uint8_t *buf, uint32_t blk_addr, uint32_t blk_num)
-{
- return -1;
-}
-
-__API__ int tos_hal_sd_write_dma(hal_sd_t *sd, const uint8_t *buf, uint32_t blk_addr, uint32_t blk_num)
-{
- return -1;
-}
-
-__API__ int tos_hal_sd_erase(hal_sd_t *sd, uint32_t blk_add_start, uint32_t blk_addr_end)
-{
- return 0;
-}
-
-__API__ int tos_hal_sd_info_get(hal_sd_t *sd, hal_sd_info_t *info)
-{
- SD_Error err;
- SD_CardInfo card_info;
-
- (void)sd;
-
- if (!sd || !info) {
- return -1;
- }
-
- err = SD_GetCardInfo(&card_info);
- if (err != SD_OK) {
- return -1;
- }
-
- info->card_type = card_info.CardType;
- info->blk_num = card_info.CardCapacity / card_info.CardBlockSize;
- info->blk_size = card_info.CardBlockSize;
-
- return 0;
-}
-
-__API__ int tos_hal_sd_state_get(hal_sd_t *sd, hal_sd_state_t *state)
-{
- int ret = 0;
- SDCardState sd_state;
-
- (void)sd;
-
- if (!sd || !state) {
- return -1;
- }
-
- sd_state = SD_GetState();
- switch (sd_state) {
- case SD_CARD_READY:
- *state = HAL_SD_STAT_READY;
- break;
-
- case SD_CARD_SENDING:
- *state = HAL_SD_STAT_PROGRAMMING;
- break;
-
- case SD_CARD_RECEIVING:
- *state = HAL_SD_STAT_RECEIVING;
- break;
-
- case SD_CARD_TRANSFER:
- *state = HAL_SD_STAT_TRANSFER;
- break;
-
- case SD_CARD_ERROR:
- *state = HAL_SD_STAT_ERROR;
- break;
-
- default:
- ret = -1;
- break;
- }
- return ret;
-}
-
-__API__ int tos_hal_sd_deinit(hal_sd_t *sd)
-{
- (void)sd;
- return 0;
-}
-