From decba4c862fc7431891cc5c835402916b25f388b Mon Sep 17 00:00:00 2001
From: wangchen <253227059@qq.com>
Date: Thu, 17 Mar 2022 11:30:08 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=9A=E8=BF=87menuconfig=E5=85=B3?=
 =?UTF-8?q?=E9=97=ADVFS=E9=80=89=E9=A1=B9=E5=90=8E=EF=BC=8C=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=BC=96=E8=AF=91=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【背景】关闭VFS时，编译无法通过

【修改方案】
1，添加对fs依赖的模块中对fs开启情况的判断

【影响】
对现有的产品编译不会有影响。

re #I4X5DX
Signed-off-by: wangchen <wangchen64@huawei.com>
---
 arm_mps2_an386/liteos_m/board/fs/ff_gen_drv.c | 4 +++-
 arm_mps2_an386/liteos_m/board/fs/ff_gen_drv.h | 4 ++++
 arm_mps3_an547/liteos_m/board/fs/ff_gen_drv.c | 4 +++-
 arm_mps3_an547/liteos_m/board/fs/ff_gen_drv.h | 4 ++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/arm_mps2_an386/liteos_m/board/fs/ff_gen_drv.c b/arm_mps2_an386/liteos_m/board/fs/ff_gen_drv.c
index 17dfb55..1baabd9 100644
--- a/arm_mps2_an386/liteos_m/board/fs/ff_gen_drv.c
+++ b/arm_mps2_an386/liteos_m/board/fs/ff_gen_drv.c
@@ -30,7 +30,9 @@
  */
 
 #include "fs_config.h"
-#include "fatfs.h"
 #include "ff_gen_drv.h"
 
+#ifdef LOSCFG_SUPPORT_FATFS
+#include "fatfs.h"
 DiskDrvTypeDef g_diskDrv = { { 0 }, { 0 }, { 0 }, { 0 } };
+#endif
\ No newline at end of file
diff --git a/arm_mps2_an386/liteos_m/board/fs/ff_gen_drv.h b/arm_mps2_an386/liteos_m/board/fs/ff_gen_drv.h
index 4b54588..fdc3a5c 100644
--- a/arm_mps2_an386/liteos_m/board/fs/ff_gen_drv.h
+++ b/arm_mps2_an386/liteos_m/board/fs/ff_gen_drv.h
@@ -33,7 +33,9 @@
 #define FF_GEN_DRV_H
 
 #include "stdint.h"
+#ifdef LOSCFG_SUPPORT_FATFS
 #include "diskio.h"
+#endif
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -41,6 +43,7 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
+#ifdef LOSCFG_SUPPORT_FATFS
 typedef struct {
     DSTATUS (*disk_initialize)(BYTE);
     DSTATUS (*disk_status)(BYTE);
@@ -57,6 +60,7 @@ typedef struct {
 } DiskDrvTypeDef;
 
 extern DiskDrvTypeDef g_diskDrv;
+#endif
 #ifdef __cplusplus
 #if __cplusplus
 }
diff --git a/arm_mps3_an547/liteos_m/board/fs/ff_gen_drv.c b/arm_mps3_an547/liteos_m/board/fs/ff_gen_drv.c
index 226a0f4..ea6f15c 100644
--- a/arm_mps3_an547/liteos_m/board/fs/ff_gen_drv.c
+++ b/arm_mps3_an547/liteos_m/board/fs/ff_gen_drv.c
@@ -29,7 +29,9 @@
  */
 
 #include "fs_config.h"
-#include "fatfs.h"
 #include "ff_gen_drv.h"
 
+#ifdef LOSCFG_SUPPORT_FATFS
+#include "fatfs.h"
 DiskDrvTypeDef g_diskDrv = { { 0 }, { 0 }, { 0 }, { 0 } };
+#endif
\ No newline at end of file
diff --git a/arm_mps3_an547/liteos_m/board/fs/ff_gen_drv.h b/arm_mps3_an547/liteos_m/board/fs/ff_gen_drv.h
index 892128b..dcda955 100644
--- a/arm_mps3_an547/liteos_m/board/fs/ff_gen_drv.h
+++ b/arm_mps3_an547/liteos_m/board/fs/ff_gen_drv.h
@@ -32,7 +32,9 @@
 #define FF_GEN_DRV_H
 
 #include "stdint.h"
+#ifdef LOSCFG_SUPPORT_FATFS
 #include "diskio.h"
+#endif
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -40,6 +42,7 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
+#ifdef LOSCFG_SUPPORT_FATFS
 typedef struct {
     DSTATUS (*disk_initialize)(BYTE);
     DSTATUS (*disk_status)(BYTE);
@@ -56,6 +59,7 @@ typedef struct {
 } DiskDrvTypeDef;
 
 extern DiskDrvTypeDef g_diskDrv;
+#endif
 #ifdef __cplusplus
 #if __cplusplus
 }
-- 
Gitee