Module Name: src
Committed By: msaitoh
Date: Thu Jul 8 08:49:55 UTC 2010
Modified Files:
src/share/man/man4: puc.4
src/sys/dev/pci: pucdata.c
Log Message:
- Fix a table for Advantech PCI-1620
- Add entry for PCI-1610 and PCI-1612
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/share/man/man4/puc.4
cvs rdiff -u -r1.63 -r1.64 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.27 src/share/man/man4/puc.4:1.28
--- src/share/man/man4/puc.4:1.27 Thu Jul 8 06:13:58 2010
+++ src/share/man/man4/puc.4 Thu Jul 8 08:49:55 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: puc.4,v 1.27 2010/07/08 06:13:58 msaitoh Exp $
+.\" $NetBSD: puc.4,v 1.28 2010/07/08 08:49:55 msaitoh Exp $
.\"
.\" Copyright (c) 1998 Christopher G. Demetriou
.\" All rights reserved.
@@ -63,7 +63,9 @@
.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-1620A-AE (8 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)"
.It Tn "Avlab Technology, Inc. Low Profile PCI 4 Serial (4 port serial)"
.It Tn "Boca Research Turbo Serial 654 (4 port serial)"
.It Tn "Boca Research Turbo Serial 658 (8 port serial)"
Index: src/sys/dev/pci/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.63 src/sys/dev/pci/pucdata.c:1.64
--- src/sys/dev/pci/pucdata.c:1.63 Thu Jul 8 06:12:41 2010
+++ src/sys/dev/pci/pucdata.c Thu Jul 8 08:49:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.63 2010/07/08 06:12:41 msaitoh Exp $ */
+/* $NetBSD: pucdata.c,v 1.64 2010/07/08 08:49:54 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.63 2010/07/08 06:12:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.64 2010/07/08 08:49:54 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,10 +52,10 @@
/*
* Advantech multi serial cards
*/
- { "Advantech PCI-1620A-AE (1-4) UARTs",
- { PCI_VENDOR_ADVANTECH, PCI_PRODUCT_ADVANTECH_PCI1620AAE0,
- 0x0, 0x0 },
- { 0xffff, 0xffff, 0x0, 0x0 },
+ { "Advantech PCI-1610 UARTs",
+ { PCI_VENDOR_ADVANTECH, PCI_PRODUCT_ADVANTECH_PCI1600,
+ PCI_PRODUCT_ADVANTECH_PCI1610, 0x0 },
+ { 0xffff, 0xffff, 0xffff, 0x0 },
{
{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 },
{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 },
@@ -64,10 +64,36 @@
},
},
- { "Advantech PCI-1620A-AE (5-8) UARTs",
- { PCI_VENDOR_ADVANTECH, PCI_PRODUCT_ADVANTECH_PCI1620AAE1,
- 0x0, 0x0 },
- { 0xffff, 0xffff, 0x0, 0x0 },
+ { "Advantech PCI-1612 UARTs",
+ { PCI_VENDOR_ADVANTECH, PCI_PRODUCT_ADVANTECH_PCI1600,
+ PCI_PRODUCT_ADVANTECH_PCI1612, 0x0 },
+ { 0xffff, 0xffff, 0xffff, 0x0 },
+ {
+ { 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 },
+ },
+ },
+
+ /* The use of subvendor ID is bit strange... */
+ { "Advantech PCI-1620 (1-4) UARTs",
+ { PCI_VENDOR_ADVANTECH, PCI_PRODUCT_ADVANTECH_PCI1600,
+ PCI_PRODUCT_ADVANTECH_PCI1620, 0x0 },
+ { 0xffff, 0xffff, 0xffff, 0x0 },
+ {
+ { 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 },
+ },
+ },
+
+ /* The use of subvendor ID is bit strange... */
+ { "Advantech PCI-1620 (5-8) UARTs",
+ { PCI_VENDOR_ADVANTECH, PCI_PRODUCT_ADVANTECH_PCI1620_1,
+ PCI_PRODUCT_ADVANTECH_PCI1620, 0x0 },
+ { 0xffff, 0xffff, 0xffff, 0x0 },
{
{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 },
{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 },
