summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2003-12-09 23:06:57 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2003-12-09 23:06:57 +0000
commit82d8055eaacfb8532f08689af27fb66f766054fd (patch)
tree4c58f9422dfe3b39c289c8f267f86227cd78f784
parent03b155216fb017760f73850b45255dc8dc538419 (diff)
new moxa puc
-rw-r--r--share/man/man4/puc.43
-rw-r--r--sys/dev/pci/pcidevs3
-rw-r--r--sys/dev/pci/pucdata.c14
3 files changed, 17 insertions, 3 deletions
diff --git a/share/man/man4/puc.4 b/share/man/man4/puc.4
index 98fce00e198..78bd2dac441 100644
--- a/share/man/man4/puc.4
+++ b/share/man/man4/puc.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: puc.4,v 1.18 2003/07/09 13:26:20 jmc Exp $
+.\" $OpenBSD: puc.4,v 1.19 2003/12/09 23:06:56 deraadt Exp $
.\" $NetBSD: puc.4,v 1.7 1999/07/03 05:55:23 cgd Exp $
.\"
.\" Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -97,6 +97,7 @@ The driver currently supports the following cards:
.It Tn "Syba Tech Ltd. PCI-4S2P-550-ECP (4 port serial and 2 port parallel)"
.It Tn "Moxa Technologies Co., Ltd. PCI I/O Card 4S (4 port serial)"
.It Tn "Moxa Technologies Co., Ltd. C104H/PCI (4 port serial)"
+.It Tn "Moxa Technologies Co., Ltd. CP104/PCI (4 port serial)"
.It Tn "NetMos 2S1P (2 port serial and 1 port parallel)"
.It Tn "Boca Research Turbo Serial 654 (4 port serial)"
.It Tn "Boca Research Turbo Serial 658 (8 port serial)"
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index ce746722886..fd024308fd2 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
- $OpenBSD: pcidevs,v 1.694 2003/12/09 19:21:04 henning Exp $
+$OpenBSD: pcidevs,v 1.695 2003/12/09 23:06:56 deraadt Exp $
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
/*
@@ -1502,6 +1502,7 @@ product MOT RAVEN 0x4801 Raven Host-PCI
/* Moxa */
product MOXA CP114 0x1141 CP-114
product MOXA C104H 0x1040 C104H
+product MOXA CP104 0x1041 CP-104UL
product MOXA C168H 0x1680 C168H
/* Mesa Ridge Technologies (MAGMA) */
diff --git a/sys/dev/pci/pucdata.c b/sys/dev/pci/pucdata.c
index 6e80669afcd..7f9d72d1cc1 100644
--- a/sys/dev/pci/pucdata.c
+++ b/sys/dev/pci/pucdata.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pucdata.c,v 1.30 2003/08/06 22:07:37 deraadt Exp $ */
+/* $OpenBSD: pucdata.c,v 1.31 2003/12/09 23:06:56 deraadt Exp $ */
/* $NetBSD: pucdata.c,v 1.6 1999/07/03 05:55:23 cgd Exp $ */
/*
@@ -906,6 +906,18 @@ const struct puc_device_description puc_devices[] = {
},
},
+ /* Moxa Technologies Co., Ltd. PCI I/O Card 4S RS232 */
+ { /* "Moxa Technologies, SmartIO CP104/PCI" */
+ { PCI_VENDOR_MOXA, PCI_PRODUCT_MOXA_CP104, 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 },
+ },
+ },
+
/* Moxa Technologies Co., Ltd. PCI I/O Card 8S RS232 */
{ /* "Moxa Technologies, Industio C168H" */
{ PCI_VENDOR_MOXA, PCI_PRODUCT_MOXA_C168H, 0, 0 },