New patch to review for coreboot: 0d22c91 simplify IDE cable detection for Asus M2V

[Florian Zumbiehl]

Florian Zumbiehl just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/371

-gerrit

commit 0d22c9143f78aad039a364b15e651baf98e37a2f
Author: Florian Zumbiehl 
Date:   Tue Nov 1 20:17:13 2011 +0100

simplify IDE cable detection for Asus M2V

Change-Id: If8e4dcf405e24b744ac34f581c5609fcce96fd07
    Signed-off-by: Florian Zumbiehl 
---
 src/mainboard/asus/m2v/mainboard.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/mainboard/asus/m2v/mainboard.c b/src/mainboard/asus/m2v/mainboard.c
index 76d3cf6..2f20fe0 100644
--- a/src/mainboard/asus/m2v/mainboard.c
+++ b/src/mainboard/asus/m2v/mainboard.c
@@ -37,10 +37,9 @@ u32 vt8237_ide_80pin_detect(struct device *dev)
    if (!lpc_dev)
    	return 0;

-	acpi_io_base = pci_read_config16(lpc_dev, 0x88);
-	if (!acpi_io_base || (acpi_io_base & ~1) == 0)
+	acpi_io_base = pci_read_config16(lpc_dev, 0x88) & ~1;
+	if (!acpi_io_base)
    	return 0;
-	acpi_io_base &= ~1;

gpio_in = inl(acpi_io_base + 0x48);
    /* bit 9 for primary port, clear if unconnected or 80-pin cable */
@@ -49,9 +48,9 @@ u32 vt8237_ide_80pin_detect(struct device *dev)
    res |= gpio_in & (1<<4) ? 0 : VT8237R_IDE1_80PIN_CABLE;

printk(BIOS_INFO, "Cable on %s PATA port: %d pin\n", "primary",
-		gpio_in & (1<<9) ? 40 : 80);
+		res & VT8237R_IDE0_80PIN_CABLE ? 80 : 40);
    printk(BIOS_INFO, "Cable on %s PATA port: %d pin\n", "secondary",
-		gpio_in & (1<<4) ? 40 : 80);
+		res & VT8237R_IDE1_80PIN_CABLE ? 80 : 40);

return res;
 }