From febf1613c15417bcbc295ec1d9d9628366820529 Mon Sep 17 00:00:00 2001 From: David Lin Date: Fri, 17 Apr 2020 18:11:29 +0800 Subject: [PATCH 1/2] Update tos_ffconf.h --- components/fs/fatfs/wrapper/include/tos_ffconf.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/components/fs/fatfs/wrapper/include/tos_ffconf.h b/components/fs/fatfs/wrapper/include/tos_ffconf.h index 2906aeac..8138a989 100644 --- a/components/fs/fatfs/wrapper/include/tos_ffconf.h +++ b/components/fs/fatfs/wrapper/include/tos_ffconf.h @@ -1,7 +1,13 @@ /*---------------------------------------------------------------------------/ / FatFs Functional Configurations /---------------------------------------------------------------------------*/ +#ifndef _FFCONF_DEFINED +#define _FFCONF_DEFINED +#ifdef __cplusplus +extern "C" { +#endif + #define FFCONF_DEF 86604 /* Revision ID */ /*---------------------------------------------------------------------------/ @@ -284,5 +290,9 @@ / included somewhere in the scope of ff.h. */ +#ifdef __cplusplus +} +#endif +#endif/* _FFCONF_DEFINED */ /*--- End of configuration options ---*/ From e807d7bd119941ba5e171414940cf22d5d775017 Mon Sep 17 00:00:00 2001 From: David Lin Date: Fri, 17 Apr 2020 18:20:35 +0800 Subject: [PATCH 2/2] Update fatfs_drv.h _TOS_FATFS_DRV_H_ -> _FATFS_DRV_H_ --- components/fs/fatfs/3rdparty/fatfs_drv.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/components/fs/fatfs/3rdparty/fatfs_drv.h b/components/fs/fatfs/3rdparty/fatfs_drv.h index b158872e..bb1f4360 100644 --- a/components/fs/fatfs/3rdparty/fatfs_drv.h +++ b/components/fs/fatfs/3rdparty/fatfs_drv.h @@ -1,5 +1,5 @@ -#ifndef _TOS_FATFS_DRV_H_ -#define _TOS_FATFS_DRV_H_ +#ifndef _FATFS_DRV_H_ +#define _FATFS_DRV_H_ #include "tos_hal.h" @@ -13,5 +13,4 @@ int MMC_disk_status(hal_sd_state_t *sd_state); int MMC_disk_ioctl(BYTE cmd, void *buff); -#endif - +#endif /*_FATFS_DRV_H_*/