diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2007-10-11 17:35:58 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2007-10-11 17:35:58 +0000 |
| commit | ed9256e85e81e5d89d10cf231fc77173fed9c281 (patch) | |
| tree | 715192fa5f7462875860b07202a2bee62173926f | |
| parent | 681abe59d96713b4a9b0aeb331bdd87d621f0d3b (diff) | |
Add device ID used by Commell MP-954GPS
ok deraadt@
| -rw-r--r-- | sys/dev/pci/pcidevs | 4 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs.h | 2 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs_data.h | 8 | ||||
| -rw-r--r-- | sys/dev/pci/pucdata.c | 13 |
4 files changed, 25 insertions, 2 deletions
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index ece85096023..cee45928df1 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -1,4 +1,4 @@ -$OpenBSD: pcidevs,v 1.1272 2007/10/10 01:00:44 dlg Exp $ +$OpenBSD: pcidevs,v 1.1273 2007/10/11 17:35:56 sthen Exp $ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* @@ -3283,6 +3283,8 @@ product OXFORD2 OX16PCI954 0x9501 OX16PCI954 product OXFORD2 OX16PCI954K 0x9504 OX16PCI954K product OXFORD2 EXSYS_EX41092 0x950a Exsys EX-41092 product OXFORD2 OXCB950 0x950b OXCB950 +product OXFORD2 OXMPCI954 0x950c OXmPCI954 +product OXFORD2 OXMPCI954D 0x9510 OXmPCI954 Disabled product OXFORD2 EXSYS_EX41098 0x9511 Exsys EX-41098 product OXFORD2 OX16PCI954P 0x9513 OX16PCI954 Parallel product OXFORD2 OX16PCI952 0x9521 OX16PCI952 diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h index 2c0e3fd07c4..d248f798834 100644 --- a/sys/dev/pci/pcidevs.h +++ b/sys/dev/pci/pcidevs.h @@ -3288,6 +3288,8 @@ #define PCI_PRODUCT_OXFORD2_OX16PCI954K 0x9504 /* OX16PCI954K */ #define PCI_PRODUCT_OXFORD2_EXSYS_EX41092 0x950a /* Exsys EX-41092 */ #define PCI_PRODUCT_OXFORD2_OXCB950 0x950b /* OXCB950 */ +#define PCI_PRODUCT_OXFORD2_OXMPCI954 0x950c /* OXmPCI954 */ +#define PCI_PRODUCT_OXFORD2_OXMPCI954D 0x9510 /* OXmPCI954 Disabled */ #define PCI_PRODUCT_OXFORD2_EXSYS_EX41098 0x9511 /* Exsys EX-41098 */ #define PCI_PRODUCT_OXFORD2_OX16PCI954P 0x9513 /* OX16PCI954 Parallel */ #define PCI_PRODUCT_OXFORD2_OX16PCI952 0x9521 /* OX16PCI952 */ diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h index e071d4a6ff8..31b8273f740 100644 --- a/sys/dev/pci/pcidevs_data.h +++ b/sys/dev/pci/pcidevs_data.h @@ -10412,6 +10412,14 @@ static const struct pci_known_product pci_known_products[] = { "OXCB950", }, { + PCI_VENDOR_OXFORD2, PCI_PRODUCT_OXFORD2_OXMPCI954, + "OXmPCI954", + }, + { + PCI_VENDOR_OXFORD2, PCI_PRODUCT_OXFORD2_OXMPCI954D, + "OXmPCI954 Disabled", + }, + { PCI_VENDOR_OXFORD2, PCI_PRODUCT_OXFORD2_EXSYS_EX41098, "Exsys EX-41098", }, diff --git a/sys/dev/pci/pucdata.c b/sys/dev/pci/pucdata.c index aef3b31efb3..f08938e222c 100644 --- a/sys/dev/pci/pucdata.c +++ b/sys/dev/pci/pucdata.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pucdata.c,v 1.48 2007/06/08 12:44:41 mbalmer Exp $ */ +/* $OpenBSD: pucdata.c,v 1.49 2007/10/11 17:35:57 sthen Exp $ */ /* $NetBSD: pucdata.c,v 1.6 1999/07/03 05:55:23 cgd Exp $ */ /* @@ -858,6 +858,17 @@ const struct puc_device_description puc_devices[] = { }, }, + /* Commell MP-954GPS, GPS and 2 COM */ + { /* "Oxford Semiconductor OX16mPCI954 UARTs", */ + { PCI_VENDOR_OXFORD2, PCI_PRODUCT_OXFORD2_OXMPCI954, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ*4 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ*4 }, + { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ*4 }, + }, + }, + /* Oxford Semiconductor OX16PCI954K PCI UARTs */ { /* "Oxford Semiconductor OX16PCI954K UARTs", */ { PCI_VENDOR_OXFORD2, PCI_PRODUCT_OXFORD2_OX16PCI954K, 0, 0 }, |