From owner-p4-projects@FreeBSD.ORG Thu Jul 24 04:59:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 294DB106567B; Thu, 24 Jul 2008 04:59:02 +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 DBE8E1065674; Thu, 24 Jul 2008 04:59:01 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 824668FC13; Thu, 24 Jul 2008 04:59:01 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id m6O4uD9k036924; Wed, 23 Jul 2008 22:56:13 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Wed, 23 Jul 2008 22:56:26 -0600 (MDT) Message-Id: <20080723.225626.371416819.imp@bsdimp.com> To: marcel@freebsd.org From: "M. Warner Losh" In-Reply-To: <200807071855.m67ItHQp084707@repoman.freebsd.org> References: <200807071855.m67ItHQp084707@repoman.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jul 2008 04:59:02 -0000 In message: <200807071855.m67ItHQp084707@repoman.freebsd.org> Marcel Moolenaar writes: : 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)); : } I don't think this change is correct. ISA_PNP_PROBE returns 0 when there is a PNPID for this device, and there is a match in the table. ISA_PNP_PROBE returns ENXIO when there is a PNPID for this device and there is no match in the table. ISA_PNP_PROBE returns ENOENT when there's no PNPID for this device. Warner