diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2024-11-23 20:58:35 -0500 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2024-11-23 20:59:32 -0500 |
| commit | 57cd8cd712ff08815a40f71fbaed07298106d539 (patch) | |
| tree | 4e9e8f7d46a72c59730b95b4f26eeb2ca9eea0aa | |
| parent | a41a0012582d225f8cb78d01206d4a335bef8332 (diff) | |
| download | rockbox-57cd8cd712.tar.gz rockbox-57cd8cd712.zip | |
fix warnings and errors in a41a001258
* volume_partition() wasn't defined for hosted targets
* wrap the "special" volume stuff in HAVE_MULTIDRIVE
Change-Id: Icbea256ab6438e1f7e45d361ed61724feec7ef0b
| -rw-r--r-- | apps/menus/main_menu.c | 4 | ||||
| -rw-r--r-- | firmware/target/hosted/system-hosted.c | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 386e876cda..15845d1497 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -169,9 +169,9 @@ static int refresh_data(struct info_data *info) #ifdef HAVE_MULTIVOLUME #ifdef HAVE_MULTIDRIVE int max = -1; + int special = 0; #endif int drive = 0; - int special = 0; for (i = 0 ; CHECK_VOL(i) ; i++) { #endif volume_size(IF_MV(i,) &info->size[i], &info->free[i]); @@ -196,9 +196,11 @@ static int refresh_data(struct info_data *info) #endif #if defined(HAVE_MULTIVOLUME) && (defined(HAVE_HOTSWAP) || defined(HAVE_HOTSWAP) || defined(HAVE_DIRCACHE) || defined(HAVE_BOOTDATA)) if (volume_partition(i) == -1) { +#ifdef HAVE_MULTIDRIVE if (special) info->name[i] = LANG_DISK_NAME_MMC; else +#endif info->name[i] = 0; break; /* ie stop when we run out of valid partitions */ } diff --git a/firmware/target/hosted/system-hosted.c b/firmware/target/hosted/system-hosted.c index c4ae5a404f..e8a9671818 100644 --- a/firmware/target/hosted/system-hosted.c +++ b/firmware/target/hosted/system-hosted.c @@ -207,3 +207,10 @@ bool volume_present(int volume) return hostfs_present(volume); } #endif + +int volume_partition(int volume) +{ + (void)volume; + /* Hosted only implement a single parition per "drive" */ + return 0; +} |