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

A better workaround due to ATA sleep bugs in the Ipod Nano. battery_bench and plugins like it should now work also on Nano.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11344 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thom Johansen 2006-10-25 17:31:29 +00:00
parent 58ebf47a2b
commit 017b0d7b71
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
firmware/drivers/ata.c
View file

@ -1412,20 +1412,13 @@ void ata_poweroff(bool enable)
bool ata_disk_is_active(void) bool ata_disk_is_active(void)
{ {
#ifdef IPOD_NANO
return false;
#else
return !sleeping; return !sleeping;
#endif
} }
static int ata_perform_sleep(void) static int ata_perform_sleep(void)
{ {
int ret = 0; int ret = 0;
/* ATA sleep is currently broken on Nano, and will hang all subsequent
accesses, so disable until we find a cure. */
#ifndef IPOD_NANO
mutex_lock(&ata_mtx); mutex_lock(&ata_mtx);
SET_REG(ATA_SELECT, ata_device); SET_REG(ATA_SELECT, ata_device);
@ -1446,7 +1439,6 @@ static int ata_perform_sleep(void)
sleeping = true; sleeping = true;
mutex_unlock(&ata_mtx); mutex_unlock(&ata_mtx);
#endif
return ret; return ret;
} }
@ -1569,6 +1561,12 @@ int ata_hard_reset(void)
static int perform_soft_reset(void) static int perform_soft_reset(void)
{ {
/* If this code is allowed to run on a Nano, the next reads from the flash will
* time out, so we disable it. It shouldn't be necessary anyway, since the
* ATA -> Flash interface automatically sleeps almost immediately after the
* last command.
*/
#ifndef IPOD_NANO
int ret; int ret;
int retry_count; int retry_count;
@ -1590,6 +1588,9 @@ static int perform_soft_reset(void)
ret = ret?0:-1; ret = ret?0:-1;
return ret; return ret;
#else
return 0; /* Always report success */
#endif
} }
int ata_soft_reset(void) int ata_soft_reset(void)