svn commit: r190068 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/puc dev/uart

[John Baldwin]

Author: jhb
Date: Thu Mar 19 15:35:33 2009
New Revision: 190068
URL: http://svn.freebsd.org/changeset/base/190068

Log:
  MFC: Add support for the single-port NetMos NM9835 serial adapter.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/puc/pucdata.c
  stable/7/sys/dev/uart/uart_bus_pci.c

Modified: stable/7/sys/dev/puc/pucdata.c
==============================================================================
--- stable/7/sys/dev/puc/pucdata.c	Thu Mar 19 15:32:16 2009	(r190067)
+++ stable/7/sys/dev/puc/pucdata.c	Thu Mar 19 15:35:33 2009	(r190068)
@@ -743,6 +743,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: stable/7/sys/dev/uart/uart_bus_pci.c
==============================================================================
--- stable/7/sys/dev/uart/uart_bus_pci.c	Thu Mar 19 15:32:16 2009	(r190067)
+++ stable/7/sys/dev/uart/uart_bus_pci.c	Thu Mar 19 15:35:33 2009	(r190068)
@@ -109,6 +109,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}
 };