From cbc57af0f3192093177d90861df72c4074566cf8 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Fri, 7 Feb 2014 18:18:16 +0100 Subject: Fix for HAVE_MULTIDRIVE on application builds. Change-Id: I089ea4756e0c824993c65062290c40b3e67f9181 --- apps/menus/main_menu.c | 3 ++- firmware/target/hosted/filesystem-unix.c | 3 ++- firmware/target/hosted/samsungypr/dir-target.h | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 8445d67035..6a1295996c 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -162,9 +162,11 @@ static const char* info_getname(int selected_item, void *data, { fat_size(IF_MV(0,) &info->size, &info->free); #ifdef HAVE_MULTIVOLUME +#ifndef APPLICATION if (fat_ismounted(1)) fat_size(1, &info->size2, &info->free2); else +#endif info->size2 = 0; #endif info->new_data = false; @@ -432,4 +434,3 @@ MAKE_MENU(main_menu_, ID2P(LANG_SETTINGS), mainmenu_callback, ); /* MAIN MENU */ /***********************************/ - diff --git a/firmware/target/hosted/filesystem-unix.c b/firmware/target/hosted/filesystem-unix.c index 7f49a5f91a..45b9e0fca1 100644 --- a/firmware/target/hosted/filesystem-unix.c +++ b/firmware/target/hosted/filesystem-unix.c @@ -43,8 +43,9 @@ long filesize(int fd) } /* do we really need this in the app? */ -void fat_size(unsigned long* size, unsigned long* free) +void fat_size(IF_MV(int volume,) unsigned long* size, unsigned long* free) { + IF_MV((void) volume); *size = *free = 0; } diff --git a/firmware/target/hosted/samsungypr/dir-target.h b/firmware/target/hosted/samsungypr/dir-target.h index 7df9554e92..acd11d8041 100644 --- a/firmware/target/hosted/samsungypr/dir-target.h +++ b/firmware/target/hosted/samsungypr/dir-target.h @@ -40,7 +40,6 @@ extern int _mkdir(const char* name); extern int _rmdir(const char* name); extern int _closedir(DIR* dir); extern struct dirent *_readdir(DIR* dir); -extern void fat_size(unsigned long *size, unsigned long *free); #define DIRFUNCTIONS_DEFINED #define DIRENT_DEFINED -- cgit v1.2.3