Module Name: src
Committed By: dyoung
Date: Tue Aug 9 21:04:06 UTC 2011
Modified Files:
src/share/man/man4: puc.4
src/sys/dev/pci: pucdata.c
Log Message:
Add support for the Oxford Semiconductor OXPCIe952, a 2-port serial chip
with a PCI Express interface, in legacy mode. Cursorily tested with a
StarTech PEX2S952LP.
See the manual for your adapter to see how to put it into legacy mode.
There is also a "native" mode that uses a different clock multiplier
and (I think) provides a richer feature set, but also requires a bit of
additional initialization (see FreeBSD's puc(4)).
The native-mode PCI functions use different PCI Device IDs than the
legacy-mode functions.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/share/man/man4/puc.4
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/pci/pucdata.c
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.34 src/share/man/man4/puc.4:1.35
--- src/share/man/man4/puc.4:1.34 Sat May 28 11:12:22 2011
+++ src/share/man/man4/puc.4 Tue Aug 9 21:04:06 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: puc.4,v 1.34 2011/05/28 11:12:22 ryo Exp $
+.\" $NetBSD: puc.4,v 1.35 2011/08/09 21:04:06 dyoung 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 August 1, 2010
+.Dd August 9, 2011
.Dt PUC 4
.Os
.Sh NAME
@@ -127,6 +127,7 @@
.It Tn "Oxford Semiconductor OX16PCI952 (dual serial and single parallel)"
.It Tn "Oxford Semiconductor OX16PCI954 (4 port serial)"
.It Tn "Oxford Semiconductor OX16PCI958 (8 port serial)"
+.It Tn "Oxford Semiconductor OXPCIe952 (2 port serial, legacy mode)"
.It Tn "Oxford Semiconductor OXmPCI952 (2 port serial)"
.It Tn "Perle Systems PCI-RAS 4 modem ports"
.It Tn "Perle Systems PCI-RAS 8 modem ports"
Index: src/sys/dev/pci/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.75 src/sys/dev/pci/pucdata.c:1.76
--- src/sys/dev/pci/pucdata.c:1.75 Sat May 28 10:48:51 2011
+++ src/sys/dev/pci/pucdata.c Tue Aug 9 21:04:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.75 2011/05/28 10:48:51 ryo Exp $ */
+/* $NetBSD: pucdata.c,v 1.76 2011/08/09 21:04:05 dyoung 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.75 2011/05/28 10:48:51 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.76 2011/08/09 21:04:05 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -972,6 +972,15 @@
* I/O Flex PCI I/O Card Model-223 with 4 serial and 1 parallel ports.
*/
+ /* Oxford Semiconductor OXPCIe952 PCIe UARTs */
+ { "Oxford Semiconductor OXPCIe952 UARTs",
+ { PCI_VENDOR_OXFORDSEMI, 0xc120, PCI_VENDOR_OXFORDSEMI, 0xc120 },
+ { 0xffff, 0xffff, 0xffff, 0xffff },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ },
+ },
+
/* Oxford Semiconductor OXmPCI952 PCI UARTs */
{ "Oxford Semiconductor OXmPCI952 UARTs",
{ PCI_VENDOR_OXFORDSEMI, 0x950a, 0, 0 },
