len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-11 06:05:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

correct HAVE_MULTIVOLUME vs HAVE_HOTSWAP usage

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18924 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Frank Gevaerts 2008-10-29 18:32:24 +00:00
parent 593809c1a9
commit 83589f040a
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
firmware/target/arm/ata-sd-pp.c
View file

@ -127,7 +127,7 @@
#define SD_APP_OP_COND 41 #define SD_APP_OP_COND 41
/** global, exported variables **/ /** global, exported variables **/
#ifdef HAVE_HOTSWAP #ifdef HAVE_MULTIVOLUME
#define NUM_VOLUMES 2 #define NUM_VOLUMES 2
#else #else
#define NUM_VOLUMES 1 #define NUM_VOLUMES 1
@ -156,7 +156,7 @@ struct sd_card_status
static struct sd_card_status sd_status[NUM_VOLUMES] = static struct sd_card_status sd_status[NUM_VOLUMES] =
{ {
{ 0, 1 }, { 0, 1 },
#ifdef HAVE_HOTSWAP #ifdef HAVE_MULTIVOLUME
{ 0, 10 } { 0, 10 }
#endif #endif
}; };
@ -794,7 +794,7 @@ static void ata_led(bool onoff)
int ata_read_sectors(IF_MV2(int drive,) unsigned long start, int incount, int ata_read_sectors(IF_MV2(int drive,) unsigned long start, int incount,
void* inbuf) void* inbuf)
{ {
#ifndef HAVE_HOTSWAP #ifndef HAVE_MULTIVOLUME
const int drive = 0; const int drive = 0;
#endif #endif
int ret; int ret;
@ -911,7 +911,7 @@ int ata_write_sectors(IF_MV2(int drive,) unsigned long start, int count,
/* Write support is not finished yet */ /* Write support is not finished yet */
/* TODO: The standard suggests using ACMD23 prior to writing multiple blocks /* TODO: The standard suggests using ACMD23 prior to writing multiple blocks
to improve performance */ to improve performance */
#ifndef HAVE_HOTSWAP #ifndef HAVE_MULTIVOLUME
const int drive = 0; const int drive = 0;
#endif #endif
int ret; int ret;