diff options
| author |   jason <jason@openbsd.org> | 2002-11-19 18:40:16 +0000 |
|---|---|---|
| committer | jason <jason@openbsd.org> | 2002-11-19 18:40:16 +0000 |
| commit | 6f90920fe77d3de38f5477a4106b971292dc022e (patch) | |
| tree | 185d19f885892062002712c79fc874f91872a057 /sys/dev/pci/cmpci.c | |
| parent | Use queue.h macros instead of using the structure names directly. (diff) | |
| download | wireguard-openbsd-6f90920fe77d3de38f5477a4106b971292dc022e.tar.xz wireguard-openbsd-6f90920fe77d3de38f5477a4106b971292dc022e.zip | |
Add a simplistic table driven lookup routine and use it where appropriate.
Diffstat (limited to 'sys/dev/pci/cmpci.c')
| -rw-r--r-- | sys/dev/pci/cmpci.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c index 2c99279b111..ce745f89864 100644 --- a/sys/dev/pci/cmpci.c +++ b/sys/dev/pci/cmpci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmpci.c,v 1.8 2002/03/14 03:16:06 millert Exp $ */ +/* $OpenBSD: cmpci.c,v 1.9 2002/11/19 18:40:17 jason Exp $ */ /* * Copyright (c) 2000 Takuya SHIOZAKI @@ -289,6 +289,11 @@ cmpci_index_to_divider(index) return cmpci_rate_table[index].divider; } +const struct pci_matchid cmpci_devices[] = { + { PCI_VENDOR_CMI, PCI_PRODUCT_CMI_CMI8338A }, + { PCI_VENDOR_CMI, PCI_PRODUCT_CMI_CMI8338B }, + { PCI_VENDOR_CMI, PCI_PRODUCT_CMI_CMI8738 }, +}; /* * interface to configure the device. @@ -299,15 +304,8 @@ cmpci_match(parent, match, aux) void *match; void *aux; { - struct pci_attach_args *pa = (struct pci_attach_args *)aux; - - if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_CMI && - (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_CMI_CMI8338A || - PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_CMI_CMI8338B || - PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_CMI_CMI8738)) - return 1; - - return 0; + return (pci_matchbyid((struct pci_attach_args *)aux, cmpci_devices, + sizeof(cmpci_devices)/sizeof(cmpci_devices[0]))); } void |