* Define a new static method DEVICE_IDENTIFY which is called to add device

  instances to a parent bus.
* Define a new method BUS_ADD_CHILD which can be called from DEVICE_IDENTIFY
  to add new instances.
* Add a generic implementation of DEVICE_PROBE which calls DEVICE_IDENTIFY
  for each driver attached to the parent's devclass.
* Move the hint-based isa probe from the isa driver to a new isahint driver
  which can be shared between i386 and alpha.

1 files changed, 131 insertions, 0 deletions

diff --git a/sys/isa/isahint.c b/sys/isa/isahint.c
new file mode 100644
index 0000000..8010195
--- /dev/null
+++ b/sys/isa/isahint.c
@@ -0,0 +1,131 @@
+/*-
+ * Copyright (c) 1999 Doug Rabson
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$Id$
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/module.h>
+#include <isa/isavar.h>
+
+static void
+isahint_add_device(device_t parent, const char *name, int unit)
+{
+	device_t	child;
+	int		sensitive, t;
+	static	device_t last_sensitive;
+
+	/* device-specific flag overrides any wildcard */
+	sensitive = 0;
+	if (resource_int_value(name, unit, "sensitive", &sensitive) != 0)
+		resource_int_value(name, -1, "sensitive", &sensitive);
+
+	if (sensitive)
+		child = BUS_ADD_CHILD(parent, last_sensitive, name, unit);
+	else
+		child = BUS_ADD_CHILD(parent, 0, name, unit);
+	if (child == 0)
+		return;
+	else if (sensitive)
+		last_sensitive = child;
+
+	if (resource_int_value(name, unit, "port", &t) == 0)
+		isa_set_port(child, t);
+
+	if (resource_int_value(name, unit, "portsize", &t) == 0)
+		isa_set_portsize(child, t);
+
+	if (resource_int_value(name, unit, "maddr", &t) == 0)
+		isa_set_maddr(child, t);
+
+	if (resource_int_value(name, unit, "msize", &t) == 0)
+		isa_set_msize(child, t);
+
+	if (resource_int_value(name, unit, "flags", &t) == 0)
+		isa_set_flags(child, t);
+
+	if (resource_int_value(name, unit, "irq", &t) == 0)
+		isa_set_irq(child, t);
+
+	if (resource_int_value(name, unit, "drq", &t) == 0)
+		isa_set_drq(child, t);
+
+	if (resource_int_value(name, unit, "disabled", &t) == 0 && t != 0)
+		device_disable(child);
+}
+
+static void
+isahint_identify(driver_t *driver, device_t parent)
+{
+	int i;
+	static char buf[] = "isaXXX";
+
+	/*
+	 * Add all devices configured to be attached to parent.
+	 */
+	sprintf(buf, "isa%d", device_get_unit(parent));
+	for (i = resource_query_string(-1, "at", buf);
+	     i != -1;
+	     i = resource_query_string(i, "at", buf)) {
+		if (strcmp(resource_query_name(i), "atkbd") == 0)
+			continue;	/* old GENERIC kludge */
+		isahint_add_device(parent,
+				   resource_query_name(i),
+				   resource_query_unit(i));
+	}
+
+	/*
+	 * and isa?
+	 */
+	for (i = resource_query_string(-1, "at", "isa");
+	     i != -1;
+	     i = resource_query_string(i, "at", "isa")) {
+		if (strcmp(resource_query_name(i), "atkbd") == 0)
+			continue;	/* old GENERIC kludge */
+		isahint_add_device(parent,
+				   resource_query_name(i),
+				   resource_query_unit(i));
+	}
+}
+
+static device_method_t isahint_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_identify,	isahint_identify),
+
+	{ 0, 0 }
+};
+
+static driver_t isahint_driver = {
+	"hint",
+	isahint_methods,
+	1,			/* no softc */
+};
+
+static devclass_t hint_devclass;
+
+DRIVER_MODULE(isahint, isa, isahint_driver, hint_devclass, 0, 0);