diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2006-05-31 03:38:33 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2006-05-31 03:38:33 +0000 |
| commit | 87c38ecd52206b661b9de129fe5cb0457c6c1b51 (patch) | |
| tree | d9bbf2d751f57efa374f03766e640bd056c78717 /sys/dev/pci | |
| parent | 852edf21f98124117e1f53200f9d10c9f916b532 (diff) | |
allow mpi to attach to the scsi controllers again. however, mpt will attach
to them by default, so disable mpt to get mpi to attach.
requested by deraadt@
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/mpi_pci.c | 10 | ||||
| -rw-r--r-- | sys/dev/pci/mpt_pci.c | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/pci/mpi_pci.c b/sys/dev/pci/mpi_pci.c index 0c9aace36e9..2a181c0b88d 100644 --- a/sys/dev/pci/mpi_pci.c +++ b/sys/dev/pci/mpi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpi_pci.c,v 1.3 2006/05/31 03:16:16 dlg Exp $ */ +/* $OpenBSD: mpi_pci.c,v 1.4 2006/05/31 03:38:32 dlg Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -59,9 +59,7 @@ struct cfattach mpi_pci_ca = { #define MPP_DUAL 0x01 /* Dual port adapter */ static const struct pci_matchid mpi_devices[] = { -#ifdef notyet { PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_1030 }, -#endif { PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_FC909 }, { PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_FC909A }, { PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_FC919 }, @@ -77,8 +75,12 @@ mpi_pci_match(struct device *parent, void *match, void *aux) { struct pci_attach_args *pa = aux; + if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_SYMBIOS && + PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_SYMBIOS_1030) + return (1); + return (pci_matchbyid(pa, mpi_devices, - sizeof(mpi_devices) / sizeof(mpi_devices[0])) * 2); + sizeof(mpi_devices) / sizeof(mpi_devices[0])) * 3); } void diff --git a/sys/dev/pci/mpt_pci.c b/sys/dev/pci/mpt_pci.c index 9c007f54d98..930815cdb49 100644 --- a/sys/dev/pci/mpt_pci.c +++ b/sys/dev/pci/mpt_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpt_pci.c,v 1.12 2006/02/04 19:05:00 marco Exp $ */ +/* $OpenBSD: mpt_pci.c,v 1.13 2006/05/31 03:38:32 dlg Exp $ */ /* $NetBSD: mpt_pci.c,v 1.2 2003/07/14 15:47:26 lukem Exp $ */ /* @@ -151,7 +151,7 @@ mpt_pci_match(struct device *parent, void *match, void *aux) struct pci_attach_args *pa = aux; if (mpt_pci_lookup(pa) != NULL) - return (1); + return (2); return (0); } |