diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2013-11-20 16:39:42 +0000 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2013-11-20 21:34:04 +0100 |
commit | 193753aa1f93ba28995a80048cbc46f1fc5cde05 (patch) | |
tree | b5ff0ab364235dbd49e96ff48ebdedda6701c51d /firmware/common | |
parent | c71e0567d60af8e409ede4034d72e8accf98cb87 (diff) | |
download | rockbox-193753aa1f93ba28995a80048cbc46f1fc5cde05.tar.gz rockbox-193753aa1f93ba28995a80048cbc46f1fc5cde05.zip |
Introduce volume_{present,removable} and fix invalid calls in apps/
The code was trying to probe for volume presence by calling drive layer
with volume index. It is a miracle it get unnoticed so far. Introduce
proper volume probing using the vol->drive map in the disk layer.
Change-Id: I463a5bcc8170f007cad049536094207d2ba3c6fc
Reviewed-on: http://gerrit.rockbox.org/669
Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>
Diffstat (limited to 'firmware/common')
-rw-r--r-- | firmware/common/disk.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/firmware/common/disk.c b/firmware/common/disk.c index fb6daee174..5a55a3b6ac 100644 --- a/firmware/common/disk.c +++ b/firmware/common/disk.c | |||
@@ -292,3 +292,19 @@ int disk_unmount_all(void) | |||
292 | return unmounted; | 292 | return unmounted; |
293 | #endif /* HAVE_MULTIDRIVE */ | 293 | #endif /* HAVE_MULTIDRIVE */ |
294 | } | 294 | } |
295 | |||
296 | #ifdef HAVE_HOTSWAP | ||
297 | bool volume_removable(int volume) | ||
298 | { | ||
299 | if(vol_drive[volume] == -1) | ||
300 | return false; | ||
301 | return storage_removable(vol_drive[volume]); | ||
302 | } | ||
303 | |||
304 | bool volume_present(int volume) | ||
305 | { | ||
306 | if(vol_drive[volume] == -1) | ||
307 | return false; | ||
308 | return storage_present(vol_drive[volume]); | ||
309 | } | ||
310 | #endif | ||