summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorriz <riz@NetBSD.org>2008-04-03 20:45:08 +0000
committerriz <riz@NetBSD.org>2008-04-03 20:45:08 +0000
commitf0643af2a08eb3eb7e4c5e7d445758620d39a99a (patch)
tree384a10e9c557512b1a7afa46c26dc78d45c03aba
parent791e9731ab1c834db26cb6fadc579d6ea8571e5b (diff)
Support for Digi International 4 and 8 port boards, from OpenBSD.
XXX need to convert the rest of the PCI vendor/product IDs to macros
-rw-r--r--share/man/man4/puc.46
-rw-r--r--sys/dev/pci/pucdata.c33
2 files changed, 35 insertions, 4 deletions
diff --git a/share/man/man4/puc.4 b/share/man/man4/puc.4
index b15691b182a..8195ac97395 100644
--- a/share/man/man4/puc.4
+++ b/share/man/man4/puc.4
@@ -1,4 +1,4 @@
-.\" $NetBSD: puc.4,v 1.21 2007/06/04 11:08:36 jnemeth Exp $
+.\" $NetBSD: puc.4,v 1.22 2008/04/03 20:45:08 riz Exp $
.\"
.\" Copyright (c) 1998 Christopher G. Demetriou
.\" All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
.\"
-.Dd June 4, 2007
+.Dd April 2, 2008
.Dt PUC 4
.Os
.Sh NAME
@@ -100,6 +100,8 @@ The driver currently supports the following cards:
.It Tn "EXAR XR17D152 (2-port serial)"
.It Tn "EXAR XR17D154 (4-port serial)"
.It Tn "EXAR XR17D158 (8-port serial)"
+.It Tn "Digi International Digi Neo 4 (4-port serial)"
+.It Tn "Digi International Digi Neo 8 (8-port serial)"
.El
.Pp
The driver does not support the cards:
diff --git a/sys/dev/pci/pucdata.c b/sys/dev/pci/pucdata.c
index 1736825f303..d68aac8af47 100644
--- a/sys/dev/pci/pucdata.c
+++ b/sys/dev/pci/pucdata.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.53 2008/02/22 14:51:38 tsutsui Exp $ */
+/* $NetBSD: pucdata.c,v 1.54 2008/04/03 20:45:08 riz Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,12 +36,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.53 2008/02/22 14:51:38 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.54 2008/04/03 20:45:08 riz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
+#include <dev/pci/pcidevs.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pucvar.h>
@@ -1281,6 +1282,34 @@ const struct puc_device_description puc_devices[] = {
{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
},
},
+
+ /* Digi International Digi Neo 4 Serial */
+ { "Digi International Digi Neo 4 Serial",
+ { PCI_VENDOR_DIGI, PCI_PRODUCT_DIGI_NEO4, 0, 0 },
+ { 0xffff, 0xffff, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x0000, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x0200, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x0400, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x0600, COM_FREQ * 8 },
+ },
+ },
+
+ /* Digi International Digi Neo 8 Serial */
+ { "Digi International Digi Neo 8 Serial",
+ { PCI_VENDOR_DIGI, PCI_PRODUCT_DIGI_NEO8, 0, 0 },
+ { 0xffff, 0xffff, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x0000, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x0200, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x0400, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x0600, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x0800, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x0a00, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x0c00, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x0e00, COM_FREQ * 8 },
+ },
+ },
{ .name = NULL },
};