diff options
| author | msaitoh <msaitoh@NetBSD.org> | 2010-07-13 23:46:19 +0000 |
|---|---|---|
| committer | msaitoh <msaitoh@NetBSD.org> | 2010-07-13 23:46:19 +0000 |
| commit | e2e9dc6ae8a4bab468c83ded6a4edb962b4e9137 (patch) | |
| tree | 6c7388030e0e6b50dcd6e50260e0e9683e1ec6b2 | |
| parent | 80df369a1d9d4f0b2a921e0b9314cc6f06c3c5aa (diff) | |
Add three card support from Tsubai.
- Advantech PCI-1604UP (2S)
- InnoSys Keyspan SX Pro (4S)
- I-O DATA RSA-PCI2 (2S)
| -rw-r--r-- | share/man/man4/puc.4 | 10 | ||||
| -rw-r--r-- | sys/dev/pci/pucdata.c | 36 |
2 files changed, 41 insertions, 5 deletions
diff --git a/share/man/man4/puc.4 b/share/man/man4/puc.4 index 9ba9a7a681b..56c2047fa54 100644 --- a/share/man/man4/puc.4 +++ b/share/man/man4/puc.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: puc.4,v 1.31 2010/07/08 18:55:42 msaitoh Exp $ +.\" $NetBSD: puc.4,v 1.32 2010/07/13 23:46:19 msaitoh Exp $ .\" .\" Copyright (c) 1998 Christopher G. Demetriou .\" All rights reserved. @@ -32,7 +32,7 @@ .\" .\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>> .\" -.Dd July 9, 2010 +.Dd July 14, 2010 .Dt PUC 4 .Os .Sh NAME @@ -63,6 +63,7 @@ The driver currently supports the following cards: .Bl -tag -width Dv -offset indent -compact .It Tn "ADDI-DATA APCI-7800 (8 port serial)" .It Tn "Actiontec 56K PCI Master" +.It Tn "Advantech PCI-1604UP (2 port serial)" .It Tn "Advantech PCI-1610 (4 port serial)" .It Tn "Advantech PCI-1612 (4 port serial)" .It Tn "Advantech PCI-1620 (8 port serial)" @@ -84,8 +85,11 @@ The driver currently supports the following cards: .It Tn "EXAR XR17D158 (8 port serial)" .It Tn "Exsys EX-41098 (4 port serial)" .It Tn "IBM 4810 SurePOS 300 Series SCC (4 port serial)" +.It Tn "InnoSys Keyspan SX Pro (4 port serial)" .It Tn "I-O DATA RSA-PCI (2 port serial)" -.It Tn "I-O DATA RSA-PCI2 (8 port serial)" +.It Tn "I-O DATA RSA-PCI2 (2 port serial)" +.It Tn "I-O DATA RSA-PCI2/P4 (4 port serial)" +.It Tn "I-O DATA RSA-PCI2/P8 (8 port serial)" .It Tn "Lava Computers 2SP-PCI (single parallel)" .It Tn "Lava Computers Octopus (8 port serial)" .It Tn "Lava Computers dual serial" diff --git a/sys/dev/pci/pucdata.c b/sys/dev/pci/pucdata.c index 7d09917bef7..aa4f2572ef7 100644 --- a/sys/dev/pci/pucdata.c +++ b/sys/dev/pci/pucdata.c @@ -1,4 +1,4 @@ -/* $NetBSD: pucdata.c,v 1.67 2010/07/11 00:11:05 mrg Exp $ */ +/* $NetBSD: pucdata.c,v 1.68 2010/07/13 23:46:19 msaitoh Exp $ */ /* * Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.67 2010/07/11 00:11:05 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.68 2010/07/13 23:46:19 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -52,6 +52,16 @@ const struct puc_device_description puc_devices[] = { /* * Advantech multi serial cards */ + /* Advantech PCI-1604UP 2 UARTs based on OX16PCI952 */ + { "Advantech PCI-1604UP UARTs", + { PCI_VENDOR_ADVANTECH, PCI_PRODUCT_ADVANTECH_PCI1604, 0, 0 }, + { 0xffff, 0xffff, 0x0, 0x0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ * 8 }, + }, + }, + { "Advantech PCI-1610 UARTs", { PCI_VENDOR_ADVANTECH, PCI_PRODUCT_ADVANTECH_PCI1600, PCI_PRODUCT_ADVANTECH_PCI1610, 0x0 }, @@ -747,6 +757,28 @@ const struct puc_device_description puc_devices[] = { }, }, + /* InnoSys Keyspan SX Pro OX16PCI954 based 4 UARTs */ + { "InnoSys Keyspan SX Pro Serial Card", + { PCI_VENDOR_OXFORDSEMI, 0x9501, PCI_VENDOR_INNOSYS, 0x5850 }, + { 0xffff, 0xffff, 0xffff, 0xffff }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8 }, + }, + }, + + /* I-O DATA RSA-PCI2 two UARTs based on OX16PCI954 */ + { "I-O DATA RSA-PCI2 UARTs", + { PCI_VENDOR_OXFORDSEMI, 0x9501, PCI_VENDOR_IODATA, 0xc070 }, + { 0xffff, 0xffff, 0xffff, 0xffff }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 }, + }, + }, + /* I-O DATA RSA-PCI2 four/eight(1-4) UARTs based on OX16PCI954 */ { "I-O DATA RSA-PCI2/P4 or P8 (1-4) UARTs", { PCI_VENDOR_OXFORDSEMI, 0x9501, PCI_VENDOR_IODATA, 0xd007 }, |
