summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorJörg Hohensohn <hohensoh@rockbox.org>2003-07-09 07:18:47 +0000
committerJörg Hohensohn <hohensoh@rockbox.org>2003-07-09 07:18:47 +0000
commitbbfaf26e11d837b1fc8923281acb40161ca9e074 (patch)
tree1af68439e608e306e0f52462107c5e873066b846 /firmware
parent8ba4044431ba7b9d8014fd5e8b13f287f2a1b4b0 (diff)
downloadrockbox-bbfaf26e11d837b1fc8923281acb40161ca9e074.tar.gz
rockbox-bbfaf26e11d837b1fc8923281acb40161ca9e074.zip
again different coldstart, ata_init() now has non-ambiguous return codes for better diagnostics
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3820 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/drivers/ata.c60
1 files changed, 34 insertions, 26 deletions
diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c
index b665dc09fd..fb60ae3895 100644
--- a/firmware/drivers/ata.c
+++ b/firmware/drivers/ata.c
@@ -797,6 +797,9 @@ unsigned short* ata_get_identify(void)
int ata_init(void)
{
+ int rc;
+ bool coldstart = (PACR2 & 0x4000) != 0;
+
mutex_init(&ata_mtx);
led(false);
@@ -809,33 +812,38 @@ int ata_init(void)
ata_enable(true);
if ( !initialized ) {
- /* When starting from Flash, the disk is not yet ready when we get here. */
- /* Crude first fix is to block and poll here for a while,
- can we do better? */
- int time = 0;
- while ((ATA_STATUS & STATUS_BSY))
+ if (coldstart)
{
- if (time >= HZ*10) /* timeout, disk is not coming up */
- return -6;
+ /* Reset both master and slave, we don't yet know what's in */
+ /* this is safe because non-present devices don't report busy */
+ ata_device = 0;
+ if (ata_hard_reset())
+ return -1;
+ ata_device = SELECT_DEVICE1;
+ if (ata_hard_reset())
+ return -2;
+ }
- sleep(HZ/10);
- time += HZ/10;
- };
-
- if (master_slave_detect())
- return -1;
-
- if (io_address_detect())
- return -2;
-
- if (check_registers())
- return -3;
-
- if (freeze_lock())
- return -4;
+ if (rc = master_slave_detect())
+ return -10 + rc;
+
+ if (rc = io_address_detect())
+ return -20 + rc;
+
+ /* symptom fix: else check_registers() below may fail */
+ if (coldstart && !wait_for_bsy())
+ {
+ return -29;
+ }
- if (identify())
- return -5;
+ if (rc = check_registers())
+ return -30 + rc;
+
+ if (rc = freeze_lock())
+ return -40 + rc;
+
+ if (rc = identify())
+ return -50 + rc;
multisectors = identify_info[47] & 0xff;
DEBUGF("ata: %d sectors per ata request\n",multisectors);
@@ -844,8 +852,8 @@ int ata_init(void)
sizeof(ata_stack), ata_thread_name);
initialized = true;
}
- if (set_multiple_mode(multisectors))
- return -6;
+ if (rc = set_multiple_mode(multisectors))
+ return -60 + rc;
return 0;
}