From nobody@FreeBSD.org  Wed Jan 20 03:29:07 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C98731065670
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 20 Jan 2010 03:29:07 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id B92858FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 20 Jan 2010 03:29:07 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o0K3T79D072224
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 20 Jan 2010 03:29:07 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o0K3T7hI072223;
	Wed, 20 Jan 2010 03:29:07 GMT
	(envelope-from nobody)
Message-Id: <201001200329.o0K3T7hI072223@www.freebsd.org>
Date: Wed, 20 Jan 2010 03:29:07 GMT
From: Takefu Kenji <takefu@airport.fm>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [puc] [patch] add support for the I-O DATA RSA-PCI2/R
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         142999
>Category:       kern
>Synopsis:       [puc] [patch] add support for the I-O DATA RSA-PCI2/R
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    eadler
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 20 03:30:07 UTC 2010
>Closed-Date:    Fri Jan 13 03:50:07 UTC 2012
>Last-Modified:  Fri Jan 13 03:50:07 UTC 2012
>Originator:     Takefu Kenji
>Release:        
>Organization:
FOX Amateur Radio Club
>Environment:
>Description:
RELENG_6
--- sys/dev/puc/pucdata.c.orig	Tue Sep  5 03:52:09 2006
+++ sys/dev/puc/pucdata.c	Tue Oct  9 16:31:00 2007
@@ -876,6 +876,19 @@
 	    },
 	},
 
