devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

behave for multi-volume

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5520 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jörg Hohensohn 2004-12-29 22:37:31 +00:00
parent 7ee03d0493
commit 575c9049f6
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/debug_menu.c
View file

@ -1455,7 +1455,7 @@ static bool dbg_disk_info(void)
case 3: { case 3: {
unsigned int free; unsigned int free;
fat_size( NULL, &free ); fat_size( IF_MV2(0,) NULL, &free );
snprintf(buf, sizeof buf, "%d MB", free / 1024 ); snprintf(buf, sizeof buf, "%d MB", free / 1024 );
lcd_puts(0, y++, "Free"); lcd_puts(0, y++, "Free");
lcd_puts(0, y++, buf); lcd_puts(0, y++, buf);
@ -1530,7 +1530,7 @@ static bool dbg_disk_info(void)
case 11: case 11:
lcd_puts(0, y++, "Cluster size"); 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); lcd_puts(0, y++, buf);
break; break;
} }
@ -1560,7 +1560,7 @@ static bool dbg_disk_info(void)
lcd_puts(0,0,"Scanning"); lcd_puts(0,0,"Scanning");
lcd_puts(0,1,"disk..."); lcd_puts(0,1,"disk...");
lcd_update(); lcd_update();
fat_recalc_free(); fat_recalc_free(IF_MV(0));
} }
break; break;
} }

10
firmware/drivers/ata.c
View file

@ -310,7 +310,7 @@ static void copy_read_sectors(unsigned char* buf, int wordcount)
#endif #endif
} }
int ata_read_sectors(IF_MV((int drive,)) int ata_read_sectors(IF_MV2(int drive,)
unsigned long start, unsigned long start,
int incount, int incount,
void* inbuf) void* inbuf)
@ -321,6 +321,9 @@ int ata_read_sectors(IF_MV((int drive,))
void* buf; void* buf;
int spinup_start; int spinup_start;
#ifdef HAVE_MULTIVOLUME
(void)drive; /* unused for now */
#endif
mutex_lock(&ata_mtx); mutex_lock(&ata_mtx);
last_disk_activity = current_tick; last_disk_activity = current_tick;
@ -577,7 +580,7 @@ static void copy_write_sectors(const unsigned char* buf, int wordcount)
#endif #endif
} }
int ata_write_sectors(IF_MV((int drive,)) int ata_write_sectors(IF_MV2(int drive,)
unsigned long start, unsigned long start,
int count, int count,
const void* buf) const void* buf)
@ -586,6 +589,9 @@ int ata_write_sectors(IF_MV((int drive,))
int ret = 0; int ret = 0;
int spinup_start; int spinup_start;
#ifdef HAVE_MULTIVOLUME
(void)drive; /* unused for now */
#endif
if (start == 0) if (start == 0)
panicf("Writing on sector 0\n"); panicf("Writing on sector 0\n");