Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Jul 2008 18:53:57 GMT
From:      Marcel Moolenaar <marcel@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 145167 for review
Message-ID:  <200807131853.m6DIrvhG035807@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=145167

Change 145167 by marcel@marcel_xcllnt on 2008/07/13 18:53:06

	Revert probing to what it was before. The previous commit
	was to fix the non-PnP case, but actually broke it. I know
	this works on i386, so if non-PnP probing is broken on
	PC98 then we'd better dig into it.
	
	While here, remove RSA-98III. Now that I know more on the
	subject, I think it's much better to create a rsa(4) driver
	that serves as an umbrella. This means that a new bus
	attachment will be created. Since the RSA hardware is
	commented-out in the standard hints file on PC98, I assume
	the hardware is less common/standard than i8251. As such,
	it'll will have to wait until i8251 hardware is supported.

Affected files ...

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

Differences ...

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

@@ -65,7 +65,6 @@
 	{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) */
@@ -170,7 +169,7 @@
 	sc = device_get_softc(dev);
 
 	/* Probe PnP _and_ non-PnP ns8250 here. */
-	if (ISA_PNP_PROBE(parent, dev, isa_ns8250_ids) == 0) {
+	if (ISA_PNP_PROBE(parent, dev, isa_ns8250_ids) != ENXIO) {
 		sc->sc_class = &uart_ns8250_class;
 		return (uart_bus_probe(dev, 0, 0, 0, 0));
 	}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807131853.m6DIrvhG035807>