+	/*
+	 * Oxford Semiconductor OX9160/OX16PCI954 PCI UARTS
+	 * Second chip on I-O DATA RSA-PCI2 cards
+	 */
+	{   "I-O DATA RSA-PCI2/R",
+	    {   0x1415, 0x9501, 0x10fc ,0xc070  },
+	    {   0xffff, 0xffff, 0xffff ,0xffff  },
+	    {
+		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 },
+		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 }
+	    },
+	},
+
 	/* Oxford Semiconductor OX16PCI954 PCI UARTs */
 	{   "Oxford Semiconductor OX16PCI954 UARTs",
 	    {	0x1415,	0x9501,	0,	0	},

RELENG_7 and RELENG_8
--- sys/dev/puc/pucdata.c.orig	2008-11-25 11:59:29.000000000 +0900
+++ sys/dev/puc/pucdata.c	2009-02-26 16:40:38.000000000 +0900
@@ -595,6 +595,11 @@
 	 * As sold by Kouwell <URL:http://www.kouwell.com/>.
 	 * I/O Flex PCI I/O Card Model-223 with 4 serial and 1 parallel ports.
 	 */
+	{   0x1415, 0x9501, 0x10fc ,0xc070,
+	    "I-O DATA RSA-PCI2/R",
+	    DEFAULT_RCLK * 8,
+	    PUC_PORT_2S, 0x10, 0, 8,
+	},
 
 	{   0x1415, 0x9501, 0x131f, 0x2050,
 	    "SIIG Cyber 4 PCI 16550",

>How-To-Repeat:

>Fix:


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->patched 
State-Changed-By: eadler 
State-Changed-When: Sat Oct 15 21:06:53 UTC 2011 
State-Changed-Why:  
committed in head 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142999 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/142999: commit references a PR
Date: Sat, 15 Oct 2011 21:06:17 +0000 (UTC)

 Author: eadler (ports committer)
 Date: Sat Oct 15 21:06:08 2011
 New Revision: 226404
 URL: http://svn.freebsd.org/changeset/base/226404
 
 Log:
   - add support for I-O DATA RSA-PCI2/R
   
   PR:		kern/142999
   Submitted by:	Takefu Kenji <takefu@airport.fm>
   Approved by:	jhb
   Approved by:	sahil (mentor)
   MFC after:	1 week
 
 Modified:
   head/sys/dev/puc/pucdata.c
 
 Modified: head/sys/dev/puc/pucdata.c
 ==============================================================================
 --- head/sys/dev/puc/pucdata.c	Sat Oct 15 19:08:22 2011	(r226403)
 +++ head/sys/dev/puc/pucdata.c	Sat Oct 15 21:06:08 2011	(r226404)
 @@ -645,6 +645,12 @@ const struct puc_cfg puc_pci_devices[] =
  	 * As sold by Kouwell <URL:http://www.kouwell.com/>.
  	 * I/O Flex PCI I/O Card Model-223 with 4 serial and 1 parallel ports.
  	 */
 +	{
 +		0x1415, 0x9501, 0x10fc ,0xc070,
 +		"I-O DATA RSA-PCI2/R",
 +		DEFAULT_RCLK * 8,
 +		PUC_PORT_2S, 0x10, 0, 8,
 +	},
  
  	{   0x1415, 0x9501, 0x131f, 0x2050,
  	    "SIIG Cyber 4 PCI 16550",
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
Responsible-Changed-From-To: freebsd-bugs->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Sat Oct 15 21:40:23 UTC 2011 
Responsible-Changed-Why:  
I nagged, now I have to to take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142999 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/142999: commit references a PR
Date: Wed, 16 Nov 2011 16:28:13 +0000 (UTC)

 Author: eadler (ports committer)
 Date: Wed Nov 16 16:27:53 2011
 New Revision: 227565
 URL: http://svn.freebsd.org/changeset/base/227565
 
 Log:
   MFC r226404:
   
   - add support for I-O DATA RSA-PCI2/R
   
   PR:		kern/142999
   Submitted by:	Takefu Kenji <takefu@airport.fm>
   Approved by:	jhb
   Approved by:	re (kib)
 
 Modified:
   stable/9/sys/dev/puc/pucdata.c
 Directory Properties:
   stable/9/sys/   (props changed)
 
 Modified: stable/9/sys/dev/puc/pucdata.c
 ==============================================================================
 --- stable/9/sys/dev/puc/pucdata.c	Wed Nov 16 16:24:36 2011	(r227564)
 +++ stable/9/sys/dev/puc/pucdata.c	Wed Nov 16 16:27:53 2011	(r227565)
 @@ -51,6 +51,7 @@ static puc_config_f puc_config_amc;
  static puc_config_f puc_config_diva;
  static puc_config_f puc_config_exar;
  static puc_config_f puc_config_icbook;
 +static puc_config_f puc_config_moxa;
  static puc_config_f puc_config_oxford_pcie;
  static puc_config_f puc_config_quatech;
  static puc_config_f puc_config_syba;
 @@ -518,12 +519,25 @@ const struct puc_cfg puc_pci_devices[] =
  	    PUC_PORT_4S, 0x18, 0, 8,
  	},
  
 +	{   0x1393, 0x1042, 0xffff, 0,
 +	    "Moxa Technologies, Smartio CP-104JU/PCI",
 +	    DEFAULT_RCLK * 8,
 +	    PUC_PORT_4S, 0x18, 0, 8,
 +	},
 +
  	{   0x1393, 0x1043, 0xffff, 0,
  	    "Moxa Technologies, Smartio CP-104EL/PCIe",
  	    DEFAULT_RCLK * 8,
  	    PUC_PORT_4S, 0x18, 0, 8,
  	},
  
 +	{   0x1393, 0x1045, 0xffff, 0,
 +	    "Moxa Technologies, Smartio CP-104EL-A/PCIe",
 +	    DEFAULT_RCLK * 8,
 +	    PUC_PORT_4S, 0x14, 0, -1,
 +		.config_function = puc_config_moxa
 +	},
 +
  	{   0x1393, 0x1120, 0xffff, 0,
  	    "Moxa Technologies, CP-112UL",
  	    DEFAULT_RCLK * 8,
 @@ -645,6 +659,12 @@ const struct puc_cfg puc_pci_devices[] =
  	 * As sold by Kouwell <URL:http://www.kouwell.com/>.
  	 * I/O Flex PCI I/O Card Model-223 with 4 serial and 1 parallel ports.
  	 */
 +	{
 +		0x1415, 0x9501, 0x10fc ,0xc070,
 +		"I-O DATA RSA-PCI2/R",
 +		DEFAULT_RCLK * 8,
 +		PUC_PORT_2S, 0x10, 0, 8,
 +	},
  
  	{   0x1415, 0x9501, 0x131f, 0x2050,
  	    "SIIG Cyber 4 PCI 16550",
 @@ -1080,6 +1100,19 @@ puc_config_icbook(struct puc_softc *sc, 
  }
  
  static int
 +puc_config_moxa(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
 +    intptr_t *res)
 +{
 +	const struct puc_cfg *cfg = sc->sc_cfg;
 +	
 +	if (cmd == PUC_CFG_GET_OFS && cfg->device == 0x1045) {
 +		*res = ((port == 3) ? 7 : port) * 0x200;
 +		return 0;
 +	}
 +	return (ENXIO);
 +}
 +
 +static int
  puc_config_quatech(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
      intptr_t *res)
  {
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/142999: commit references a PR
Date: Wed, 16 Nov 2011 16:29:14 +0000 (UTC)

 Author: eadler (ports committer)
 Date: Wed Nov 16 16:29:05 2011
 New Revision: 227566
 URL: http://svn.freebsd.org/changeset/base/227566
 
 Log:
   MFC r226404:
   
   - add support for I-O DATA RSA-PCI2/R
   
   PR:		kern/142999
   Submitted by:	Takefu Kenji <takefu@airport.fm>
   Approved by:	jhb
   Approved by:	re (kib)
 
 Modified:
   releng/9.0/sys/dev/puc/pucdata.c
 Directory Properties:
   releng/9.0/sys/   (props changed)
 
 Modified: releng/9.0/sys/dev/puc/pucdata.c
 ==============================================================================
 --- releng/9.0/sys/dev/puc/pucdata.c	Wed Nov 16 16:27:53 2011	(r227565)
 +++ releng/9.0/sys/dev/puc/pucdata.c	Wed Nov 16 16:29:05 2011	(r227566)
 @@ -51,6 +51,7 @@ static puc_config_f puc_config_amc;
  static puc_config_f puc_config_diva;
  static puc_config_f puc_config_exar;
  static puc_config_f puc_config_icbook;
 +static puc_config_f puc_config_moxa;
  static puc_config_f puc_config_oxford_pcie;
  static puc_config_f puc_config_quatech;
  static puc_config_f puc_config_syba;
 @@ -518,12 +519,25 @@ const struct puc_cfg puc_pci_devices[] =
  	    PUC_PORT_4S, 0x18, 0, 8,
  	},
  
 +	{   0x1393, 0x1042, 0xffff, 0,
 +	    "Moxa Technologies, Smartio CP-104JU/PCI",
 +	    DEFAULT_RCLK * 8,
 +	    PUC_PORT_4S, 0x18, 0, 8,
 +	},
 +
  	{   0x1393, 0x1043, 0xffff, 0,
  	    "Moxa Technologies, Smartio CP-104EL/PCIe",
  	    DEFAULT_RCLK * 8,
  	    PUC_PORT_4S, 0x18, 0, 8,
  	},
  
 +	{   0x1393, 0x1045, 0xffff, 0,
 +	    "Moxa Technologies, Smartio CP-104EL-A/PCIe",
 +	    DEFAULT_RCLK * 8,
 +	    PUC_PORT_4S, 0x14, 0, -1,
 +		.config_function = puc_config_moxa
 +	},
 +
  	{   0x1393, 0x1120, 0xffff, 0,
  	    "Moxa Technologies, CP-112UL",
  	    DEFAULT_RCLK * 8,
 @@ -645,6 +659,12 @@ const struct puc_cfg puc_pci_devices[] =
  	 * As sold by Kouwell <URL:http://www.kouwell.com/>.
  	 * I/O Flex PCI I/O Card Model-223 with 4 serial and 1 parallel ports.
  	 */
 +	{
 +		0x1415, 0x9501, 0x10fc ,0xc070,
 +		"I-O DATA RSA-PCI2/R",
 +		DEFAULT_RCLK * 8,
 +		PUC_PORT_2S, 0x10, 0, 8,
 +	},
  
  	{   0x1415, 0x9501, 0x131f, 0x2050,
  	    "SIIG Cyber 4 PCI 16550",
 @@ -1080,6 +1100,19 @@ puc_config_icbook(struct puc_softc *sc, 
  }
  
  static int
 +puc_config_moxa(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
 +    intptr_t *res)
 +{
 +	const struct puc_cfg *cfg = sc->sc_cfg;
 +	
 +	if (cmd == PUC_CFG_GET_OFS && cfg->device == 0x1045) {
 +		*res = ((port == 3) ? 7 : port) * 0x200;
 +		return 0;
 +	}
 +	return (ENXIO);
 +}
 +
 +static int
  puc_config_quatech(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
      intptr_t *res)
  {
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/142999: commit references a PR
Date: Thu, 17 Nov 2011 14:06:08 +0000 (UTC)

 Author: eadler (ports committer)
 Date: Thu Nov 17 14:05:59 2011
 New Revision: 227624
 URL: http://svn.freebsd.org/changeset/base/227624
 
 Log:
   Record the merge of r227457, which was done as part of r227565 but not mentioned in the commit log
   
   PR:		kern/142999
   PR:		kern/151365
   Submitted by:	Takefu Kenji <takefu@airport.fm>
   Submitted by:	Joerg Niendorf <f5d10a@internode.on.net>
   Approved by:	re (kib)
 
 Modified:
 Directory Properties:
   stable/9/sys/   (props changed)
   stable/9/sys/amd64/include/xen/   (props changed)
   stable/9/sys/boot/   (props changed)
   stable/9/sys/boot/i386/efi/   (props changed)
   stable/9/sys/boot/ia64/efi/   (props changed)
   stable/9/sys/boot/ia64/ski/   (props changed)
   stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
   stable/9/sys/boot/powerpc/ofw/   (props changed)
   stable/9/sys/cddl/contrib/opensolaris/   (props changed)
   stable/9/sys/conf/   (props changed)
   stable/9/sys/contrib/dev/acpica/   (props changed)
   stable/9/sys/contrib/octeon-sdk/   (props changed)
   stable/9/sys/contrib/pf/   (props changed)
   stable/9/sys/contrib/x86emu/   (props changed)
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/142999: commit references a PR
Date: Thu, 17 Nov 2011 14:06:53 +0000 (UTC)

 Author: eadler (ports committer)
 Date: Thu Nov 17 14:06:39 2011
 New Revision: 227625
 URL: http://svn.freebsd.org/changeset/base/227625
 
 Log:
   Record the merge of r227457, which was done as part of r227565 but not mentioned in the commit log
   
   PR:		kern/142999
   PR:		kern/151365
   Submitted by:	Takefu Kenji <takefu@airport.fm>
   Submitted by:	Joerg Niendorf <f5d10a@internode.on.net>
   Approved by:	re (kib)
 
 Modified:
 Directory Properties:
   releng/9.0/sys/   (props changed)
   releng/9.0/sys/amd64/include/xen/   (props changed)
   releng/9.0/sys/boot/   (props changed)
   releng/9.0/sys/boot/i386/efi/   (props changed)
   releng/9.0/sys/boot/ia64/efi/   (props changed)
   releng/9.0/sys/boot/ia64/ski/   (props changed)
   releng/9.0/sys/boot/powerpc/boot1.chrp/   (props changed)
   releng/9.0/sys/boot/powerpc/ofw/   (props changed)
   releng/9.0/sys/cddl/contrib/opensolaris/   (props changed)
   releng/9.0/sys/conf/   (props changed)
   releng/9.0/sys/contrib/dev/acpica/   (props changed)
   releng/9.0/sys/contrib/octeon-sdk/   (props changed)
   releng/9.0/sys/contrib/pf/   (props changed)
   releng/9.0/sys/contrib/x86emu/   (props changed)
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/142999: commit references a PR
Date: Tue, 10 Jan 2012 00:19:38 +0000 (UTC)

 Author: eadler (ports committer)
 Date: Tue Jan 10 00:19:18 2012
 New Revision: 229890
 URL: http://svn.freebsd.org/changeset/base/229890
 
 Log:
   MFC 226404:
   	 - add support for I-O DATA RSA-PCI2/R
   
   PR:		kern/142999
   Approved by:	jhb
 
 Modified:
   stable/8/sys/dev/puc/pucdata.c
 Directory Properties:
   stable/8/sys/   (props changed)
 
 Modified: stable/8/sys/dev/puc/pucdata.c
 ==============================================================================
 --- stable/8/sys/dev/puc/pucdata.c	Tue Jan 10 00:03:30 2012	(r229889)
 +++ stable/8/sys/dev/puc/pucdata.c	Tue Jan 10 00:19:18 2012	(r229890)
 @@ -645,6 +645,12 @@ const struct puc_cfg puc_pci_devices[] =
  	 * As sold by Kouwell <URL:http://www.kouwell.com/>.
  	 * I/O Flex PCI I/O Card Model-223 with 4 serial and 1 parallel ports.
  	 */
 +	{
 +		0x1415, 0x9501, 0x10fc ,0xc070,
 +		"I-O DATA RSA-PCI2/R",
 +		DEFAULT_RCLK * 8,
 +		PUC_PORT_2S, 0x10, 0, 8,
 +	},
  
  	{   0x1415, 0x9501, 0x131f, 0x2050,
  	    "SIIG Cyber 4 PCI 16550",
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/142999: commit references a PR
Date: Tue, 10 Jan 2012 00:20:38 +0000 (UTC)

 Author: eadler (ports committer)
 Date: Tue Jan 10 00:20:28 2012
 New Revision: 229891
 URL: http://svn.freebsd.org/changeset/base/229891
 
 Log:
   MFC 226404:
   	 - add support for I-O DATA RSA-PCI2/R
   
   PR:		kern/142999
   Approved by:	jhb
 
 Modified:
   stable/7/sys/dev/puc/pucdata.c
 Directory Properties:
   stable/7/sys/   (props changed)
 
 Modified: stable/7/sys/dev/puc/pucdata.c
 ==============================================================================
 --- stable/7/sys/dev/puc/pucdata.c	Tue Jan 10 00:19:18 2012	(r229890)
 +++ stable/7/sys/dev/puc/pucdata.c	Tue Jan 10 00:20:28 2012	(r229891)
 @@ -601,6 +601,12 @@ const struct puc_cfg puc_pci_devices[] =
  	 * As sold by Kouwell <URL:http://www.kouwell.com/>.
  	 * I/O Flex PCI I/O Card Model-223 with 4 serial and 1 parallel ports.
  	 */
 +	{
 +		0x1415, 0x9501, 0x10fc ,0xc070,
 +		"I-O DATA RSA-PCI2/R",
 +		DEFAULT_RCLK * 8,
 +		PUC_PORT_2S, 0x10, 0, 8,
 +	},
  
  	{   0x1415, 0x9501, 0x131f, 0x2050,
  	    "SIIG Cyber 4 PCI 16550",
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: eadler 
State-Changed-When: Fri Jan 13 03:50:06 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142999 
>Unformatted:
