svn commit: r200544 - head/sys/dev/ata/chipsets
Marius Strobl
marius at FreeBSD.org
Mon Dec 14 13:11:50 PST 2009
Author: marius
Date: Mon Dec 14 21:11:50 2009
New Revision: 200544
URL: http://svn.freebsd.org/changeset/base/200544
Log:
Set ATA_CHECKS_CABLE when appropriate.
Reviewed by: mav
MFC after: 1 week
Modified:
head/sys/dev/ata/chipsets/ata-amd.c
Modified: head/sys/dev/ata/chipsets/ata-amd.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-amd.c Mon Dec 14 20:59:18 2009 (r200543)
+++ head/sys/dev/ata/chipsets/ata-amd.c Mon Dec 14 21:11:50 2009 (r200544)
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
#include <ata_if.h>
/* local prototypes */
+static int ata_amd_ch_attach(device_t dev);
static int ata_amd_chipinit(device_t dev);
static int ata_amd_setmode(device_t dev, int target, int mode);
@@ -59,7 +60,6 @@ static int ata_amd_setmode(device_t dev,
#define AMD_BUG 0x01
#define AMD_CABLE 0x02
-
/*
* American Micro Devices (AMD) chipset support functions
*/
@@ -100,6 +100,7 @@ ata_amd_chipinit(device_t dev)
else
pci_write_config(dev, 0x41, pci_read_config(dev, 0x41, 1) | 0xf0, 1);
+ ctlr->ch_attach = ata_amd_ch_attach;
ctlr->setmode = ata_amd_setmode;
return 0;
}
@@ -137,4 +138,19 @@ ata_amd_setmode(device_t dev, int target
return (mode);
}
+static int
+ata_amd_ch_attach(device_t dev)
+{
+ struct ata_pci_controller *ctlr;
+ struct ata_channel *ch;
+ int error;
+
+ ctlr = device_get_softc(device_get_parent(dev));
+ ch = device_get_softc(dev);
+ error = ata_pci_ch_attach(dev);
+ if (ctlr->chip->cfg1 & AMD_CABLE)
+ ch->flags |= ATA_CHECKS_CABLE;
+ return (error);
+}
+
ATA_DECLARE_DRIVER(ata_amd);
More information about the svn-src-head
mailing list