From 9f372f1f59524e7228aaddfb685f1eb4a70e35bf Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Wed, 9 Jul 2003 22:04:31 +0000 Subject: Cold start fixes: master_slave_select() now checks for BSY as well as RDY (since disks are BSY during powerup). Also, wait_for_bsy() looks at ATA_STATUS instead of ATA_ALT_STATUS, since the address of ATA_ALT_STATUS is not determined until later. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3822 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/ata.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'firmware') diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c index 9331cd60d9..d3ccf0e662 100644 --- a/firmware/drivers/ata.c +++ b/firmware/drivers/ata.c @@ -111,7 +111,7 @@ static int wait_for_bsy(void) { 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_STATUS & STATUS_BSY)) yield(); if (TIME_BEFORE(current_tick, timeout)) @@ -676,14 +676,14 @@ static int master_slave_detect(void) { /* master? */ ATA_SELECT = 0; - if ( ATA_STATUS & STATUS_RDY ) { + if ( ATA_STATUS & (STATUS_RDY|STATUS_BSY) ) { ata_device = 0; DEBUGF("Found master harddisk\n"); } else { /* slave? */ ATA_SELECT = SELECT_DEVICE1; - if ( ATA_STATUS & STATUS_RDY ) { + if ( ATA_STATUS & (STATUS_RDY|STATUS_BSY) ) { ata_device = SELECT_DEVICE1; DEBUGF("Found slave harddisk\n"); } @@ -697,7 +697,7 @@ static int io_address_detect(void) { unsigned char tmp = ATA_STATUS & 0xf9; /* Mask the IDX and CORR bits */ unsigned char dummy; - + /* We compare the STATUS register with the ALT_STATUS register, which is located at the same address as CONTROL. If they are the same, we assume that we have the correct address. @@ -725,7 +725,7 @@ static int io_address_detect(void) } /* Let's check again, to be sure */ - if(tmp != ATA_CONTROL) + if(tmp != (ATA_ALT_STATUS & 0xf9)) { DEBUGF("ATA I/O address detection failed\n"); return -1; @@ -797,10 +797,10 @@ unsigned short* ata_get_identify(void) int ata_init(void) { - int rc; - bool coldstart = (PACR2 & 0x4000) != 0; + int rc; + bool coldstart = (PACR2 & 0x4000) != 0; - mutex_init(&ata_mtx); + mutex_init(&ata_mtx); led(false); -- cgit v1.2.3