PERFORCE change 94923 for review

[Marcel Moolenaar]

http://perforce.freebsd.org/chv.cgi?CH=94923

Change 94923 by marcel at marcel_nfs on 2006/04/10 17:29:15

	For single-UART cards with default RCLK, have uart(4) attach
	directly.

Affected files ...

.. //depot/projects/uart/dev/puc/pucdata.c#16 edit
.. //depot/projects/uart/dev/uart/uart_bus_pci.c#11 edit

Differences ...

==== //depot/projects/uart/dev/puc/pucdata.c#16 (text+ko) ====

@@ -257,33 +257,6 @@
 	 * SIIG "10x" family boards.
 	 */
 
-	/* SIIG Cyber Serial PCI 16C550 (10x family): 1S */
-	{   "SIIG Cyber Serial PCI 16C550 (10x family)",
-	    {	0x131f,	0x1000,	0,	0	},
-	    {	0xffff,	0xffff,	0,	0	},
-	    {
-		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
-	    },
-	},
-
-	/* SIIG Cyber Serial PCI 16C650 (10x family): 1S */
-	{   "SIIG Cyber Serial PCI 16C650 (10x family)",
-	    {	0x131f,	0x1001,	0,	0	},
-	    {	0xffff,	0xffff,	0,	0	},
-	    {
-		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
-	    },
-	},
-
-	/* SIIG Cyber Serial PCI 16C850 (10x family): 1S */
-	{   "SIIG Cyber Serial PCI 16C850 (10x family)",
-	    {	0x131f,	0x1002,	0,	0	},
-	    {	0xffff,	0xffff,	0,	0	},
-	    {
-		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
-	    },
-	},
-
 	/* SIIG Cyber I/O PCI 16C550 (10x family): 1S, 1P */
 	{   "SIIG Cyber I/O PCI 16C550 (10x family)",
 	    {	0x131f,	0x1010,	0,	0	},
@@ -488,33 +461,6 @@
 	    },
 	},
 
-	/* SIIG Cyber Serial PCI 16C550 (20x family): 1S */
-	{   "SIIG Cyber Serial PCI 16C550 (20x family)",
-	    {	0x131f,	0x2000,	0,	0	},
-	    {	0xffff,	0xffff,	0,	0	},
-	    {
-		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
-	    },
-	},
-
-	/* SIIG Cyber Serial PCI 16C650 (20x family): 1S */
-	{   "SIIG Cyber Serial PCI 16C650 (20x family)",
-	    {	0x131f,	0x2001,	0,	0	},
-	    {	0xffff,	0xffff,	0,	0	},
-	    {
-		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
-	    },
-	},
-
-	/* SIIG Cyber Serial PCI 16C850 (20x family): 1S */
-	{   "SIIG Cyber Serial PCI 16C850 (20x family)",
-	    {	0x131f,	0x2002,	0,	0	},
-	    {	0xffff,	0xffff,	0,	0	},
-	    {
-		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
-	    },
-	},
-
 	/* SIIG Cyber I/O PCI 16C550 (20x family): 1S, 1P */
 	{   "SIIG Cyber I/O PCI 16C550 (20x family)",
 	    {	0x131f,	0x2010,	0,	0	},
@@ -797,15 +743,6 @@
 	    },
 	},
 
-	/* Lava Computers DSerial PCI serial ports */
-	{   "Lava Computers serial port",
-	    {	0x1407,	0x0110,	0,	0	},
-	    {	0xffff,	0xfffc,	0,	0	},
-	    {
-		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
-	    },
-	},
-
 	/* Lava Computers Octopus-550 serial ports */
 	{   "Lava Computers Octopus-550 8-port serial",
 	    {	0x1407,	0x0180,	0,	0	},
@@ -818,24 +755,6 @@
 	    },
 	},
 
-	/* US Robotics (3Com) PCI Modems */
-	{   "US Robotics (3Com) 3CP5609 PCI 16550 Modem",
-	    {	0x12b9,	0x1008,	0,	0	},
-	    {	0xffff,	0xffff,	0,	0	},
-	    {
-		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
-	    },
-	},
-
-	/* Actiontec 56K PCI Master */
-	{   "Actiontec 56K PCI Master",
-	    {	0x11c1,	0x0480,	0,	0	},
-	    {	0xffff,	0xffff,	0,	0	},
-	    {
-		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
-	    },
-	},
-
 	/*
 	 * Boards with an Oxford Semiconductor chip.
 	 *
@@ -945,18 +864,6 @@
 	    },
 	},                            
 
-	/*
-	 * This is the Middle Digital, Inc. PCI-Weasel, which
-	 * uses a PCI interface implemented in FPGA.
-	 */
-	{   "Middle Digital, Inc. Weasel serial port",
-	    {	0xdeaf,	0x9051,	0,	0	},
-	    {	0xffff,	0xffff,	0,	0	},
-	    {
-		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
-	    },
-	},
-
 	/* SD-LAB PCI I/O Card 4S2P */
 	{   "Syba Tech Ltd. PCI-4S2P-550-ECP",
 	    {	0x1592,	0x0781,	0,	0	},

==== //depot/projects/uart/dev/uart/uart_bus_pci.c#11 (text+ko) ====

@@ -67,7 +67,6 @@
 	{ 0x01101407, "Lava Computers serial port", 0x10 },
 	{ 0x01111407, "Lava Computers serial port", 0x10 },
 	{ 0x9051deaf, "Middle Digital, Inc. Weasel serial port", 0x10 },
-	{ 0x950b1415, "Oxford Semiconductor OXCB950 UART", 0x10 },
 	{ 0x01c0135c, "Quatech SSCLP-200/300", 0x18 
 		/* 
 		 * NB: You must mount the "SPAD" jumper to correctly detect