diff options
| author | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-12-29 22:37:31 +0000 |
|---|---|---|
| committer | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-12-29 22:37:31 +0000 |
| commit | 575c9049f6bbcb3b5c8d4b51aeec9cc95d9fdf13 (patch) | |
| tree | 768b87ced00944e35ccac3b706493b3bcc9d641d | |
| parent | 7ee03d04936fb161903b2c15d598d7a1588968a3 (diff) | |
| download | rockbox-575c9049f6bbcb3b5c8d4b51aeec9cc95d9fdf13.zip rockbox-575c9049f6bbcb3b5c8d4b51aeec9cc95d9fdf13.tar.gz rockbox-575c9049f6bbcb3b5c8d4b51aeec9cc95d9fdf13.tar.bz2 rockbox-575c9049f6bbcb3b5c8d4b51aeec9cc95d9fdf13.tar.xz | |
behave for multi-volume
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5520 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/debug_menu.c | 6 | ||||
| -rw-r--r-- | firmware/drivers/ata.c | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 880f545..67eb287 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -1455,7 +1455,7 @@ static bool dbg_disk_info(void) case 3: { unsigned int free; - fat_size( NULL, &free ); + fat_size( IF_MV2(0,) NULL, &free ); snprintf(buf, sizeof buf, "%d MB", free / 1024 ); lcd_puts(0, y++, "Free"); lcd_puts(0, y++, buf); @@ -1530,7 +1530,7 @@ static bool dbg_disk_info(void) case 11: lcd_puts(0, y++, "Cluster size"); - snprintf(buf, 128, "%d bytes", fat_get_cluster_size()); + snprintf(buf, 128, "%d bytes", fat_get_cluster_size(IF_MV(0))); lcd_puts(0, y++, buf); break; } @@ -1560,7 +1560,7 @@ static bool dbg_disk_info(void) lcd_puts(0,0,"Scanning"); lcd_puts(0,1,"disk..."); lcd_update(); - fat_recalc_free(); + fat_recalc_free(IF_MV(0)); } break; } diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c index 349ba07..bd1afec 100644 --- a/firmware/drivers/ata.c +++ b/firmware/drivers/ata.c @@ -310,7 +310,7 @@ static void copy_read_sectors(unsigned char* buf, int wordcount) #endif } -int ata_read_sectors(IF_MV((int drive,)) +int ata_read_sectors(IF_MV2(int drive,) unsigned long start, int incount, void* inbuf) @@ -321,6 +321,9 @@ int ata_read_sectors(IF_MV((int drive,)) void* buf; int spinup_start; +#ifdef HAVE_MULTIVOLUME + (void)drive; /* unused for now */ +#endif mutex_lock(&ata_mtx); last_disk_activity = current_tick; @@ -577,7 +580,7 @@ static void copy_write_sectors(const unsigned char* buf, int wordcount) #endif } -int ata_write_sectors(IF_MV((int drive,)) +int ata_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const void* buf) @@ -586,6 +589,9 @@ int ata_write_sectors(IF_MV((int drive,)) int ret = 0; int spinup_start; +#ifdef HAVE_MULTIVOLUME + (void)drive; /* unused for now */ +#endif if (start == 0) panicf("Writing on sector 0\n"); |