diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-04-23 18:40:02 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-04-23 18:40:02 +0000 |
| commit | fa3012913efec9dd11d1b83975d7b9a99902609c (patch) | |
| tree | d9c052a05f2b43b8f438cbfc5b086bcb8c69703f /sys | |
| parent | d2b656e3639fc53fc657a5bd4edea161850fcfce (diff) | |
support netmos 6 port version; avf@eldamar.org.uk
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/pcidevs.h | 3 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs_data.h | 6 | ||||
| -rw-r--r-- | sys/dev/pci/pucdata.c | 16 |
3 files changed, 22 insertions, 3 deletions
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h index c5601e15fab..960e53fa92c 100644 --- a/sys/dev/pci/pcidevs.h +++ b/sys/dev/pci/pcidevs.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcidevs,v 1.1340 2008/04/18 23:59:07 deraadt Exp + * OpenBSD: pcidevs,v 1.1341 2008/04/23 18:37:05 deraadt Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -2819,6 +2819,7 @@ #define PCI_PRODUCT_NETMOS_1P 0x9805 /* 1P */ #define PCI_PRODUCT_NETMOS_2S1P 0x9835 /* 2S1P */ #define PCI_PRODUCT_NETMOS_4S 0x9845 /* 4S */ +#define PCI_PRODUCT_NETMOS_6S 0x9845 /* 6S */ /* Network Security Technologies */ #define PCI_PRODUCT_NETSEC_7751 0x7751 /* 7751 */ diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h index 70a08991505..ad0d4feccb2 100644 --- a/sys/dev/pci/pcidevs_data.h +++ b/sys/dev/pci/pcidevs_data.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcidevs,v 1.1340 2008/04/18 23:59:07 deraadt Exp + * OpenBSD: pcidevs,v 1.1341 2008/04/23 18:37:05 deraadt Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -8688,6 +8688,10 @@ static const struct pci_known_product pci_known_products[] = { "4S", }, { + PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_6S, + "6S", + }, + { PCI_VENDOR_NETSEC, PCI_PRODUCT_NETSEC_7751, "7751", }, diff --git a/sys/dev/pci/pucdata.c b/sys/dev/pci/pucdata.c index 8131d4d334d..fa754c8ea27 100644 --- a/sys/dev/pci/pucdata.c +++ b/sys/dev/pci/pucdata.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pucdata.c,v 1.52 2007/11/09 02:05:16 fgsch Exp $ */ +/* $OpenBSD: pucdata.c,v 1.53 2008/04/23 18:40:01 deraadt Exp $ */ /* $NetBSD: pucdata.c,v 1.6 1999/07/03 05:55:23 cgd Exp $ */ /* @@ -1149,6 +1149,20 @@ const struct puc_device_description puc_devices[] = { }, }, + /* NetMos 6S PCI 16C650 : 6S, 0P */ + { /* "NetMos NM9845 6 UART" */ + { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_6S, 0x1000, 0x0006}, + { 0xffff, 0xffff, 0xffff, 0xffff}, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x20, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x24, 0x00, COM_FREQ }, + }, + }, + /* NetMos 4S PCI 16C650 : 4S, 0P */ { /* "NetMos NM9845 Quad UART" */ { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_4S, 0, 0 }, |