From 7a9e9d3833da9eaa5a10b2f6b29e762eff05c89c Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 6 Sep 2012 14:46:08 +0000 Subject: [PATCH] Important FAT fix. Bad test would cause many un-necessary writes to FLASH. git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5102 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/ChangeLog | 4 ++++ nuttx/fs/fat/fs_fat32util.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 66f56401da..3608c33c1d 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3267,4 +3267,8 @@ * Kconfig: Verify configuration settings for the STM32. This include changes in the way that the external SRAM is configured: Define CONFIG_HEAP2_SIZE (decimal) instead of CONFIG_HEAP2_END (hex). + * tools/configure.sh: Don't append the apps directory path setting + if the correct setting is already in defined in the defconfig file. + * fs/fat/fs_utils.c: Improper constructed bool expression. This + would cause many unnecessary writes to FLASH (Thanks Ronen Vainish). diff --git a/nuttx/fs/fat/fs_fat32util.c b/nuttx/fs/fat/fs_fat32util.c index 397467c417..b88046d796 100644 --- a/nuttx/fs/fat/fs_fat32util.c +++ b/nuttx/fs/fat/fs_fat32util.c @@ -1563,7 +1563,7 @@ int fat_ffcacheflush(struct fat_mountpt_s *fs, struct fat_file_s *ff) */ if (ff->ff_cachesector && - ff->ff_bflags && (FFBUFF_DIRTY|FFBUFF_VALID) == (FFBUFF_DIRTY|FFBUFF_VALID)) + (ff->ff_bflags & (FFBUFF_DIRTY|FFBUFF_VALID)) == (FFBUFF_DIRTY|FFBUFF_VALID)) { /* Write the dirty sector */