Changeset 269 for trunk/hal/x86_64/drivers/ioc_ata.c

Timestamp:

Jul 21, 2017, 3:42:38 PM (7 years ago)

Author:

max@…

Message:

Mmh, fix previous.

File:

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

trunk/hal/x86_64/drivers/ioc_ata.c

@@ -104 +104 @@
 {
         uint16_t tmpword;
-        int idx;
-
-        for (idx = 0; idx < 256 * count; idx++) {
+        size_t idx, n;
+
+        for (n = 0; n < count; n++) {
                 /* 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);
-                buf[idx * 2 + 1] = (uint8_t)(tmpword >> 8);
+                /* read one block */
+                for (idx = 0; idx < 256; idx++) {
+                        tmpword = ata_data_read();
+                        buf[n * 512 + idx * 2] = (uint8_t)(tmpword & 0xFF);
+                        buf[n * 512 + idx * 2 + 1] = (uint8_t)(tmpword >> 8);
+                }
         }
 
@@ -123 +125 @@
 {
         uint16_t tmpword;
-        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++) {
-                tmpword = (buf[idx * 2 + 1] << 8) | buf[idx * 2];
-                ata_data_write(tmpword);
+        size_t idx, n;
+
+        for (n = 0; n < count; n++) {
+                /* wait for the drive to signal that it's ready */
+                if (ata_wait() == -1)
+                        x86_panic("ata_wait");
+
+                /* write one block */
+                for (idx = 0; idx < 256; idx++) {
+                        tmpword = (buf[n * 512 + idx * 2 + 1] << 8) |
+                                   buf[n * 512 + idx * 2];
+                        ata_data_write(tmpword);
+                }
         }