Changeset 268 for trunk/hal

Timestamp:

Jul 21, 2017, 3:36:16 PM (7 years ago)

Author:

max@…

Message:

Mmh, the wait must be done for each block, not for each operation.

File:

• trunk/hal/x86_64/drivers/ioc_ata.c (modified) (2 diffs)

trunk/hal/x86_64/drivers/ioc_ata.c

@@ -78 +78 @@
         uint8_t status;
 
-        while (!(ata_cbr_read(ATA_SR) & ATA_SR_DRQ));
-        status = ata_cbr_read(ATA_SR);
+        while (1) {
+                status = ata_cbr_read(ATA_SR);
+                if (status & ATA_SR_DRQ)
+                        break;
+        }
+
         return ((status & ATA_SR_ERR) ? -1 : 0);
 }
@@ -102 +106 @@
         int idx;
 
-        /* wait for the drive to signal that it's ready */
-        if (ata_wait() == -1)
-                x86_panic("ata_wait");
-
         for (idx = 0; idx < 256 * count; idx++) {
+                /* wait for the drive to signal that it's ready */
+                if (ata_wait() == -1)
+                        x86_panic("ata_wait");
+
+                /* read */
                 tmpword = ata_data_read();
                 buf[idx * 2] = (uint8_t)(tmpword & 0xFF);