diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-02-24 00:04:28 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-02-24 00:04:28 +0000 |
| commit | 381b010e232e3264f0589fe71cc75f5fa2287bb2 (patch) | |
| tree | 63df1336eb3f0bc27c03d90cc687bea19241f4aa /sys | |
| parent | 69776bce126180193576ea14f0827b4fd524f65e (diff) | |
use some define's for the PCI ids and add another ICP Vortex PCI id.
PCI id from the Linux gdth driver.
ok krw@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/gdt_pci.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sys/dev/pci/gdt_pci.c b/sys/dev/pci/gdt_pci.c index 5cb1b64367d..473c90ea806 100644 --- a/sys/dev/pci/gdt_pci.c +++ b/sys/dev/pci/gdt_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt_pci.c,v 1.19 2003/08/06 21:08:06 millert Exp $ */ +/* $OpenBSD: gdt_pci.c,v 1.20 2006/02/24 00:04:27 brad Exp $ */ /* * Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -53,6 +53,11 @@ /* Product numbers for Fibre-Channel are greater than or equal to 0x200 */ #define GDT_PCI_PRODUCT_FC 0x200 +#define GDT_DEVICE_ID_MIN 0x100 +#define GDT_DEVICE_ID_MAX 0x2ff +#define GDT_DEVICE_ID_NEWRX 0x300 +#define GDT_DEVICE_ID_NEWRX2 0x301 + /* Mapping registers for various areas */ #define GDT_PCI_DPMEM 0x10 #define GDT_PCINEW_IOMEM 0x10 @@ -151,7 +156,10 @@ gdt_pci_probe(parent, match, aux) struct pci_attach_args *pa = aux; if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_VORTEX && - PCI_PRODUCT(pa->pa_id) >= 0x100 && PCI_PRODUCT(pa->pa_id) <= 0x300) + ((PCI_PRODUCT(pa->pa_id) >= GDT_DEVICE_ID_MIN && + PCI_PRODUCT(pa->pa_id) <= GDT_DEVICE_ID_MAX) || + PCI_PRODUCT(pa->pa_id) == GDT_DEVICE_ID_NEWRX || + PCI_PRODUCT(pa->pa_id) == GDT_DEVICE_ID_NEWRX2)) return (1); if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_INTEL && (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_GDT_RAID1 || |