From 5d1a91fd8e36ac1de2d0a7cb37fde5ad3160e2d4 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 4 Jan 2018 16:40:31 -0600 Subject: [PATCH] configs/lpcxpresso-lpc5428/fb: Should disable pixel depths that are not being used. --- configs/lpcxpresso-lpc54628/fb/defconfig | 6 ++++++ fs/fat/fs_fat32.h | 4 ++-- fs/fat/fs_fat32util.c | 5 +++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/configs/lpcxpresso-lpc54628/fb/defconfig b/configs/lpcxpresso-lpc54628/fb/defconfig index 26e67ef5f9..2234418cfc 100644 --- a/configs/lpcxpresso-lpc54628/fb/defconfig +++ b/configs/lpcxpresso-lpc54628/fb/defconfig @@ -53,6 +53,12 @@ CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y +CONFIG_NXFONTS_DISABLE_1BPP=y +CONFIG_NXFONTS_DISABLE_24BPP=y +CONFIG_NXFONTS_DISABLE_2BPP=y +CONFIG_NXFONTS_DISABLE_32BPP=y +CONFIG_NXFONTS_DISABLE_4BPP=y +CONFIG_NXFONTS_DISABLE_8BPP=y CONFIG_PDCURSES_FONT_6X9=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 diff --git a/fs/fat/fs_fat32.h b/fs/fat/fs_fat32.h index 969f301755..5c4034e762 100644 --- a/fs/fat/fs_fat32.h +++ b/fs/fat/fs_fat32.h @@ -58,8 +58,8 @@ /**************************************************************************** * These offsets describes the master boot record. * - * The folowing fields are common to FAT12/16/32 (but all value descriptions - * refer to the interpretation under FAT32. + * The following fields are common to FAT12/16/32 (but all value descriptions + * refer to the interpretation under FAT32). */ #define BS_JUMP 0 /* 3@0: Jump instruction to boot code (ignored) */ diff --git a/fs/fat/fs_fat32util.c b/fs/fat/fs_fat32util.c index ad4701c958..b57a499377 100644 --- a/fs/fat/fs_fat32util.c +++ b/fs/fat/fs_fat32util.c @@ -1126,6 +1126,7 @@ int fat_removechain(struct fat_mountpt_s *fs, uint32_t cluster) if (nextcluster < 0) { /* Error! */ + return nextcluster; } @@ -1148,7 +1149,7 @@ int fat_removechain(struct fat_mountpt_s *fs, uint32_t cluster) /* Then set up to remove the next cluster */ cluster = nextcluster; - } + } return OK; } @@ -1424,7 +1425,7 @@ int fat_nextdirentry(struct fat_mountpt_s *fs, struct fs_fatdir_s *dir) * ****************************************************************************/ -int fat_dirtruncate(struct fat_mountpt_s *fs, struct fat_dirinfo_s *dirinfo) +int fat_dirtruncate(struct fat_mountpt_s *fs, struct fat_dirinfo_s *dirinfo) { unsigned int startcluster; uint32_t writetime;