PERFORCE change 92306 for review

[Marcel Moolenaar]

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

Change 92306 by marcel at 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 *