From owner-p4-projects@FreeBSD.ORG  Thu Feb 23 23:46:47 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1CA3D16A438; Thu, 23 Feb 2006 23:46:47 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CF19D16A420
	for <perforce@freebsd.org>; Thu, 23 Feb 2006 23:46:46 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6BAC843D46
	for <perforce@freebsd.org>; Thu, 23 Feb 2006 23:46:46 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NNkkCO032978
	for <perforce@freebsd.org>; Thu, 23 Feb 2006 23:46:46 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NNkkFE032975
	for perforce@freebsd.org; Thu, 23 Feb 2006 23:46:46 GMT
	(envelope-from marcel@freebsd.org)
Date: Thu, 23 Feb 2006 23:46:46 GMT
Message-Id: <200602232346.k1NNkkFE032975@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 92306 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: Thu, 23 Feb 2006 23:46:48 -0000

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

Change 92306 by marcel@marcel_nfs on 2006/02/23 23:46:10

	Have puc(4) return BUS_PROBE_LOW_PRIORITY for the
	SCCs it's currently handling and have scc(4) return
	BUS_PROBE_DEFAULT. This allows both puc(4) and scc(4)
	to be configured, as well as have scc(4) play nice
	with possible vendor drivers.

Affected files ...

.. //depot/projects/uart/dev/puc/puc_ebus.c#10 edit
.. //depot/projects/uart/dev/puc/puc_sbus.c#11 edit
.. //depot/projects/uart/dev/scc/scc_core.c#9 edit

Differences ...

==== //depot/projects/uart/dev/puc/puc_ebus.c#10 (text+ko) ====

@@ -54,7 +54,7 @@
 	cmpt = ofw_bus_get_compat(dev);
 	if (!strcmp(nm, "se") || (cmpt != NULL && !strcmp(cmpt, "sab82532"))) {
 		device_set_desc(dev, "Siemens SAB 82532 dual channel SCC");
-		return (0);
+		return (BUS_PROBE_LOW_PRIORITY);
 	}
 	return (ENXIO);
 }

==== //depot/projects/uart/dev/puc/puc_sbus.c#11 (text+ko) ====

@@ -53,7 +53,7 @@
 	nm = ofw_bus_get_name(dev);
 	if (!strcmp(nm, "zs")) {
 		device_set_desc(dev, "Zilog Z8530 dual channel SCC");
-		return (0);
+		return (BUS_PROBE_LOW_PRIORITY);
 	}
 	return (ENXIO);
 }

==== //depot/projects/uart/dev/scc/scc_core.c#9 (text+ko) ====

@@ -338,7 +338,7 @@
 
 	error = SCC_PROBE(sc);
 	bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, sc->sc_rres);
-	return (error);
+	return ((error == 0) ? BUS_PROBE_DEFAULT : error);
 }
 
 struct resource *