Module Name: src Committed By: ryo Date: Mon May 4 21:21:39 UTC 2015
Modified Files: src/share/man/man4: puc.4 src/sys/dev/pci: puc.c pucdata.c Log Message: PR/49819: Roberto E. Vargas Caballero: Add support for SystemBase SB16C1050 PCI serial card To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/share/man/man4/puc.4 cvs rdiff -u -r1.37 -r1.38 src/sys/dev/pci/puc.c cvs rdiff -u -r1.94 -r1.95 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.38 src/share/man/man4/puc.4:1.39 --- src/share/man/man4/puc.4:1.38 Fri Oct 26 11:43:43 2012 +++ src/share/man/man4/puc.4 Mon May 4 21:21:38 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: puc.4,v 1.38 2012/10/26 11:43:43 msaitoh Exp $ +.\" $NetBSD: puc.4,v 1.39 2015/05/04 21:21:38 ryo Exp $ .\" .\" Copyright (c) 1998 Christopher G. Demetriou .\" All rights reserved. @@ -165,6 +165,7 @@ The driver currently supports the follow .It Tn "SUNIX 5099 (4 port serial and 1 port parallel)" .It Tn "Syba Tech Ltd. PCI-4S" .It Tn "Syba Tech Ltd. PCI-4S2P-550-ECP" +.It Tn "SystemBase SB16C1050PCI (2 port serial)" .It Tn "SystemBase SB16C1054PCI (4 port serial)" .It Tn "SystemBase SB16C1058PCI (8 port serial)" .It Tn "US Robotics (3Com) 3CP5609 PCI 16550 Modem" Index: src/sys/dev/pci/puc.c diff -u src/sys/dev/pci/puc.c:1.37 src/sys/dev/pci/puc.c:1.38 --- src/sys/dev/pci/puc.c:1.37 Fri Feb 7 11:51:00 2014 +++ src/sys/dev/pci/puc.c Mon May 4 21:21:39 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: puc.c,v 1.37 2014/02/07 11:51:00 msaitoh Exp $ */ +/* $NetBSD: puc.c,v 1.38 2015/05/04 21:21:39 ryo Exp $ */ /* * Copyright (c) 1996, 1998, 1999 @@ -53,7 +53,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: puc.c,v 1.37 2014/02/07 11:51:00 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: puc.c,v 1.38 2015/05/04 21:21:39 ryo Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -236,7 +236,8 @@ puc_attach(device_t parent, device_t sel /* SB16C10xx board specific initialization */ if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_SYSTEMBASE && - (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_SYSTEMBASE_SB16C1054 || + (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_SYSTEMBASE_SB16C1050 || + PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_SYSTEMBASE_SB16C1054 || PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_SYSTEMBASE_SB16C1058)) { if (!sc->sc_bar_mappings[1].mapped) { aprint_error_dev(self, Index: src/sys/dev/pci/pucdata.c diff -u src/sys/dev/pci/pucdata.c:1.94 src/sys/dev/pci/pucdata.c:1.95 --- src/sys/dev/pci/pucdata.c:1.94 Wed Mar 18 05:54:14 2015 +++ src/sys/dev/pci/pucdata.c Mon May 4 21:21:39 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: pucdata.c,v 1.94 2015/03/18 05:54:14 msaitoh Exp $ */ +/* $NetBSD: pucdata.c,v 1.95 2015/05/04 21:21:39 ryo 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.94 2015/03/18 05:54:14 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.95 2015/05/04 21:21:39 ryo Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -2783,6 +2783,16 @@ const struct puc_device_description puc_ }, }, + /* SystemBase SB16C1050 UARTs */ + { "SystemBase SB16C1050", + { PCI_VENDOR_SYSTEMBASE, PCI_PRODUCT_SYSTEMBASE_SB16C1050, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ * 8}, + }, + }, + /* SystemBase SB16C1054 UARTs */ { "SystemBase SB16C1054", { PCI_VENDOR_SYSTEMBASE, PCI_PRODUCT_SYSTEMBASE_SB16C1054, 0, 0 },