From owner-svn-src-head@FreeBSD.ORG  Thu Mar  5 16:43:33 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CB49F106566B;
	Thu,  5 Mar 2009 16:43:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B7D1D8FC1D;
	Thu,  5 Mar 2009 16:43:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n25GhXEc093051;
	Thu, 5 Mar 2009 16:43:33 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n25GhX0K093049;
	Thu, 5 Mar 2009 16:43:33 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200903051643.n25GhX0K093049@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 5 Mar 2009 16:43:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189407 - in head/sys/dev: puc uart
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Mar 2009 16:43:34 -0000

Author: jhb
Date: Thu Mar  5 16:43:33 2009
New Revision: 189407
URL: http://svn.freebsd.org/changeset/base/189407

Log:
  Add support for the single-port NetMos NM9835 serial adapter.  The puc(4)
  entry is a specific entry to override the generic NetMos entry so that
  puc(4) will leave this device alone and let uart(4) claim it.
  
  Submitted by:	Navdeep Parhar  nparhar @ gmail
  Reviewed by:	marcel
  MFC after:	1 week

Modified:
  head/sys/dev/puc/pucdata.c
  head/sys/dev/uart/uart_bus_pci.c

Modified: head/sys/dev/puc/pucdata.c
==============================================================================
--- head/sys/dev/puc/pucdata.c	Thu Mar  5 16:22:32 2009	(r189406)
+++ head/sys/dev/puc/pucdata.c	Thu Mar  5 16:43:33 2009	(r189407)
@@ -761,6 +761,18 @@ const struct puc_cfg puc_pci_devices[] =
 	    PUC_PORT_2P, 0x10, 8, 0,
 	}, 
 
+	/*
+	 * This is more specific than the generic NM9835 entry that follows, and
+	 * is placed here to _prevent_ puc from claiming this single port card.
+	 *
+	 * uart(4) will claim this device.
+	 */
+	{   0x9710, 0x9835, 0x1000, 1,
+	    "NetMos NM9835 based 1-port serial",
+	    DEFAULT_RCLK,
+	    PUC_PORT_1S, 0x10, 4, 0,
+	},
+
 	{   0x9710, 0x9835, 0xffff, 0,
 	    "NetMos NM9835 Dual UART and 1284 Printer port",
 	    DEFAULT_RCLK,

Modified: head/sys/dev/uart/uart_bus_pci.c
==============================================================================
--- head/sys/dev/uart/uart_bus_pci.c	Thu Mar  5 16:22:32 2009	(r189406)
+++ head/sys/dev/uart/uart_bus_pci.c	Thu Mar  5 16:43:33 2009	(r189407)
@@ -110,6 +110,7 @@ static struct pci_id pci_ns8250_ids[] = 
 { 0x1415, 0x950b, 0xffff, 0, "Oxford Semiconductor OXCB950 Cardbus 16950 UART",
 	0x10, 16384000 },
 { 0x151f, 0x0000, 0xffff, 0, "TOPIC Semiconductor TP560 56k modem", 0x10 },
+{ 0x9710, 0x9835, 0x1000, 1, "NetMos NM9835 Serial Port", 0x10 },
 { 0xdeaf, 0x9051, 0xffff, 0, "Middle Digital PC Weasel Serial Port", 0x10 },
 { 0xffff, 0, 0xffff, 0, NULL, 0, 0}
 };