Fri Oct 16 06:32:37 2009 UTC ()
Pull up following revision(s) (requested by tsutsui in ticket #1070):
	sys/dev/pci/pucdata.c: revision 1.57
Add support for Oxford Semiconductor OXmPCI952 2 port UARTs.
Also update URL of Oxford UART chips.


(snj)
diff -r1.55 -r1.55.4.1 src/sys/dev/pci/pucdata.c
cvs diff -r1.55 -r1.55.4.1 src/sys/dev/pci/pucdata.c (expand / switch to unified diff)

--- src/sys/dev/pci/pucdata.c 2008/09/06 22:36:40 1.55
+++ src/sys/dev/pci/pucdata.c 2009/10/16 06:32:37 1.55.4.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pucdata.c,v 1.55 2008/09/06 22:36:40 rmind Exp $ */ 1/* $NetBSD: pucdata.c,v 1.55.4.1 2009/10/16 06:32:37 snj Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved. 4 * Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 3. All advertising materials mentioning features or use of this software 14 * 3. All advertising materials mentioning features or use of this software
@@ -26,27 +26,27 @@ @@ -26,27 +26,27 @@
26 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 26 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 */ 31 */
32 32
33/* 33/*
34 * PCI "universal" communications card driver configuration data (used to 34 * PCI "universal" communications card driver configuration data (used to
35 * match/attach the cards). 35 * match/attach the cards).
36 */ 36 */
37 37
38#include <sys/cdefs.h> 38#include <sys/cdefs.h>
39__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.55 2008/09/06 22:36:40 rmind Exp $"); 39__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.55.4.1 2009/10/16 06:32:37 snj Exp $");
40 40
41#include <sys/param.h> 41#include <sys/param.h>
42#include <sys/systm.h> 42#include <sys/systm.h>
43#include <sys/device.h> 43#include <sys/device.h>
44 44
45#include <dev/pci/pcidevs.h> 45#include <dev/pci/pcidevs.h>
46#include <dev/pci/pcireg.h> 46#include <dev/pci/pcireg.h>
47#include <dev/pci/pcivar.h> 47#include <dev/pci/pcivar.h>
48#include <dev/pci/pucvar.h> 48#include <dev/pci/pucvar.h>
49#include <dev/ic/comreg.h> 49#include <dev/ic/comreg.h>
50 50
51const struct puc_device_description puc_devices[] = { 51const struct puc_device_description puc_devices[] = {
52 /* 52 /*
@@ -884,32 +884,42 @@ const struct puc_device_description puc_ @@ -884,32 +884,42 @@ const struct puc_device_description puc_
884 /* Actiontec 56K PCI Master */ 884 /* Actiontec 56K PCI Master */
885 { "Actiontec 56K PCI Master", 885 { "Actiontec 56K PCI Master",
886 { 0x11c1, 0x0480, 0x0, 0x0 }, 886 { 0x11c1, 0x0480, 0x0, 0x0 },
887 { 0xffff, 0xffff, 0x0, 0x0 }, 887 { 0xffff, 0xffff, 0x0, 0x0 },
888 { 888 {
889 { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, 889 { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
890 }, 890 },
891 }, 891 },
892 892
893 /* 893 /*
894 * Boards with an Oxford Semiconductor chip. 894 * Boards with an Oxford Semiconductor chip.
895 * 895 *
896 * Oxford Semiconductor provides documentation for their chip at: 896 * Oxford Semiconductor provides documentation for their chip at:
897 * <URL:http://www.oxsemi.com/products/uarts/index.html> 897 * <URL:http://www.plxtech.com/products/uart>
898 * 898 *
899 * As sold by Kouwell <URL:http://www.kouwell.com/>. 899 * As sold by Kouwell <URL:http://www.kouwell.com/>.
900 * I/O Flex PCI I/O Card Model-223 with 4 serial and 1 parallel ports. 900 * I/O Flex PCI I/O Card Model-223 with 4 serial and 1 parallel ports.
901 */ 901 */
902 902
 903 /* Oxford Semiconductor OXmPCI952 PCI UARTs */
 904 { "Oxford Semiconductor OXmPCI952 UARTs",
 905 { 0x1415, 0x950a, 0, 0 },
 906 { 0xffff, 0xffff, 0, 0 },
 907 {
 908 { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 10 },
 909 { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 10 },
 910 },
 911 },
 912
903 /* Oxford Semiconductor OX16PCI952 PCI `950 UARTs - 128 byte FIFOs */ 913 /* Oxford Semiconductor OX16PCI952 PCI `950 UARTs - 128 byte FIFOs */
904 { "Oxford Semiconductor OX16PCI952 UARTs", 914 { "Oxford Semiconductor OX16PCI952 UARTs",
905 { 0x1415, 0x9521, 0, 0 }, 915 { 0x1415, 0x9521, 0, 0 },
906 { 0xffff, 0xffff, 0, 0 }, 916 { 0xffff, 0xffff, 0, 0 },
907 { 917 {
908 { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, 918 { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
909 { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, 919 { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
910 }, 920 },
911 }, 921 },
912 922
913 /* Oxford Semiconductor OX16PCI952 PCI Parallel port */ 923 /* Oxford Semiconductor OX16PCI952 PCI Parallel port */
914 { "Oxford Semiconductor OX16PCI952 Parallel port", 924 { "Oxford Semiconductor OX16PCI952 Parallel port",
915 { 0x1415, 0x9523, 0, 0 }, 925 { 0x1415, 0x9523, 0, 0 },