[src/trunk]: src - Fix an entry for CP-168EL-A/PCIe reported by Ryo SHIMIZU.

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

details:   https://anonhg.NetBSD.org/src/rev/c375cd42239a
branches:  trunk
changeset: 756185:c375cd42239a
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Jul 08 12:09:31 2010 +0000

description:
- Fix an entry for CP-168EL-A/PCIe reported by Ryo SHIMIZU.
- Add an entry for NetMos NM9901 UART. Tested my own NM9901 card.

diffstat:

 share/man/man4/puc.4  |   4 ++--
 sys/dev/pci/pucdata.c |  35 ++++++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 15 deletions(-)

diffs (91 lines):

diff -r 2c025128d92b -r c375cd42239a share/man/man4/puc.4
--- a/share/man/man4/puc.4      Thu Jul 08 11:39:58 2010 +0000
+++ b/share/man/man4/puc.4      Thu Jul 08 12:09:31 2010 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: puc.4,v 1.28 2010/07/08 08:49:55 msaitoh Exp $
+.\" $NetBSD: puc.4,v 1.29 2010/07/08 12:09:31 msaitoh Exp $
 .\"
 .\" Copyright (c) 1998 Christopher G. Demetriou
 .\" All rights reserved.
@@ -91,7 +91,7 @@
 .It Tn "Lava Computers dual serial"
 .It Tn "Middle Digital, Inc. Weasel serial port"
 .It Tn "Moxa Technologies SmartIO C104H/PCI (4 port serial)"
-.It Tn "Moxa Technologies SmartIO C168EL-A/PCI (8 port serial)"
+.It Tn "Moxa Technologies SmartIO C168EL-A/PCIe (8 port serial)"
 .It Tn "Moxa Technologies SmartIO C168EL/PCIe (8 port serial)"
 .It Tn "Moxa Technologies SmartIO C168H/PCI (8 port serial)"
 .It Tn "Moxa Technologies SmartIO C168U/PCI (8 port serial)"
diff -r 2c025128d92b -r c375cd42239a sys/dev/pci/pucdata.c
--- a/sys/dev/pci/pucdata.c     Thu Jul 08 11:39:58 2010 +0000
+++ b/sys/dev/pci/pucdata.c     Thu Jul 08 12:09:31 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pucdata.c,v 1.64 2010/07/08 08:49:54 msaitoh Exp $     */
+/*     $NetBSD: pucdata.c,v 1.65 2010/07/08 12:09:31 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.64 2010/07/08 08:49:54 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.65 2010/07/08 12:09:31 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -473,7 +473,7 @@
            },
        },
 
-       /* Moxa Technologies Co., Ltd. PCI I/O Card 8S RS232 */
+       /* Moxa Technologies Co., Ltd. PCI-Express I/O Card 8S RS232 */
        {   "Moxa Technologies, SmartIO C168EL/PCIe",
            {   PCI_VENDOR_MOXA,        0x1682, 0,      0       },
            {   0xffff, 0xffff, 0,      0       },
@@ -488,19 +488,19 @@
                { PUC_PORT_TYPE_COM, 0x18, 0x38, COM_FREQ * 8 },
            },
        },
-       /* Moxa Technologies Co., Ltd. PCI I/O Card 8S RS232 */
-       {   "Moxa Technologies, SmartIO C168EL-A/PCI",
+       /* Moxa Technologies Co., Ltd. PCI-Express I/O Card 8S RS232 */
+       {   "Moxa Technologies, SmartIO CP-168EL-A/PCIe",
            {   PCI_VENDOR_MOXA,        0x1683, 0,      0       },
            {   0xffff, 0xffff, 0,      0       },
            {
-               { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ * 8 },
-               { PUC_PORT_TYPE_COM, 0x18, 0x08, COM_FREQ * 8 },
-               { PUC_PORT_TYPE_COM, 0x18, 0x10, COM_FREQ * 8 },
-               { PUC_PORT_TYPE_COM, 0x18, 0x18, COM_FREQ * 8 },
-               { PUC_PORT_TYPE_COM, 0x18, 0x20, COM_FREQ * 8 },
-               { PUC_PORT_TYPE_COM, 0x18, 0x28, COM_FREQ * 8 },
-               { PUC_PORT_TYPE_COM, 0x18, 0x30, COM_FREQ * 8 },
-               { PUC_PORT_TYPE_COM, 0x18, 0x38, COM_FREQ * 8 },
+               { PUC_PORT_TYPE_COM, 0x14, 0x000, COM_FREQ * 8 },
+               { PUC_PORT_TYPE_COM, 0x14, 0x200, COM_FREQ * 8 },
+               { PUC_PORT_TYPE_COM, 0x14, 0x400, COM_FREQ * 8 },
+               { PUC_PORT_TYPE_COM, 0x14, 0x600, COM_FREQ * 8 },
+               { PUC_PORT_TYPE_COM, 0x14, 0x800, COM_FREQ * 8 },
+               { PUC_PORT_TYPE_COM, 0x14, 0xa00, COM_FREQ * 8 },
+               { PUC_PORT_TYPE_COM, 0x14, 0xc00, COM_FREQ * 8 },
+               { PUC_PORT_TYPE_COM, 0x14, 0xe00, COM_FREQ * 8 },
            },
        },
 
@@ -658,6 +658,15 @@
            },
        },
 
+       /* NetMos PCIe Peripheral Controller :UART part */
+       {   "NetMos NM9901 UART",
+           {   PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9901, 0xa000, 0x1000 },
+           {   0xffff, 0xffff,                               0xffff, 0xffff },
+           {
+               { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+           },
+       },
+
        /* NetMos PCIe NM9901 : 1P */
        {   "NetMos NM9901 LPT",
            {   PCI_VENDOR_NETMOS,      0x9901, 0xa000, 0x2000  },