2009-01-12 Christian Franke <franke@computer.org>

	* disk/ata.c (grub_ata_pciinit): Fix bit numbers of compatibility
	mode check.  Fix setting of compat_use[].

diff --git a/ChangeLog b/ChangeLog
index d3329536cf846e9cc5ad70b35ded877cff48cc08..b77f4385c656a11750114ccd3ac1bfaa984c4b87 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-12  Christian Franke  <franke@computer.org>
+
+       * disk/ata.c (grub_ata_pciinit): Fix bit numbers of compatibility
+       mode check.  Fix setting of compat_use[].
+
 2009-01-10  Robert Millan  <rmh@aybabtu.com>
 
        Update a few copyright years which we forgot to do in 2008 (only for

diff --git a/disk/ata.c b/disk/ata.c
index 6e0b8b805b3e1d9bbba52d3a7a79767df5f0f6bf..4ca63c233b2867f172050e7b90b5c6372e5c8ab4 100644 (file)
--- a/disk/ata.c
+++ b/disk/ata.c
@@ -504,7 +504,7 @@ grub_ata_pciinit (int bus, int device, int func,
   for (i = 0; i < 2; i++)
     {
       /* Set to 0 when the channel operated in compatibility mode.  */
-      int compat = (class >> (2 * i)) & 1;
+      int compat = (class >> (8 + 2 * i)) & 1;
 
       rega = 0;
       regb = 0;
@@ -515,7 +515,7 @@ grub_ata_pciinit (int bus, int device, int func,
        {
          rega = grub_ata_ioaddress[i];
          regb = grub_ata_ioaddress2[i];
-         compat_use[i] = 0;
+         compat_use[i] = 1;
        }
       else if (compat)
        {