From 5d154f9723f2805f73d6d32233f534582618f1a7 Mon Sep 17 00:00:00 2001
From: Linus Nielsen Feltzing <linus@haxx.se>
Date: Thu, 29 Aug 2002 11:50:57 +0000
Subject: wait_for_rdy() now actually waits for RDY

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2057 a1c6a512-1295-4272-9138-f99709370657
---
 firmware/drivers/ata.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'firmware')

diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c
index 584c8549e6..1a8ff37cb7 100644
--- a/firmware/drivers/ata.c
+++ b/firmware/drivers/ata.c
@@ -122,9 +122,25 @@ static int wait_for_bsy(void)
 static int wait_for_rdy(void) __attribute__ ((section (".icode")));
 static int wait_for_rdy(void)
 {
+    int timeout;
+    
     if (!wait_for_bsy())
         return 0;
-    return ATA_ALT_STATUS & STATUS_RDY;
+
+    timeout = current_tick + HZ*4;
+    
+    while (TIME_BEFORE(current_tick, timeout) &&
+           !(ATA_ALT_STATUS & STATUS_RDY))
+        yield();
+
+    if (TIME_BEFORE(current_tick, timeout))
+    {
+        return STATUS_RDY;
+    }
+    else
+    {
+        return 0; /* timeout */
+    }
 }
 
 static int wait_for_start_of_transfer(void) __attribute__ ((section (".icode")));
-- 
cgit v1.2.3