From: Kevin O'Connor <kevin@koconnor.net>
Date: Wed, 12 Aug 2009 00:58:11 +0000 (-0400)
Subject: Minor - remove ATA specific version field from ATA.devices[].
X-Git-Tag: rel-0.4.2~20
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f2d48a3d6584b05f6357e3efc34d78db1501eaa5;p=seabios.git

Minor - remove ATA specific version field from ATA.devices[].
---

diff --git a/src/ata.c b/src/ata.c
index a833c1d..5dac4e9 100644
--- a/src/ata.c
+++ b/src/ata.c
@@ -566,6 +566,19 @@ setup_translation(int driveid)
  * ATA detect and init
  ****************************************************************/
 
+// Extract the ATA/ATAPI version info.
+static int
+extract_version(u16 *buffer)
+{
+    // Extract ATA/ATAPI version.
+    u16 ataversion = buffer[80];
+    u8 version;
+    for (version=15; version>0; version--)
+        if (ataversion & (1<<version))
+            break;
+    return version;
+}
+
 // Extract common information from IDENTIFY commands.
 static void
 extract_identify(int driveid, u16 *buffer)
@@ -587,14 +600,6 @@ extract_identify(int driveid, u16 *buffer)
     for (i=maxsize-2; i>0 && model[i] == 0x20; i--)
         model[i] = 0x00;
 
-    // Extract ATA/ATAPI version.
-    u16 ataversion = buffer[80];
-    u8 version;
-    for (version=15; version>0; version--)
-        if (ataversion & (1<<version))
-            break;
-    ATA.devices[driveid].version = version;
-
     // Common flags.
     SET_GLOBAL(ATA.devices[driveid].removable, (buffer[0] & 0x80) ? 1 : 0);
 }
@@ -626,7 +631,7 @@ init_drive_atapi(int driveid, u16 *buffer)
     u8 channel = ataid / 2;
     u8 slave = ataid % 2;
     printf("ata%d-%d: %s ATAPI-%d %s\n", channel, slave
-           , ATA.devices[driveid].model, ATA.devices[driveid].version
+           , ATA.devices[driveid].model, extract_version(buffer)
            , (iscd ? "CD-Rom/DVD-Rom" : "Device"));
 
     // fill cdidmap
@@ -679,7 +684,7 @@ init_drive_ata(int driveid, u16 *buffer)
     u8 slave = ataid % 2;
     char *model = ATA.devices[driveid].model;
     printf("ata%d-%d: %s ATA-%d Hard-Disk ", channel, slave, model
-           , ATA.devices[driveid].version);
+           , extract_version(buffer));
     u64 sizeinmb = sectors >> 11;
     if (sizeinmb < (1 << 16))
         printf("(%u MiBytes)\n", (u32)sizeinmb);
diff --git a/src/disk.h b/src/disk.h
index 915c53f..9441fe1 100644
--- a/src/disk.h
+++ b/src/disk.h
@@ -178,7 +178,6 @@ struct ata_device_s {
     u8  type;         // Detected type of ata (ata/atapi/none)
     u8  removable;    // Removable device flag
     u16 blksize;      // block size
-    u8  version;      // ATA/ATAPI version
     int cntl_id;
 
     char model[41];