summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmaury Pouly <pamaury@rockbox.org>2011-12-19 00:40:11 +0000
committerAmaury Pouly <pamaury@rockbox.org>2011-12-19 00:40:11 +0000
commitba2740a5b8feb5f06ecc5e8aeabef52b1fccffe1 (patch)
tree23574d162198fd010b0d1a99f9c0ed371c134886
parent676708c43f399b0686f4af59046396bcc5a710a0 (diff)
downloadrockbox-ba2740a5b8feb5f06ecc5e8aeabef52b1fccffe1.tar.gz
rockbox-ba2740a5b8feb5f06ecc5e8aeabef52b1fccffe1.zip
disk: fix sector multiplier init, also remove a test which has became obsolete
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31356 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/common/disk.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/firmware/common/disk.c b/firmware/common/disk.c
index 89805729a6..1a7ddd9eb4 100644
--- a/firmware/common/disk.c
+++ b/firmware/common/disk.c
@@ -61,7 +61,7 @@ static int vol_drive[NUM_VOLUMES]; /* mounted to which drive (-1 if none) */
61static struct mutex disk_mutex; 61static struct mutex disk_mutex;
62 62
63#ifdef MAX_LOG_SECTOR_SIZE 63#ifdef MAX_LOG_SECTOR_SIZE
64static int disk_sector_multiplier[NUM_DRIVES] = {1}; 64static int disk_sector_multiplier[NUM_DRIVES] = {[0 ... NUM_DRIVES-1] = 1};
65 65
66int disk_get_sector_multiplier(IF_MD_NONVOID(int drive)) 66int disk_get_sector_multiplier(IF_MD_NONVOID(int drive))
67{ 67{
@@ -217,8 +217,7 @@ int disk_mount(int drive)
217 mounted++; 217 mounted++;
218 vol_drive[volume] = drive; /* remember the drive for this volume */ 218 vol_drive[volume] = drive; /* remember the drive for this volume */
219 volume = get_free_volume(); /* prepare next entry */ 219 volume = get_free_volume(); /* prepare next entry */
220 if (drive == 0) 220 disk_sector_multiplier[drive] = j;
221 disk_sector_multiplier[drive] = j;
222 break; 221 break;
223 } 222 }
224 } 223 }