diff options
| author | Mike Smith <msmith@FreeBSD.org> | 2000-12-22 22:23:56 +0000 |
|---|---|---|
| committer | Mike Smith <msmith@FreeBSD.org> | 2000-12-22 22:23:56 +0000 |
| commit | 29e79e51ee16a80037c249b545681f864cc8529d (patch) | |
| tree | fccb499ba46fc70cc9f954c670efd542bfaf9f0b /sys/dev/amr/amr_pci.c | |
| parent | 4de932048c66f57a617f813091352a39911a71c6 (diff) | |
| download | src-29e79e51ee16a80037c249b545681f864cc8529d.tar.gz src-29e79e51ee16a80037c249b545681f864cc8529d.zip | |
Probe generic i960 devices for the old AMI signature as well as the current
one, in order to support adapters with older firmware.
Submitted by: "Prasanth S." <prasanths@ami.co.in>
Notes
Notes:
svn path=/head/; revision=70285
Diffstat (limited to 'sys/dev/amr/amr_pci.c')
| -rw-r--r-- | sys/dev/amr/amr_pci.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c index 783d4301be45..26b9ff897345 100644 --- a/sys/dev/amr/amr_pci.c +++ b/sys/dev/amr/amr_pci.c @@ -103,7 +103,7 @@ static struct static int amr_pci_probe(device_t dev) { - int i; + int i, sig; debug_called(1); @@ -112,9 +112,11 @@ amr_pci_probe(device_t dev) (pci_get_device(dev) == amr_device_ids[i].device)) { /* do we need to test for a signature? */ - if ((amr_device_ids[i].flag & PROBE_SIGNATURE) && - (pci_read_config(dev, AMR_CFG_SIG, 2) != AMR_SIGNATURE)) - continue; + if (amr_device_ids[i].flag & PROBE_SIGNATURE) { + sig = pci_read_config(dev, AMR_CFG_SIG, 2); + if ((sig != AMR_SIGNATURE_1) && (sig != AMR_SIGNATURE_2)) + continue; + } device_set_desc(dev, "AMI MegaRAID"); return(-10); /* allow room to be overridden */ } |