summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2019-07-28 09:24:40 -0400
committerSolomon Peachy <pizza@shaftnet.org>2019-07-28 15:27:04 +0200
commit51fe1b670551e866e5c78083a32b3187d7876bb5 (patch)
treeb5d45cf6999693670c4543c15d6ed37434363231
parent45bd14b392622cb58e967a24e4652c510b3d43e4 (diff)
downloadrockbox-51fe1b6.tar.gz
rockbox-51fe1b6.tar.bz2
rockbox-51fe1b6.zip
volume_ismounted is gated by HAVE_DIRCACHE rather than HAVE_MULTIVOLUME
Should fix the various sim builds. Change-Id: I1dc5e8228698afb32c84ada2aa916e52e19f49d7
-rw-r--r--apps/menus/main_menu.c2
-rw-r--r--firmware/export/mv.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index 00959d074d..f71632099d 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -310,7 +310,7 @@ static int info_speak_item(int selected_item, void * data)
if (info->new_data)
{
volume_size(IF_MV(0,) &info->size, &info->free);
-#ifdef HAVE_MULTIVOLUME
+#ifdef HAVE_DIRCACHE
if (volume_ismounted(1))
volume_size(1, &info->size2, &info->free2);
else
diff --git a/firmware/export/mv.h b/firmware/export/mv.h
index 620d77d30d..ec7b2efdbd 100644
--- a/firmware/export/mv.h
+++ b/firmware/export/mv.h
@@ -100,7 +100,9 @@
void volume_recalc_free(IF_MV_NONVOID(int volume));
unsigned int volume_get_cluster_size(IF_MV_NONVOID(int volume));
void volume_size(IF_MV(int volume,) unsigned long *size, unsigned long *free);
+#ifdef HAVE_DIRCACHE
bool volume_ismounted(IF_MV_NONVOID(int volume));
+#endif
#ifdef HAVE_HOTSWAP
bool volume_removable(int volume);
bool volume_present(int volume);