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

Better led control. Added status read delay. Fixed potential last_disk_activity race.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3501 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2003-03-31 14:14:07 +00:00
parent 0552efc981
commit fd9ce90a4c
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
firmware/drivers/ata.c
View file

@ -110,6 +110,7 @@ static int wait_for_bsy(void) __attribute__ ((section (".icode")));
static int wait_for_bsy(void) static int wait_for_bsy(void)
{ {
int timeout = current_tick + HZ*10; int timeout = current_tick + HZ*10;
last_disk_activity = timeout;
while (TIME_BEFORE(current_tick, timeout) && (ATA_ALT_STATUS & STATUS_BSY)) while (TIME_BEFORE(current_tick, timeout) && (ATA_ALT_STATUS & STATUS_BSY))
sleep_thread(); sleep_thread();
wake_up_thread(); wake_up_thread();
@ -129,7 +130,8 @@ static int wait_for_rdy(void)
return 0; return 0;
timeout = current_tick + HZ*10; timeout = current_tick + HZ*10;
last_disk_activity = timeout;
while (TIME_BEFORE(current_tick, timeout) && while (TIME_BEFORE(current_tick, timeout) &&
!(ATA_ALT_STATUS & STATUS_RDY)) !(ATA_ALT_STATUS & STATUS_RDY))
sleep_thread(); sleep_thread();
@ -180,12 +182,14 @@ int ata_read_sectors(unsigned long start,
if (poweroff) { if (poweroff) {
if (ata_power_on()) { if (ata_power_on()) {
mutex_unlock(&ata_mtx); mutex_unlock(&ata_mtx);
led(false);
return -1; return -1;
} }
} }
else { else {
if (perform_soft_reset()) { if (perform_soft_reset()) {
mutex_unlock(&ata_mtx); mutex_unlock(&ata_mtx);
led(false);
return -1; return -1;
} }
} }
@ -198,6 +202,7 @@ int ata_read_sectors(unsigned long start,
if (!wait_for_rdy()) if (!wait_for_rdy())
{ {
mutex_unlock(&ata_mtx); mutex_unlock(&ata_mtx);
led(false);
return -2; return -2;
} }
@ -218,6 +223,13 @@ int ata_read_sectors(unsigned long start,
ATA_SELECT = ((start >> 24) & 0xf) | SELECT_LBA | ata_device; ATA_SELECT = ((start >> 24) & 0xf) | SELECT_LBA | ata_device;
ATA_COMMAND = CMD_READ_MULTIPLE; ATA_COMMAND = CMD_READ_MULTIPLE;
/* wait at least 400ns between writing command and reading status */
asm volatile ("nop");
asm volatile ("nop");
asm volatile ("nop");
asm volatile ("nop");
asm volatile ("nop");
while (count) { while (count) {
int j; int j;
int sectors; int sectors;
@ -226,8 +238,6 @@ int ata_read_sectors(unsigned long start,
if (!wait_for_start_of_transfer()) { if (!wait_for_start_of_transfer()) {
ret = -4; ret = -4;
if(ata_hard_reset())
break;
goto retry; goto retry;
} }
@ -312,17 +322,21 @@ int ata_write_sectors(unsigned long start,
last_disk_activity = current_tick; last_disk_activity = current_tick;
led(true);
if ( sleeping ) { if ( sleeping ) {
spinup = true; spinup = true;
if (poweroff) { if (poweroff) {
if (ata_power_on()) { if (ata_power_on()) {
mutex_unlock(&ata_mtx); mutex_unlock(&ata_mtx);
led(false);
return -1; return -1;
} }
} }
else { else {
if (perform_soft_reset()) { if (perform_soft_reset()) {
mutex_unlock(&ata_mtx); mutex_unlock(&ata_mtx);
led(false);
return -1; return -1;
} }
} }
@ -332,11 +346,10 @@ int ata_write_sectors(unsigned long start,
if (!wait_for_rdy()) if (!wait_for_rdy())
{ {
mutex_unlock(&ata_mtx); mutex_unlock(&ata_mtx);
led(false);
return -2; return -2;
} }
led(true);
if ( count == 256 ) if ( count == 256 )
ATA_NSECTOR = 0; /* 0 means 256 sectors */ ATA_NSECTOR = 0; /* 0 means 256 sectors */
else else