Changeset 322

Timestamp:

Aug 6, 2017, 8:20:53 AM (7 years ago)

Author:

max@…

Message:

Clean up.

File:

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

trunk/hal/x86_64/drivers/ioc_ata.c

@@ -150 +150 @@
 static void ata_init()
 {
-        uint8_t id[512];
+        uint8_t data[512];
         uint16_t tmpw, *p;
         size_t idx;
         char *model;
-        uint8_t ncyl;
         int ret;
 
@@ -165 +164 @@
                 x86_panic("-> unable to identify ATA\n");
 
+        /*
+         * Read the first sector, swap it, and print the disk model.
+         */
         for (idx = 0; idx < 256; idx++) {
                 tmpw = ata_data_read();
-                id[idx * 2]     = (uint8_t)((tmpw >> 0) & 0xFF);
-                id[idx * 2 + 1] = (uint8_t)((tmpw >> 8) & 0xFF);
-        }
-
-        ncyl = id[0] & 0x1;
-        x86_printf("-> cyl: %z\n", (uint64_t)ncyl);
-
+                data[idx * 2]     = (uint8_t)((tmpw >> 0) & 0xFF);
+                data[idx * 2 + 1] = (uint8_t)((tmpw >> 8) & 0xFF);
+        }
         for (idx = 27*2; idx < 46*2; idx += 2) {
-                p = (uint16_t *)(&id[idx]);
+                p = (uint16_t *)(&data[idx]);
                 *p = bswap16(*p);
         }
-
-        model = &id[27*2];
-        id[46*2] = '\0';
+        model = (char *)&data[27*2];
+        data[46*2] = '\0';
         x86_printf("-> ATA model: '%s'\n", model);
 }