PERFORCE change 144785 for review

[Marcel Moolenaar]

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

Change 144785 by marcel at marcel_xcllnt on 2008/07/06 15:52:13

	The RSA-98III is actually a ns8250 class UART.

Affected files ...

.. //depot/projects/uart/dev/uart/uart_bus_isa.c#12 edit

Differences ...

==== //depot/projects/uart/dev/uart/uart_bus_isa.c#12 (text+ko) ====

@@ -65,6 +65,7 @@
 	{0x0205d041, "Multiport serial device (non-intelligent 16550)"}, /* PNP0502 */
 	{0x1005d041, "Generic IRDA-compatible device"},	/* PNP0510 */
 	{0x1105d041, "Generic IRDA-compatible device"},	/* PNP0511 */
+	{0x0100e4a5, "RSA-98III"},
 	/* Devices that do not have a compatid */
 	{0x12206804, NULL},     /* ACH2012 - 5634BTS 56K Video Ready Modem */
 	{0x7602a904, NULL},	/* AEI0276 - 56K v.90 Fax Modem (LKT) */
@@ -159,11 +160,6 @@
 	{0}
 };
 
-static struct isa_pnp_id isa_i8251_ids[] = {
-	{0x0100e4a5, "RSA-98III"},
-	{0}
-};
-
 static int
 uart_isa_probe(device_t dev)
 {
@@ -179,11 +175,7 @@
 		return (uart_bus_probe(dev, 0, 0, 0, 0));
 	}
 
-	/* Probe PnP _and_ non-PnP i8251 here. */
-	if (ISA_PNP_PROBE(parent, dev, isa_i8251_ids) != ENXIO) {
-		sc->sc_class = &uart_i8251_class;
-		return (uart_bus_probe(dev, 0, 0, 0, 0));
-	}
+	/* Add checks for non-ns8250 IDs here. */
 
 #ifdef PC98
 	sc->sc_class = uart_pc98_getdev(bus_get_resource_start(dev,