diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2019-07-28 09:24:40 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2019-07-28 15:27:04 +0200 |
commit | 51fe1b670551e866e5c78083a32b3187d7876bb5 (patch) | |
tree | b5d45cf6999693670c4543c15d6ed37434363231 | |
parent | 45bd14b392622cb58e967a24e4652c510b3d43e4 (diff) | |
download | rockbox-51fe1b670551e866e5c78083a32b3187d7876bb5.tar.gz rockbox-51fe1b670551e866e5c78083a32b3187d7876bb5.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.c | 2 | ||||
-rw-r--r-- | firmware/export/mv.h | 2 |
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) | |||
310 | if (info->new_data) | 310 | if (info->new_data) |
311 | { | 311 | { |
312 | volume_size(IF_MV(0,) &info->size, &info->free); | 312 | volume_size(IF_MV(0,) &info->size, &info->free); |
313 | #ifdef HAVE_MULTIVOLUME | 313 | #ifdef HAVE_DIRCACHE |
314 | if (volume_ismounted(1)) | 314 | if (volume_ismounted(1)) |
315 | volume_size(1, &info->size2, &info->free2); | 315 | volume_size(1, &info->size2, &info->free2); |
316 | else | 316 | 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 @@ | |||
100 | void volume_recalc_free(IF_MV_NONVOID(int volume)); | 100 | void volume_recalc_free(IF_MV_NONVOID(int volume)); |
101 | unsigned int volume_get_cluster_size(IF_MV_NONVOID(int volume)); | 101 | unsigned int volume_get_cluster_size(IF_MV_NONVOID(int volume)); |
102 | void volume_size(IF_MV(int volume,) unsigned long *size, unsigned long *free); | 102 | void volume_size(IF_MV(int volume,) unsigned long *size, unsigned long *free); |
103 | #ifdef HAVE_DIRCACHE | ||
103 | bool volume_ismounted(IF_MV_NONVOID(int volume)); | 104 | bool volume_ismounted(IF_MV_NONVOID(int volume)); |
105 | #endif | ||
104 | #ifdef HAVE_HOTSWAP | 106 | #ifdef HAVE_HOTSWAP |
105 | bool volume_removable(int volume); | 107 | bool volume_removable(int volume); |
106 | bool volume_present(int volume); | 108 | bool volume_present(int volume); |