[src/trunk]: src - Fix a table for Advantech PCI-1620

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9a16a6a4ce88
branches:  trunk
changeset: 756180:9a16a6a4ce88
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Jul 08 08:49:54 2010 +0000

description:
- Fix a table for Advantech PCI-1620
- Add entry for PCI-1610 and PCI-1612

diffstat:

 share/man/man4/puc.4  |   6 ++++--
 sys/dev/pci/pucdata.c |  46 ++++++++++++++++++++++++++++++++++++----------
 2 files changed, 40 insertions(+), 12 deletions(-)

diffs (94 lines):

diff -r d8bdfb829e7f -r 9a16a6a4ce88 share/man/man4/puc.4
--- a/share/man/man4/puc.4      Thu Jul 08 08:47:04 2010 +0000
+++ b/share/man/man4/puc.4      Thu Jul 08 08:49:54 2010 +0000
@@ -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)"
diff -r d8bdfb829e7f -r 9a16a6a4ce88 sys/dev/pci/pucdata.c
--- a/sys/dev/pci/pucdata.c     Thu Jul 08 08:47:04 2010 +0000
+++ b/sys/dev/pci/pucdata.c     Thu Jul 08 08:49:54 2010 +0000
@@ -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 },