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

Fixed some nasty mutex glitches

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2012 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2002-08-27 21:06:48 +00:00
parent d4d71d1698
commit 22e09a3fb8
1 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

38
firmware/drivers/ata.c
View file

@ -100,6 +100,8 @@ static long last_disk_activity = -1;
static int ata_power_on(void); static int ata_power_on(void);
#endif #endif
static int perform_soft_reset(void);
static int wait_for_bsy(void) __attribute__ ((section (".icode"))); static int wait_for_bsy(void) __attribute__ ((section (".icode")));
static int wait_for_bsy(void) static int wait_for_bsy(void)
{ {
@ -152,21 +154,25 @@ int ata_read_sectors(unsigned long start,
int ret = 0; int ret = 0;
last_disk_activity = current_tick; last_disk_activity = current_tick;
mutex_lock(&ata_mtx);
#ifndef USE_STANDBY #ifndef USE_STANDBY
if ( sleeping ) { if ( sleeping ) {
#ifdef USE_POWEROFF #ifdef USE_POWEROFF
if (ata_power_on()) { if (ata_power_on()) {
mutex_unlock(&ata_mtx);
return -1; return -1;
} }
#else #else
if (ata_soft_reset()) { if (perform_soft_reset()) {
mutex_unlock(&ata_mtx);
return -1; return -1;
} }
#endif #endif
sleeping = false; sleeping = false;
} }
#endif #endif
mutex_lock(&ata_mtx);
if (!wait_for_rdy()) if (!wait_for_rdy())
{ {
@ -239,21 +245,24 @@ int ata_write_sectors(unsigned long start,
last_disk_activity = current_tick; last_disk_activity = current_tick;
mutex_lock(&ata_mtx);
#ifndef USE_STANDBY #ifndef USE_STANDBY
if ( sleeping ) { if ( sleeping ) {
#ifdef USE_POWEROFF #ifdef USE_POWEROFF
if (ata_power_on()) { if (ata_power_on()) {
mutex_unlock(&ata_mtx);
return -1; return -1;
} }
#else #else
if (ata_soft_reset()) { if (perform_soft_reset()) {
mutex_unlock(&ata_mtx);
return -1; return -1;
} }
#endif #endif
sleeping = false; sleeping = false;
} }
#endif #endif
mutex_lock(&ata_mtx);
if (!wait_for_rdy()) if (!wait_for_rdy())
{ {
@ -370,7 +379,7 @@ static int ata_perform_sleep(void)
int ret = 0; int ret = 0;
mutex_lock(&ata_mtx); mutex_lock(&ata_mtx);
if(!wait_for_rdy()) { if(!wait_for_rdy()) {
mutex_unlock(&ata_mtx); mutex_unlock(&ata_mtx);
return -1; return -1;
@ -460,13 +469,11 @@ int ata_hard_reset(void)
return ret; return ret;
} }
int ata_soft_reset(void) static int perform_soft_reset(void)
{ {
int ret; int ret;
int retry_count; int retry_count;
mutex_lock(&ata_mtx);
ATA_SELECT = SELECT_LBA | ata_device; ATA_SELECT = SELECT_LBA | ata_device;
ATA_CONTROL = CONTROL_nIEN|CONTROL_SRST; ATA_CONTROL = CONTROL_nIEN|CONTROL_SRST;
sleep(HZ/20000); /* >= 5us */ sleep(HZ/20000); /* >= 5us */
@ -489,14 +496,24 @@ int ata_soft_reset(void)
return ret; return ret;
} }
int ata_soft_reset(void)
{
int ret;
mutex_lock(&ata_mtx);
ret = perform_soft_reset();
mutex_unlock(&ata_mtx);
return ret;
}
#ifdef USE_POWEROFF #ifdef USE_POWEROFF
static int ata_power_on(void) static int ata_power_on(void)
{ {
int ret; int ret;
int retry_count; int retry_count;
mutex_lock(&ata_mtx);
ide_power_enable(true); ide_power_enable(true);
sleep(HZ/2); sleep(HZ/2);
@ -513,7 +530,6 @@ static int ata_power_on(void)
ret = ret?0:-1; ret = ret?0:-1;
sleeping = false; sleeping = false;
mutex_unlock(&ata_mtx);
return ret; return ret;
} }
#endif #endif