8c6b1ac71e
Also include some minor fixes for gcc 5.1.1 Signed-off-by: Peter Jones <pjones@redhat.com>
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From f4b1b48a837a034748a103adc7e9fd719a39ce42 Mon Sep 17 00:00:00 2001
|
|
From: Paul Menzel <paulepanter@users.sourceforge.net>
|
|
Date: Thu, 28 May 2015 19:14:19 +0200
|
|
Subject: [PATCH 430/506] disk/ahci.c: Use defines
|
|
`GRUB_AHCI_HBA_PORT_CMD_SPIN_UP` and `GRUB_AHCI_HBA_PORT_CMD_POWER_ON`
|
|
|
|
Instead of hard coding `2` and `4` use the macros defined already at the
|
|
top of the file. As a consequence, wrap the now too long line.
|
|
---
|
|
grub-core/disk/ahci.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/disk/ahci.c b/grub-core/disk/ahci.c
|
|
index da5fead..f4725e8 100644
|
|
--- a/grub-core/disk/ahci.c
|
|
+++ b/grub-core/disk/ahci.c
|
|
@@ -552,7 +552,9 @@ grub_ahci_pciinit (grub_pci_device_t dev,
|
|
adevs[i]->hba->ports[adevs[i]->port].sata_error);
|
|
|
|
adevs[i]->hba->ports[adevs[i]->port].command
|
|
- = (adevs[i]->hba->ports[adevs[i]->port].command & 0x0fffffff) | (1 << 28) | 2 | 4;
|
|
+ = (adevs[i]->hba->ports[adevs[i]->port].command & 0x0fffffff) | (1 << 28)
|
|
+ | GRUB_AHCI_HBA_PORT_CMD_SPIN_UP
|
|
+ | GRUB_AHCI_HBA_PORT_CMD_POWER_ON;
|
|
|
|
/* struct grub_disk_ata_pass_through_parms parms2;
|
|
grub_memset (&parms2, 0, sizeof (parms2));
|
|
--
|
|
2.4.3
|
|
|