summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2014-02-07 18:18:16 +0100
committerThomas Martitz <kugel@rockbox.org>2014-02-23 20:23:52 +0100
commitcbc57af0f3192093177d90861df72c4074566cf8 (patch)
tree488601bd953a51bd31ccc230c6cb80cd1fcbe02b
parent5802141beccf90f06904178a5c51b281d23eba13 (diff)
downloadrockbox-cbc57af0f3192093177d90861df72c4074566cf8.tar.gz
rockbox-cbc57af0f3192093177d90861df72c4074566cf8.zip
Fix for HAVE_MULTIDRIVE on application builds.
Change-Id: I089ea4756e0c824993c65062290c40b3e67f9181
-rw-r--r--apps/menus/main_menu.c3
-rw-r--r--firmware/target/hosted/filesystem-unix.c3
-rw-r--r--firmware/target/hosted/samsungypr/dir-target.h1
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,
162 { 162 {
163 fat_size(IF_MV(0,) &info->size, &info->free); 163 fat_size(IF_MV(0,) &info->size, &info->free);
164#ifdef HAVE_MULTIVOLUME 164#ifdef HAVE_MULTIVOLUME
165#ifndef APPLICATION
165 if (fat_ismounted(1)) 166 if (fat_ismounted(1))
166 fat_size(1, &info->size2, &info->free2); 167 fat_size(1, &info->size2, &info->free2);
167 else 168 else
169#endif
168 info->size2 = 0; 170 info->size2 = 0;
169#endif 171#endif
170 info->new_data = false; 172 info->new_data = false;
@@ -432,4 +434,3 @@ MAKE_MENU(main_menu_, ID2P(LANG_SETTINGS), mainmenu_callback,
432 ); 434 );
433/* MAIN MENU */ 435/* MAIN MENU */
434/***********************************/ 436/***********************************/
435
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)
43} 43}
44 44
45/* do we really need this in the app? */ 45/* do we really need this in the app? */
46void fat_size(unsigned long* size, unsigned long* free) 46void fat_size(IF_MV(int volume,) unsigned long* size, unsigned long* free)
47{ 47{
48 IF_MV((void) volume);
48 *size = *free = 0; 49 *size = *free = 0;
49} 50}
50 51
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);
40extern int _rmdir(const char* name); 40extern int _rmdir(const char* name);
41extern int _closedir(DIR* dir); 41extern int _closedir(DIR* dir);
42extern struct dirent *_readdir(DIR* dir); 42extern struct dirent *_readdir(DIR* dir);
43extern void fat_size(unsigned long *size, unsigned long *free);
44 43
45#define DIRFUNCTIONS_DEFINED 44#define DIRFUNCTIONS_DEFINED
46#define DIRENT_DEFINED 45#define DIRENT_DEFINED