diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-11-26 16:57:30 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-11-26 16:57:30 +0000 |
commit | d052ced874172e95fdc1d096205ac4dfe38907f3 (patch) | |
tree | 2f05046952b93c1fa4345421dd28d4795fe8dfb9 /firmware/common | |
parent | b2dc7f004ef2a9fe81d93acc7810ed16bebb42f6 (diff) | |
download | rockbox-d052ced874172e95fdc1d096205ac4dfe38907f3.tar.gz rockbox-d052ced874172e95fdc1d096205ac4dfe38907f3.zip |
Merge branch 'hotswap'
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23759 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/common')
-rw-r--r-- | firmware/common/dir_uncached.c | 4 | ||||
-rw-r--r-- | firmware/common/file.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/firmware/common/dir_uncached.c b/firmware/common/dir_uncached.c index 25677a0903..dd157f0ade 100644 --- a/firmware/common/dir_uncached.c +++ b/firmware/common/dir_uncached.c | |||
@@ -74,7 +74,11 @@ int release_dirs(int volume) | |||
74 | int closed = 0; | 74 | int closed = 0; |
75 | for ( dd=0; dd<MAX_OPEN_DIRS; dd++, pdir++) | 75 | for ( dd=0; dd<MAX_OPEN_DIRS; dd++, pdir++) |
76 | { | 76 | { |
77 | #ifdef HAVE_MULTIVOLUME | ||
77 | if (pdir->fatdir.file.volume == volume) | 78 | if (pdir->fatdir.file.volume == volume) |
79 | #else | ||
80 | (void)volume; | ||
81 | #endif | ||
78 | { | 82 | { |
79 | pdir->busy = false; /* mark as available, no further action */ | 83 | pdir->busy = false; /* mark as available, no further action */ |
80 | closed++; | 84 | closed++; |
diff --git a/firmware/common/file.c b/firmware/common/file.c index 3d7722f687..770930d80a 100644 --- a/firmware/common/file.c +++ b/firmware/common/file.c | |||
@@ -782,7 +782,11 @@ int release_files(int volume) | |||
782 | int closed = 0; | 782 | int closed = 0; |
783 | for ( fd=0; fd<MAX_OPEN_FILES; fd++, pfile++) | 783 | for ( fd=0; fd<MAX_OPEN_FILES; fd++, pfile++) |
784 | { | 784 | { |
785 | #ifdef HAVE_MULTIVOLUME | ||
785 | if (pfile->fatfile.volume == volume) | 786 | if (pfile->fatfile.volume == volume) |
787 | #else | ||
788 | (void)volume; | ||
789 | #endif | ||
786 | { | 790 | { |
787 | pfile->busy = false; /* mark as available, no further action */ | 791 | pfile->busy = false; /* mark as available, no further action */ |
788 | closed++; | 792 | closed++; |