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

Bug fix: Don't cut the power during spinup...

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2959 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2002-12-06 15:17:30 +00:00
parent bd0da0e822
commit efd90770a0
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
firmware/drivers/ata.c
View file

@ -81,6 +81,7 @@ static volatile unsigned char* ata_control;
bool old_recorder = false; bool old_recorder = false;
int ata_spinup_time = 0; int ata_spinup_time = 0;
static bool spinup = false;
static bool sleeping = false; static bool sleeping = false;
static int sleep_timeout = 5*HZ; static int sleep_timeout = 5*HZ;
static bool poweroff = false; static bool poweroff = false;
@ -165,7 +166,6 @@ int ata_read_sectors(unsigned long start,
int timeout; int timeout;
int count; int count;
void* buf; void* buf;
bool spinup = false;
mutex_lock(&ata_mtx); mutex_lock(&ata_mtx);
@ -174,6 +174,7 @@ int ata_read_sectors(unsigned long start,
led(true); led(true);
if ( sleeping ) { if ( sleeping ) {
spinup = true;
if (poweroff) { if (poweroff) {
if (ata_power_on()) { if (ata_power_on()) {
mutex_unlock(&ata_mtx); mutex_unlock(&ata_mtx);
@ -186,7 +187,6 @@ int ata_read_sectors(unsigned long start,
return -1; return -1;
} }
} }
spinup = true;
} }
ATA_SELECT = ata_device; ATA_SELECT = ata_device;
@ -292,7 +292,6 @@ int ata_write_sectors(unsigned long start,
{ {
int i; int i;
int ret = 0; int ret = 0;
bool spinup = false;
if (start == 0) if (start == 0)
panicf("Writing on sector 0\n"); panicf("Writing on sector 0\n");
@ -302,6 +301,7 @@ int ata_write_sectors(unsigned long start,
last_disk_activity = current_tick; last_disk_activity = current_tick;
if ( sleeping ) { if ( sleeping ) {
spinup = true;
if (poweroff) { if (poweroff) {
if (ata_power_on()) { if (ata_power_on()) {
mutex_unlock(&ata_mtx); mutex_unlock(&ata_mtx);
@ -314,7 +314,6 @@ int ata_write_sectors(unsigned long start,
return -1; return -1;
} }
} }
spinup = true;
} }
ATA_SELECT = ata_device; ATA_SELECT = ata_device;
@ -493,8 +492,7 @@ static void ata_thread(void)
while (1) { while (1) {
while ( queue_empty( &ata_queue ) ) { while ( queue_empty( &ata_queue ) ) {
if ( sleep_timeout && if ( !spinup && sleep_timeout && !sleeping &&
!sleeping &&
TIME_AFTER( current_tick, TIME_AFTER( current_tick,
last_user_activity + sleep_timeout ) && last_user_activity + sleep_timeout ) &&
TIME_AFTER( current_tick, TIME_AFTER( current_tick,
@ -505,7 +503,7 @@ static void ata_thread(void)
} }
#ifdef HAVE_ATA_POWER_OFF #ifdef HAVE_ATA_POWER_OFF
if ( sleeping && poweroff_timeout && !poweroff && if ( !spinup && sleeping && poweroff_timeout && !poweroff &&
TIME_AFTER( current_tick, last_sleep + poweroff_timeout )) TIME_AFTER( current_tick, last_sleep + poweroff_timeout ))
{ {
mutex_lock(&ata_mtx); mutex_lock(&ata_mtx);