diff options
author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-06-19 16:09:25 +0000 |
---|---|---|
committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-06-19 16:09:25 +0000 |
commit | f37a917edd515a307516c19c8d0cbd9a53effd9a (patch) | |
tree | 70ad87e63eb2b3a0a55af8b66170786c8217c01d | |
parent | 99355b6718dbc6efcb7ff8afd728c4001cd9485e (diff) |
do not attach at i2o-configured adapter; pointed out by ad@netbsd.org
-rw-r--r-- | sys/dev/pci/ami_pci.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/pci/ami_pci.c b/sys/dev/pci/ami_pci.c index 5c959122d4c..c6a60556780 100644 --- a/sys/dev/pci/ami_pci.c +++ b/sys/dev/pci/ami_pci.c @@ -1,7 +1,7 @@ -/* $OpenBSD: ami_pci.c,v 1.4 2001/06/12 15:40:30 niklas Exp $ */ +/* $OpenBSD: ami_pci.c,v 1.5 2001/06/19 16:09:24 mickey Exp $ */ /* - * Copyright (c) 2000 Michael Shalayeff + * Copyright (c) 2001 Michael Shalayeff * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -123,6 +123,9 @@ ami_pci_match(parent, match, aux) struct pci_attach_args *pa = aux; const struct ami_pci_device *pami; + if (PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_I2O_STANDARD) + return (0); + for (pami = ami_pci_devices; pami->vendor; pami++) { if (pami->vendor == PCI_VENDOR(pa->pa_id) && pami->product == PCI_PRODUCT(pa->pa_id) && @@ -211,6 +214,9 @@ ami_pci_attach(parent, self, aux) break; } + /* XXX 438 is netraid 3si for hp cards, but we get to know + they are hp too late in md code */ + if (!model) { const struct ami_pci_vendor *vp; static char modelbuf[12]; |