Module Name: src
Committed By: christos
Date: Wed Sep 4 17:38:37 UTC 2013
Modified Files:
src/sys/dev/pci: pcidevs pucdata.c
Log Message:
PR/48180: Christian Groessler: Support for Oxford Semi OXuPCI952 dual serial
PCI card
To generate a diff of this commit:
cvs rdiff -u -r1.1160 -r1.1161 src/sys/dev/pci/pcidevs
cvs rdiff -u -r1.85 -r1.86 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/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1160 src/sys/dev/pci/pcidevs:1.1161
--- src/sys/dev/pci/pcidevs:1.1160 Fri Aug 23 12:49:53 2013
+++ src/sys/dev/pci/pcidevs Wed Sep 4 13:38:37 2013
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1160 2013/08/23 16:49:53 christos Exp $
+$NetBSD: pcidevs,v 1.1161 2013/09/04 17:38:37 christos Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -4410,6 +4410,7 @@ product OPTI 82C701 0xc701 82C701
product OXFORDSEMI VSCOM_PCI011H 0x8403 011H
product OXFORDSEMI OX16PCI954 0x9501 OX16PCI954
product OXFORDSEMI OX16PCI954K 0x9504 OX16PCI954K
+product OXFORDSEMI OXUPCI952 0x9505 OXuPCI952
product OXFORDSEMI EXSYS_EX41092 0x950a Exsys EX-41092
product OXFORDSEMI OXCB950 0x950b OXCB950
product OXFORDSEMI OXMPCI954 0x950c OXmPCI954
Index: src/sys/dev/pci/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.85 src/sys/dev/pci/pucdata.c:1.86
--- src/sys/dev/pci/pucdata.c:1.85 Wed Jul 17 15:49:11 2013
+++ src/sys/dev/pci/pucdata.c Wed Sep 4 13:38:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.85 2013/07/17 19:49:11 soren Exp $ */
+/* $NetBSD: pucdata.c,v 1.86 2013/09/04 17:38:37 christos 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.85 2013/07/17 19:49:11 soren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.86 2013/09/04 17:38:37 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1014,6 +1014,17 @@ const struct puc_device_description puc_
},
},
+ /* Oxford Semiconductor OXuPCI952 950 PCI UARTs */
+ { "Oxford Semiconductor OXuPCI952 UARTs",
+ { PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OXUPCI952,
+ 0, 0 },
+ { 0xffff, 0xffff, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ * 8 },
+ },
+ },
+
/* Oxford Semiconductor OX16PCI952 PCI `950 UARTs - 128 byte FIFOs */
{ "Oxford Semiconductor OX16PCI952 UARTs",
{ PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OX16PCI952,