From owner-p4-projects@FreeBSD.ORG  Sun Jul 13 13:09:07 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D3A9E1065673; Sun, 13 Jul 2008 13:09:07 +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 9775D106564A;
	Sun, 13 Jul 2008 13:09:07 +0000 (UTC)
	(envelope-from marius@alchemy.franken.de)
Received: from alchemy.franken.de (alchemy.franken.de [194.94.249.214])
	by mx1.freebsd.org (Postfix) with ESMTP id 205F58FC13;
	Sun, 13 Jul 2008 13:09:06 +0000 (UTC)
	(envelope-from marius@alchemy.franken.de)
Received: from alchemy.franken.de (localhost [127.0.0.1])
	by alchemy.franken.de (8.14.3/8.14.3/ALCHEMY.FRANKEN.DE) with ESMTP id
	m6DCT7w1063206; Sun, 13 Jul 2008 14:29:07 +0200 (CEST)
	(envelope-from marius@alchemy.franken.de)
Received: (from marius@localhost)
	by alchemy.franken.de (8.14.3/8.14.3/Submit) id m6DCT7XJ063205;
	Sun, 13 Jul 2008 14:29:07 +0200 (CEST) (envelope-from marius)
Date: Sun, 13 Jul 2008 14:29:07 +0200
From: Marius Strobl <marius@alchemy.franken.de>
To: Marcel Moolenaar <marcel@freebsd.org>
Message-ID: <20080713122907.GA63008@alchemy.franken.de>
References: <200807071855.m67ItHQp084707@repoman.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200807071855.m67ItHQp084707@repoman.freebsd.org>
User-Agent: Mutt/1.4.2.3i
Cc: Perforce Change Reviews <perforce@freebsd.org>
Subject: Re: PERFORCE change 144842 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 13:09:08 -0000

On Mon, Jul 07, 2008 at 06:55:17PM +0000, Marcel Moolenaar wrote:
> http://perforce.freebsd.org/chv.cgi?CH=144842
> 
> Change 144842 by marcel@marcel_xcllnt on 2008/07/07 18:55:11
> 
> 	ISA_PNP_PROBE() can also return ENOENT.
> 	So, assume a match when the error is 0, not != ENXIO.
> 
> Affected files ...
> 
> .. //depot/projects/uart/dev/uart/uart_bus_isa.c#13 edit
> 
> Differences ...
> 
> ==== //depot/projects/uart/dev/uart/uart_bus_isa.c#13 (text+ko) ====
> 
> @@ -170,7 +170,7 @@
>  	sc = device_get_softc(dev);
>  
>  	/* Probe PnP _and_ non-PnP ns8250 here. */
> -	if (ISA_PNP_PROBE(parent, dev, isa_ns8250_ids) != ENXIO) {
> +	if (ISA_PNP_PROBE(parent, dev, isa_ns8250_ids) == 0) {
>  		sc->sc_class = &uart_ns8250_class;
>  		return (uart_bus_probe(dev, 0, 0, 0, 0));
>  	}

Unfortunately, this now no longer probes non-PnP ns8250. You'll
probably need something like the following to actually probe both:
	if (ISA_PNP_PROBE(parent, dev, isa_ns8250_ids) == 0 ||
	    isa_get_vendorid(dev) == 0)

Marius