Module Name: src Committed By: msaitoh Date: Sun Aug 1 18:50:25 UTC 2010
Modified Files: src/share/man/man4: puc.4 src/sys/dev/pci: pucdata.c pucvar.h Log Message: Add the following cards' support from FreeBSD: - Comtrol RocketPort 550/4, 550/8 and 550/16 series - Lava Computers Quatro-PCI - some NetMos NM9865 cards - VScom PCI-200Li To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/share/man/man4/puc.4 cvs rdiff -u -r1.68 -r1.69 src/sys/dev/pci/pucdata.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/pucvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/share/man/man4/puc.4 diff -u src/share/man/man4/puc.4:1.32 src/share/man/man4/puc.4:1.33 --- src/share/man/man4/puc.4:1.32 Tue Jul 13 23:46:19 2010 +++ src/share/man/man4/puc.4 Sun Aug 1 18:50:25 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: puc.4,v 1.32 2010/07/13 23:46:19 msaitoh Exp $ +.\" $NetBSD: puc.4,v 1.33 2010/08/01 18:50:25 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 14, 2010 +.Dd August 1, 2010 .Dt PUC 4 .Os .Sh NAME @@ -72,6 +72,9 @@ .It Tn "Boca Research Turbo Serial 658 (8 port serial)" .It Tn "Chase Research / Perle PCI-FAST4 (4 port serial)" .It Tn "Chase Research / Perle PCI-FAST8 (8 port serial)" +.It Tn "Comtrol RocketPort 550/4 series (4 port serial)" +.It Tn "Comtrol RocketPort 550/8 series (8 port serial)" +.It Tn "Comtrol RocketPort 550/16 series (16 port serial)" .It Tn "Decision Computer Inc PCCOM PCI 2 Port (2 port serial)" .It Tn "Decision Computer Inc PCCOM PCI 4 Port (4 port serial)" .It Tn "Decision Computer Inc PCCOM PCI 8 Port (8 port serial)" @@ -92,6 +95,7 @@ .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 Quatro-PCI (4 port serial)" .It Tn "Lava Computers dual serial" .It Tn "Middle Digital, Inc. Weasel serial port" .It Tn "Moxa Technologies SmartIO C104H/PCI (4 port serial)" @@ -112,6 +116,11 @@ .It Tn "NetMos 4S1P PCI NM9845 (4 port serial and single parallel)" .It Tn "NetMos NM9835 (dual parallel and single serial)" .It Tn "NetMos NM9835 UART (1 port serial)" +.It Tn "NetMos NM9865 Single UART and Single LPT" +.It Tn "NetMos NM9865 Dual UART and Single LPT" +.It Tn "NetMos NM9865 Dual LPT" +.It Tn "NetMos NM9865 2 UART (2 port serial)" +.It Tn "NetMos NM9865 3 UART (3 port serial)" .It Tn "NetMos NM9865 4 UART (4 port serial)" .It Tn "NetMos NM9865 UART (1 port serial)" .It Tn "NetMos NM9901 PCIe (single parallel)" @@ -154,6 +163,7 @@ .It Tn "VScom PCI-200H (dual serial)" .It Tn "VScom PCI-200HV2 (dual serial)" .It Tn "VScom PCI-200L (dual serial)" +.It Tn "VScom PCI-200Li (dual serial)" .It Tn "VScom PCI-210L (2 port serial and 1 port parallel)" .It Tn "VScom PCI-400 (4 port serial)" .It Tn "VScom PCI-400L (4 port serial)" Index: src/sys/dev/pci/pucdata.c diff -u src/sys/dev/pci/pucdata.c:1.68 src/sys/dev/pci/pucdata.c:1.69 --- src/sys/dev/pci/pucdata.c:1.68 Tue Jul 13 23:46:19 2010 +++ src/sys/dev/pci/pucdata.c Sun Aug 1 18:50:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pucdata.c,v 1.68 2010/07/13 23:46:19 msaitoh Exp $ */ +/* $NetBSD: pucdata.c,v 1.69 2010/08/01 18:50:24 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.68 2010/07/13 23:46:19 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.69 2010/08/01 18:50:24 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -202,6 +202,118 @@ }, /* + * Comtrol + */ + { "Comtrol RocketPort 550/8 RJ11 part A", + { PCI_VENDOR_COMTROL, 0x8010, 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}, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4}, + }, + }, + { "Comtrol RocketPort 550/8 RJ11 part B", + { PCI_VENDOR_COMTROL, 0x8011, 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}, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4}, + }, + }, + { "Comtrol RocketPort 550/8 Octa part A", + { PCI_VENDOR_COMTROL, 0x8012, 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}, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4}, + }, + }, + { "Comtrol RocketPort 550/8 Octa part B", + { PCI_VENDOR_COMTROL, 0x8013, 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}, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4}, + }, + }, + { "Comtrol RocketPort 550/4 RJ45", + { PCI_VENDOR_COMTROL, 0x8014, 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}, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4}, + }, + }, + { "Comtrol RocketPort 550/Quad", + { PCI_VENDOR_COMTROL, 0x8015, 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}, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4}, + }, + }, + { "Comtrol RocketPort 550/16 part A", + { PCI_VENDOR_COMTROL, 0x8016, 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}, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4}, + }, + }, + { "Comtrol RocketPort 550/16 part B", + { PCI_VENDOR_COMTROL, 0x8017, 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}, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4}, + { PUC_PORT_TYPE_COM, 0x10, 0x20, COM_FREQ * 4}, + { PUC_PORT_TYPE_COM, 0x10, 0x28, COM_FREQ * 4}, + { PUC_PORT_TYPE_COM, 0x10, 0x30, COM_FREQ * 4}, + { PUC_PORT_TYPE_COM, 0x10, 0x38, COM_FREQ * 4}, + { PUC_PORT_TYPE_COM, 0x10, 0x40, COM_FREQ * 4}, + { PUC_PORT_TYPE_COM, 0x10, 0x48, COM_FREQ * 4}, + { PUC_PORT_TYPE_COM, 0x10, 0x50, COM_FREQ * 4}, + { PUC_PORT_TYPE_COM, 0x10, 0x58, COM_FREQ * 4}, + }, + }, + { "Comtrol RocketPort 550/8 part A", + { PCI_VENDOR_COMTROL, 0x8018, 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}, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4}, + }, + }, + { "Comtrol RocketPort 550/8 part B", + { PCI_VENDOR_COMTROL, 0x8019, 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}, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4}, + }, + }, + + /* * Decision PCCOM PCI series. PLX 9052 with 1 or 2 16554 UARTS */ /* Decision Computer Inc PCCOM 2 Port RS232/422/485: 2S */ @@ -361,6 +473,26 @@ }, }, + /* Lava Computers 2SP-PCI and Quattro-PCI serial ports */ + { "Lava Computers Quattro A", + { PCI_VENDOR_LAVA, 0x0101, 0, 0 }, + { 0xffff, 0xfffc, 0, 0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, + }, + }, + + /* Lava Computers 2SP-PCI and Quattro-PCI serial ports */ + { "Lava Computers Quattro B", + { PCI_VENDOR_LAVA, 0x0102, 0, 0 }, + { 0xffff, 0xfffc, 0, 0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, + }, + }, + /* Lava Computers DSerial PCI serial ports */ { "Lava Computers serial port", { PCI_VENDOR_LAVA, 0x0110, 0, 0 }, @@ -371,7 +503,7 @@ }, /* Lava Computers Quattro-PCI serial ports */ - { "Lava Quattro-PCI 4-port serial", + { "Lava Quattro-PCI A 4-port serial", { PCI_VENDOR_LAVA, 0x0120, 0, 0 }, { 0xffff, 0xfffc, 0, 0 }, { @@ -380,6 +512,16 @@ }, }, + /* Lava Computers Quattro-PCI serial ports */ + { "Lava Quattro-PCI B 4-port serial", + { PCI_VENDOR_LAVA, 0x0121, 0, 0 }, + { 0xffff, 0xfffc, 0, 0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, + }, + }, + /* Lava Computers Octopus-550 serial ports */ { "Lava Computers Octopus-550 8-port serial", { PCI_VENDOR_LAVA, 0x0180, 0, 0 }, @@ -392,6 +534,18 @@ }, }, + /* Lava Computers Octopus-550 serial ports */ + { "Lava Computers Octopus-550 B 8-port serial", + { PCI_VENDOR_LAVA, 0x0181, 0, 0 }, + { 0xffff, 0xfffc, 0, 0 }, + { + { 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 }, + }, + }, + /* Actiontec 56K PCI Master */ { "Actiontec 56K PCI Master", { PCI_VENDOR_LUCENT, 0x0480, 0x0, 0x0 }, @@ -688,7 +842,28 @@ }, }, - /* NetMos 6S PCI NM9865 : 4S */ + /* NetMos 2S PCI NM9865 : 2S */ + { "NetMos NM9865 2 UART", + { PCI_VENDOR_NETMOS, 0x9865, 0xa000, 0x3002 }, + { 0xffff, 0xffff, 0xffff, 0xffff }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, + }, + }, + + /* NetMos 3S PCI NM9865 : 3S */ + { "NetMos NM9865 3 UART", + { PCI_VENDOR_NETMOS, 0x9865, 0xa000, 0x3003 }, + { 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 }, + }, + }, + + /* NetMos 4S PCI NM9865 : 4S */ { "NetMos NM9865 4 UART", { PCI_VENDOR_NETMOS, 0x9865, 0xa000, 0x3004 }, { 0xffff, 0xffff, 0xffff, 0xffff }, @@ -700,6 +875,37 @@ }, }, + /* NetMos PCI NM9865 : 1S 1P */ + { "NetMos NM9865 Single UART and Single LPT", + { PCI_VENDOR_NETMOS, 0x9865, 0xa000, 0x3011 }, + { 0xffff, 0xffff, 0xffff, 0xffff }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 }, + }, + }, + + /* NetMos PCI NM9865 : 2S 1P */ + { "NetMos NM9865 Dual UART and Single LPT", + { PCI_VENDOR_NETMOS, 0x9865, 0xa000, 0x3012 }, + { 0xffff, 0xffff, 0xffff, 0xffff }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_LPT, 0x18, 0x00, 0x00 }, + }, + }, + + /* NetMos PCI NM9865 : 2P */ + { "NetMos NM9865 Dual LPT", + { PCI_VENDOR_NETMOS, 0x9865, 0xa000, 0x3020 }, + { 0xffff, 0xffff, 0xffff, 0xffff }, + { + { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 }, + }, + }, + /* NetMos PCIe Peripheral Controller :UART part */ { "NetMos NM9901 UART", { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9901, 0xa000, 0x1000 }, @@ -1797,6 +2003,16 @@ }, }, + /* VScom PCI-200Li */ + { "VScom PCI-200Li", + { PCI_VENDOR_TITAN, PCI_PRODUCT_TITAN_VSCOM_PCI200LI, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_COM, 0x20, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x20, 0x08, COM_FREQ }, + }, + }, + /* PCI-400L: VendorID is reported to be 0x10d2 instead of 0x14d2. */ { "VScom PCI-400L", { PCI_VENDOR_MOLEX, PCI_PRODUCT_MOLEX_VSCOM_PCI400L, 0, 0 }, Index: src/sys/dev/pci/pucvar.h diff -u src/sys/dev/pci/pucvar.h:1.8 src/sys/dev/pci/pucvar.h:1.9 --- src/sys/dev/pci/pucvar.h:1.8 Sun Dec 11 12:22:50 2005 +++ src/sys/dev/pci/pucvar.h Sun Aug 1 18:50:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pucvar.h,v 1.8 2005/12/11 12:22:50 christos Exp $ */ +/* $NetBSD: pucvar.h,v 1.9 2010/08/01 18:50:24 msaitoh Exp $ */ /* * Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved. @@ -37,7 +37,7 @@ * Author: Christopher G. Demetriou, May 14, 1998. */ -#define PUC_MAX_PORTS 8 +#define PUC_MAX_PORTS 16 struct puc_device_description { const char *name;