]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
disk/ahci: Use defines `GRUB_ATA_STATUS_BUSY` and `GRUB_ATA_STATUS_DRQ`
authorPaul Menzel <paulepanter@users.sourceforge.net>
Sun, 24 May 2015 09:11:25 +0000 (11:11 +0200)
committerAndrei Borzenkov <arvidjaar@gmail.com>
Sun, 24 May 2015 18:19:01 +0000 (21:19 +0300)
Instead of hard coding `0x88` use the macros defined in `disk/ata.h`.

grub-core/disk/ahci.c

index d6bdbddf68e62f23352a48bd7b9dd6a4ac6e0f13..7f757240406688a890d498beb73d12359246cefa 100644 (file)
@@ -565,14 +565,14 @@ grub_ahci_pciinit (grub_pci_device_t dev,
   while (grub_get_time_ms () < endtime)
     {
       for (i = 0; i < nports; i++)
-       if (adevs[i] && (adevs[i]->hba->ports[adevs[i]->port].task_file_data & 0x88))
+       if (adevs[i] && (adevs[i]->hba->ports[adevs[i]->port].task_file_data & (GRUB_ATA_STATUS_BUSY | GRUB_ATA_STATUS_DRQ)))
          break;
       if (i == nports)
        break;
     }
 
   for (i = 0; i < nports; i++)
-    if (adevs[i] && (adevs[i]->hba->ports[adevs[i]->port].task_file_data & 0x88))
+    if (adevs[i] && (adevs[i]->hba->ports[adevs[i]->port].task_file_data & (GRUB_ATA_STATUS_BUSY | GRUB_ATA_STATUS_DRQ)))
       {
        grub_dprintf ("ahci", "port %d is busy\n", i);
        failed_adevs[i] = adevs[i];