From owner-p4-projects@FreeBSD.ORG  Sun Jul 13 18:53:57 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8E58C1065673; Sun, 13 Jul 2008 18:53:57 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 52832106566B
	for <perforce@freebsd.org>; Sun, 13 Jul 2008 18:53:57 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3A2558FC08
	for <perforce@freebsd.org>; Sun, 13 Jul 2008 18:53:57 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m6DIrveL035809
	for <perforce@freebsd.org>; Sun, 13 Jul 2008 18:53:57 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6DIrvhG035807
	for perforce@freebsd.org; Sun, 13 Jul 2008 18:53:57 GMT
	(envelope-from marcel@freebsd.org)
Date: Sun, 13 Jul 2008 18:53:57 GMT
Message-Id: <200807131853.m6DIrvhG035807@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 145167 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Jul 2008 18:53:57 -0000

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));
 	}