1 files changed, 96 insertions, 619 deletions

diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index dc4c88a22912e..f38f0f885063c 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: subr_bus.c,v 1.13 1999/01/10 22:04:05 n_hibma Exp $
+ *	$Id: subr_bus.c,v 1.5 1998/09/05 13:24:39 bde Exp $
  */
 
 #include <sys/param.h>
@@ -33,61 +33,11 @@
 #include <sys/module.h>
 #include <sys/bus_private.h>
 #include <sys/systm.h>
-#include <machine/stdarg.h>	/* for device_printf() */
-
-#include "opt_bus.h"
-
-#ifdef BUS_DEBUG
-#define PDEBUG(a)	(printf(__FUNCTION__ ":%d: ", __LINE__), printf a, printf("\n"))
-#define DEVICENAME(d)	((d)? device_get_name(d): "no device")
-#define DRIVERNAME(d)	((d)? d->name : "no driver")
-#define DEVCLANAME(d)	((d)? d->name : "no devclass")
-
-/* Produce the indenting, indent*2 spaces plus a '.' ahead of that to 
- * prevent syslog from deleting initial spaces
- */
-#define indentprintf(p)	do { int iJ; printf("."); for (iJ=0; iJ<indent; iJ++) printf("  "); printf p ; } while(0)
-
-static void print_method_list(device_method_t *m, int indent);
-static void print_device_ops(device_ops_t ops, int indent);
-static void print_device_short(device_t dev, int indent);
-static void print_device(device_t dev, int indent);
-void print_device_tree_short(device_t dev, int indent);
-void print_device_tree(device_t dev, int indent);
-static void print_driver_short(driver_t *driver, int indent);
-static void print_driver(driver_t *driver, int indent);
-static void print_driver_list(driver_list_t drivers, int indent);
-static void print_devclass_short(devclass_t dc, int indent);
-static void print_devclass(devclass_t dc, int indent);
-void print_devclass_list_short(void);
-void print_devclass_list(void);
-
-#else
-/* Make the compiler ignore the function calls */
-#define PDEBUG(a)			/* nop */
-#define DEVICENAME(d)			/* nop */
-#define DRIVERNAME(d)			/* nop */
-#define DEVCLANAME(d)			/* nop */
-
-#define print_method_list(m,i)		/* nop */
-#define print_device_ops(o,i)		/* nop */
-#define print_device_short(d,i)		/* nop */
-#define print_device(d,i)		/* nop */
-#define print_device_tree_short(d,i)	/* nop */
-#define print_device_tree(d,i)		/* nop */
-#define print_driver_short(d,i)		/* nop */
-#define print_driver(d,i)		/* nop */
-#define print_driver_list(d,i)		/* nop */
-#define print_devclass_short(d,i)	/* nop */
-#define print_devclass(d,i)		/* nop */
-#define print_devclass_list_short()	/* nop */
-#define print_devclass_list()		/* nop */
-#endif
-
 
 /*
  * Method table handling
  */
+
 static int next_method_offset = 1;
 static int methods_count = 0;
 static int methods_size = 0;
@@ -108,8 +58,6 @@ register_method(struct device_op_desc *desc)
     for (i = 0; i < methods_count; i++)
 	if (!strcmp(methods[i].name, desc->name)) {
 	    desc->offset = methods[i].offset;
-	    PDEBUG(("methods[%d] has the same name, %s, with offset %d",
-	    		i, desc->name, desc->offset));
 	    return;
 	}
 
@@ -158,8 +106,6 @@ compile_methods(driver_t *driver)
     for (i = 0, m = driver->methods; m->desc; i++, m++)
 	if (!m->desc->offset)
 	    register_method(m->desc);
-	else
-	    PDEBUG(("offset not equal to zero, method desc %d left as is", i));
 
     /*
      * Then allocate the compiled op table.
@@ -168,16 +114,11 @@ compile_methods(driver_t *driver)
 		 M_DEVBUF, M_NOWAIT);
     if (!ops)
 	panic("compile_methods: out of memory");
-
     ops->maxoffset = next_method_offset;
     for (i = 0; i < next_method_offset; i++)
 	ops->methods[i] = error_method;
     for (i = 0, m = driver->methods; m->desc; i++, m++)
 	ops->methods[m->desc->offset] = m->func;
-    PDEBUG(("%s has %d method%s, wasting %d bytes",
-    		DRIVERNAME(driver), i, (i==1?"":"s"),
-		(next_method_offset-i)*sizeof(devop_t)));
-
     driver->ops = ops;
 }
 
@@ -185,22 +126,23 @@ compile_methods(driver_t *driver)
  * Devclass implementation
  */
 
-static devclass_list_t devclasses = TAILQ_HEAD_INITIALIZER(devclasses);
+static devclass_list_t devclasses;
+
+static void
+devclass_init(void)
+{
+    TAILQ_INIT(&devclasses);
+}
 
 static devclass_t
 devclass_find_internal(const char *classname, int create)
 {
     devclass_t dc;
 
-    PDEBUG(("looking for %s", classname));
-    if (!classname)
-	return NULL;
-
     for (dc = TAILQ_FIRST(&devclasses); dc; dc = TAILQ_NEXT(dc, link))
 	if (!strcmp(dc->name, classname))
 	    return dc;
 
-    PDEBUG(("%s not found%s", classname, (create? ", creating": "")));
     if (create) {
 	dc = malloc(sizeof(struct devclass) + strlen(classname) + 1,
 		    M_DEVBUF, M_NOWAIT);
@@ -227,7 +169,6 @@ devclass_find(const char *classname)
 int
 devclass_add_driver(devclass_t dc, driver_t *driver)
 {
-    PDEBUG(("%s", DRIVERNAME(driver)));
     /*
      * Compile the drivers methods.
      */
@@ -244,35 +185,31 @@ devclass_add_driver(devclass_t dc, driver_t *driver)
 }
 
 int
-devclass_delete_driver(devclass_t busclass, driver_t *driver)
+devclass_delete_driver(devclass_t dc, driver_t *driver)
 {
-    devclass_t dc = devclass_find(driver->name);
+    device_t bus;
     device_t dev;
     int i;
     int error;
 
-    PDEBUG(("%s from devclass %s", driver->name, DEVCLANAME(busclass)));
-
-    if (!dc)
-	return 0;
-
     /*
      * Disassociate from any devices.  We iterate through all the
-     * devices in the devclass of the driver and detach any which are
-     * using the driver.
+     * devices attached to any bus in this class.
      */
     for (i = 0; i < dc->maxunit; i++) {
 	if (dc->devices[i]) {
-	    dev = dc->devices[i];
-	    if (dev->driver == driver) {
-		if (error = device_detach(dev))
-		    return error;
-		device_set_driver(dev, NULL);
-	    }
+	    bus = dc->devices[i]->parent;
+	    for (dev = TAILQ_FIRST(&bus->children); dev;
+		 dev = TAILQ_NEXT(dev, link))
+		if (dev->driver == driver) {
+		    if (error = device_detach(dev))
+			return error;
+		    device_set_driver(dev, NULL);
+		}
 	}
     }
 
-    TAILQ_REMOVE(&busclass->drivers, driver, link);
+    TAILQ_REMOVE(&dc->drivers, driver, link);
     return 0;
 }
 
@@ -281,15 +218,11 @@ devclass_find_driver(devclass_t dc, const char *classname)
 {
     driver_t *driver;
 
-    PDEBUG(("%s in devclass %s", classname, DEVCLANAME(dc)));
-
     for (driver = TAILQ_FIRST(&dc->drivers); driver;
-	 driver = TAILQ_NEXT(driver, link)) {
+	 driver = TAILQ_NEXT(driver, link))
 	if (!strcmp(driver->name, classname))
 	    return driver;
-    }
 
-    PDEBUG(("not found"));
     return NULL;
 }
 
@@ -325,6 +258,7 @@ devclass_get_devices(devclass_t dc, device_t **devlistp, int *devcountp)
 {
     int i;
     int count;
+    device_t dev;
     device_t *list;
     
     count = 0;
@@ -360,8 +294,6 @@ devclass_alloc_unit(devclass_t dc, int *unitp)
 {
     int unit = *unitp;
 
-    PDEBUG(("unit %d in devclass %s", unit, DEVCLANAME(dc)));
-
     /*
      * If we have been given a wired unit number, check for existing
      * device.
@@ -398,7 +330,6 @@ devclass_alloc_unit(devclass_t dc, int *unitp)
 	dc->devices = newlist;
 	dc->maxunit = newsize;
     }
-    PDEBUG(("now: unit %d in devclass %s", unit, DEVCLANAME(dc)));
 
     *unitp = unit;
     return 0;
@@ -409,8 +340,6 @@ devclass_add_device(devclass_t dc, device_t dev)
 {
     int error;
 
-    PDEBUG(("%s in devclass %s", DEVICENAME(dev), DEVCLANAME(dc)));
-
     if (error = devclass_alloc_unit(dc, &dev->unit))
 	return error;
     dc->devices[dev->unit] = dev;
@@ -421,11 +350,6 @@ devclass_add_device(devclass_t dc, device_t dev)
 static int
 devclass_delete_device(devclass_t dc, device_t dev)
 {
-    if (!dc || !dev)
-	return 0;
-
-    PDEBUG(("%s in devclass %s", DEVICENAME(dev), DEVCLANAME(dc)));
-
     if (dev->devclass != dc
 	|| dc->devices[dev->unit] != dev)
 	panic("devclass_delete_device: inconsistent device class");
@@ -442,13 +366,11 @@ static device_t
 make_device(device_t parent, const char *name,
 	    int unit, void *ivars)
 {
+    driver_t *driver;
     device_t dev;
     devclass_t dc;
     int error;
 
-    PDEBUG(("%s at %s as unit %d with%s ivars",
-    	    name, DEVICENAME(parent), unit, (ivars? "":"out")));
-
     if (name) {
 	dc = devclass_find_internal(name, TRUE);
 	if (!dc) {
@@ -507,15 +429,9 @@ device_add_child(device_t dev, const char *name, int unit, void *ivars)
 {
     device_t child;
 
-    PDEBUG(("%s at %s as unit %d with%s ivars",
-    	    name, DEVICENAME(dev), unit, (ivars? "":"out")));
-
     child = make_device(dev, name, unit, ivars);
 
-    if (child)
-	TAILQ_INSERT_TAIL(&dev->children, child, link);
-    else
-	PDEBUG(("%s failed", name));
+    TAILQ_INSERT_TAIL(&dev->children, child, link);
 
     return child;
 }
@@ -526,9 +442,6 @@ device_add_child_after(device_t dev, device_t place, const char *name,
 {
     device_t child;
 
-    PDEBUG(("%s at %s after %s as unit %d with%s ivars",
-    	    name, DEVICENAME(dev), DEVICENAME(place), unit, (ivars? "":"out")));
-
     child = make_device(dev, name, unit, ivars);
 
     if (place) {
@@ -544,23 +457,13 @@ int
 device_delete_child(device_t dev, device_t child)
 {
     int error;
-    device_t grandchild;
-
-    PDEBUG(("%s from %s", DEVICENAME(child), DEVICENAME(dev)));
-
-    /* remove children first */
-    while ( (grandchild = TAILQ_FIRST(&child->children)) ) {
-        error = device_delete_child(child, grandchild);
-	if (error)
-	    return error;
-    }
 
     if (error = device_detach(child))
 	return error;
     if (child->devclass)
 	devclass_delete_device(child->devclass, child);
     TAILQ_REMOVE(&dev->children, child, link);
-    free(child, M_DEVBUF);
+    free(dev, M_DEVBUF);
 
     return 0;
 }
@@ -612,6 +515,7 @@ device_probe_child(device_t dev, device_t child)
 {
     devclass_t dc;
     driver_t *driver;
+    void *softc;
 
     dc = dev->devclass;
     if (dc == NULL)
@@ -623,7 +527,6 @@ device_probe_child(device_t dev, device_t child)
     for (driver = first_matching_driver(dc, child);
 	 driver;
 	 driver = next_matching_driver(dc, child, driver)) {
-	PDEBUG(("Trying %s", DRIVERNAME(driver)));
 	device_set_driver(child, driver);
 	if (DEVICE_PROBE(child) == 0) {
 	    if (!child->devclass)
@@ -642,35 +545,6 @@ device_get_parent(device_t dev)
     return dev->parent;
 }
 
-int
-device_get_children(device_t dev, device_t **devlistp, int *devcountp)
-{
-    int count;
-    device_t child;
-    device_t *list;
-    
-    count = 0;
-    for (child = TAILQ_FIRST(&dev->children); child;
-	 child = TAILQ_NEXT(child, link))
-	count++;
-
-    list = malloc(count * sizeof(device_t), M_TEMP, M_NOWAIT);
-    if (!list)
-	return ENOMEM;
-
-    count = 0;
-    for (child = TAILQ_FIRST(&dev->children); child;
-	 child = TAILQ_NEXT(child, link)) {
-	list[count] = child;
-	count++;
-    }
-
-    *devlistp = list;
-    *devcountp = count;
-
-    return 0;
-}
-
 driver_t *
 device_get_driver(device_t dev)
 {
@@ -704,27 +578,6 @@ device_get_desc(device_t dev)
 }
 
 void
-device_print_prettyname(device_t dev)
-{
-	const char *name = device_get_name(dev);
-
-	if (name == 0)
-		name = "(no driver assigned)";
-	printf("%s%d: ", name, device_get_unit(dev));
-}
-
-void
-device_printf(device_t dev, const char * fmt, ...)
-{
-	va_list ap;
-
-	device_print_prettyname(dev);
-	va_start(ap, fmt);
-	vprintf(fmt, ap);
-	va_end(ap);
-}
-
-void
 device_set_desc(device_t dev, const char* desc)
 {
     dev->desc = desc;
@@ -831,11 +684,6 @@ device_set_driver(device_t dev, driver_t *driver)
     if (driver) {
 	dev->ops = driver->ops;
 	dev->softc = malloc(driver->softc, M_DEVBUF, M_NOWAIT);
-	if (!dev->softc) {
-	    dev->ops = &null_ops;
-	    dev->driver = NULL;
-	    return ENOMEM;
-	}
 	bzero(dev->softc, driver->softc);
     }
     return 0;
@@ -845,15 +693,15 @@ int
 device_probe_and_attach(device_t dev)
 {
     device_t bus = dev->parent;
-    int error = 0;
+    int error;
 
     if (dev->state >= DS_ALIVE)
 	return 0;
 
     if (dev->flags & DF_ENABLED) {
-	error = device_probe_child(bus, dev);
-	if (!error) {
-	    device_print_child(bus, dev);
+	device_probe_child(bus, dev);
+	device_print_child(bus, dev);
+	if (dev->state == DS_ALIVE) {
 	    error = DEVICE_ATTACH(dev);
 	    if (!error)
 		dev->state = DS_ATTACHED;
@@ -864,12 +712,11 @@ device_probe_and_attach(device_t dev)
 		dev->state = DS_NOTPRESENT;
 	    }
 	}
-    } else {
-	    device_print_prettyname(dev);
-	    printf("not probed (disabled)\n");
-    }
+    } else
+	printf("%s%d: disabled, not probed.\n",
+	       dev->devclass->name, dev->unit);
 
-    return error;
+    return 0;
 }
 
 int
@@ -877,7 +724,6 @@ device_detach(device_t dev)
 {
     int error;
 
-    PDEBUG(("%s", DEVICENAME(dev)));
     if (dev->state == DS_BUSY)
 	return EBUSY;
     if (dev->state != DS_ATTACHED)
@@ -913,7 +759,7 @@ static int
 resource_match_string(int i, char *resname, char *value)
 {
 	int j;
-	struct config_resource *res;
+	struct resource *res;
 
 	for (j = 0, res = devtab[i].resources;
 	     j < devtab[i].resource_count; j++, res++)
@@ -925,11 +771,10 @@ resource_match_string(int i, char *resname, char *value)
 }
 
 static int
-resource_find(const char *name, int unit, char *resname, 
-	      struct config_resource **result)
+resource_find(const char *name, int unit, char *resname, struct resource **result)
 {
 	int i, j;
-	struct config_resource *res;
+	struct resource *res;
 
 	/*
 	 * First check specific instances, then generic.
@@ -965,7 +810,7 @@ int
 resource_int_value(const char *name, int unit, char *resname, int *result)
 {
 	int error;
-	struct config_resource *res;
+	struct resource *res;
 	if ((error = resource_find(name, unit, resname, &res)) != 0)
 		return error;
 	if (res->type != RES_INT)
@@ -978,7 +823,7 @@ int
 resource_long_value(const char *name, int unit, char *resname, long *result)
 {
 	int error;
-	struct config_resource *res;
+	struct resource *res;
 	if ((error = resource_find(name, unit, resname, &res)) != 0)
 		return error;
 	if (res->type != RES_LONG)
@@ -991,7 +836,7 @@ int
 resource_string_value(const char *name, int unit, char *resname, char **result)
 {
 	int error;
-	struct config_resource *res;
+	struct resource *res;
 	if ((error = resource_find(name, unit, resname, &res)) != 0)
 		return error;
 	if (res->type != RES_STRING)
@@ -1033,6 +878,7 @@ int
 bus_generic_attach(device_t dev)
 {
     device_t child;
+    int error;
 
     for (child = TAILQ_FIRST(&dev->children);
 	 child; child = TAILQ_NEXT(child, link))
@@ -1052,8 +898,7 @@ bus_generic_detach(device_t dev)
 
     for (child = TAILQ_FIRST(&dev->children);
 	 child; child = TAILQ_NEXT(child, link))
-	if (error = device_detach(child))
-	    return error;
+	device_detach(child);
 
     return 0;
 }
@@ -1070,197 +915,59 @@ bus_generic_shutdown(device_t dev)
     return 0;
 }
 
-int
-bus_generic_suspend(device_t dev)
-{
-	int		error;
-	device_t	child, child2;
-
-	for (child = TAILQ_FIRST(&dev->children);
-	     child; child = TAILQ_NEXT(child, link)) {
-		error = DEVICE_SUSPEND(child);
-		if (error) {
-			for (child2 = TAILQ_FIRST(&dev->children);
-			     child2 && child2 != child; 
-			     child2 = TAILQ_NEXT(child2, link))
-				DEVICE_RESUME(child2);
-			return (error);
-		}
-	}
-	return 0;
-}
-
-int
-bus_generic_resume(device_t dev)
-{
-	device_t	child;
-
-	for (child = TAILQ_FIRST(&dev->children);
-	     child; child = TAILQ_NEXT(child, link)) {
-		DEVICE_RESUME(child);
-		/* if resume fails, there's nothing we can usefully do... */
-	}
-	return 0;
-}
-
 void
 bus_generic_print_child(device_t dev, device_t child)
 {
-	printf(" on %s%d", device_get_name(dev), device_get_unit(dev));
 }
 
 int
-bus_generic_read_ivar(device_t dev, device_t child, int index, 
-		      uintptr_t * result)
+bus_generic_read_ivar(device_t dev, device_t child, int index, u_long* result)
 {
     return ENOENT;
 }
 
 int
-bus_generic_write_ivar(device_t dev, device_t child, int index, 
-		       uintptr_t value)
+bus_generic_write_ivar(device_t dev, device_t child, int index, u_long value)
 {
     return ENOENT;
 }
 
-int
-bus_generic_setup_intr(device_t dev, device_t child, struct resource *irq, 
-		       driver_intr_t *intr, void *arg, void **cookiep)
-{
-	/* Propagate up the bus hierarchy until someone handles it. */
-	if (dev->parent)
-		return (BUS_SETUP_INTR(dev->parent, child, irq, intr, arg, 
-				       cookiep));
-	else
-		return (EINVAL);
-}
-
-int
-bus_generic_teardown_intr(device_t dev, device_t child, struct resource *irq,
-			  void *cookie)
-{
-	/* Propagate up the bus hierarchy until someone handles it. */
-	if (dev->parent)
-		return (BUS_TEARDOWN_INTR(dev->parent, child, irq, cookie));
-	else
-		return (EINVAL);
-}
-
-struct resource *
-bus_generic_alloc_resource(device_t dev, device_t child, int type, int *rid,
-			   u_long start, u_long end, u_long count, u_int flags)
-{
-	/* Propagate up the bus hierarchy until someone handles it. */
-	if (dev->parent)
-		return (BUS_ALLOC_RESOURCE(dev->parent, child, type, rid, 
-					   start, end, count, flags));
-	else
-		return (NULL);
-}
-
-int
-bus_generic_release_resource(device_t dev, device_t child, int type, int rid,
-			     struct resource *r)
-{
-	/* Propagate up the bus hierarchy until someone handles it. */
-	if (dev->parent)
-		return (BUS_RELEASE_RESOURCE(dev->parent, child, type, rid, 
-					     r));
-	else
-		return (EINVAL);
-}
-
-int
-bus_generic_activate_resource(device_t dev, device_t child, int type, int rid,
-			      struct resource *r)
-{
-	/* Propagate up the bus hierarchy until someone handles it. */
-	if (dev->parent)
-		return (BUS_ACTIVATE_RESOURCE(dev->parent, child, type, rid, 
-					      r));
-	else
-		return (EINVAL);
-}
-
-int
-bus_generic_deactivate_resource(device_t dev, device_t child, int type,
-				int rid, struct resource *r)
-{
-	/* Propagate up the bus hierarchy until someone handles it. */
-	if (dev->parent)
-		return (BUS_DEACTIVATE_RESOURCE(dev->parent, child, type, rid,
-						r));
-	else
-		return (EINVAL);
-}
-
-/*
- * Some convenience functions to make it easier for drivers to use the
- * resource-management functions.  All these really do is hide the
- * indirection through the parent's method table, making for slightly
- * less-wordy code.  In the future, it might make sense for this code
- * to maintain some sort of a list of resources allocated by each device.
- */
-struct resource *
-bus_alloc_resource(device_t dev, int type, int *rid, u_long start, u_long end,
-		   u_long count, u_int flags)
-{
-	if (dev->parent == 0)
-		return (0);
-	return (BUS_ALLOC_RESOURCE(dev->parent, dev, type, rid, start, end,
-				   count, flags));
-}
-
-int
-bus_activate_resource(device_t dev, int type, int rid, struct resource *r)
-{
-	if (dev->parent == 0)
-		return (EINVAL);
-	return (BUS_ACTIVATE_RESOURCE(dev->parent, dev, type, rid, r));
-}
-
-int
-bus_deactivate_resource(device_t dev, int type, int rid, struct resource *r)
+void *
+bus_generic_create_intr(device_t dev, device_t child, int irq, driver_intr_t *intr, void *arg)
 {
-	if (dev->parent == 0)
-		return (EINVAL);
-	return (BUS_DEACTIVATE_RESOURCE(dev->parent, dev, type, rid, r));
+    /* Propagate up the bus hierarchy until someone handles it. */
+    if (dev->parent)
+	return BUS_CREATE_INTR(dev->parent, dev, irq, intr, arg);
+    else
+	return NULL;
 }
 
 int
-bus_release_resource(device_t dev, int type, int rid, struct resource *r)
-{
-	if (dev->parent == 0)
-		return (EINVAL);
-	return (BUS_RELEASE_RESOURCE(dev->parent, dev,
-				     type, rid, r));
-}
-
-static void
-root_print_child(device_t dev, device_t child)
+bus_generic_connect_intr(device_t dev, void *ih)
 {
+    /* Propagate up the bus hierarchy until someone handles it. */
+    if (dev->parent)
+	return BUS_CONNECT_INTR(dev->parent, ih);
+    else
+	return EINVAL;
 }
 
-static int
-root_setup_intr(device_t dev, device_t child, driver_intr_t *intr, void *arg,
-		void **cookiep)
+static int root_create_intr(device_t dev, device_t child,
+			    driver_intr_t *intr, void *arg)
 {
-	/*
-	 * If an interrupt mapping gets to here something bad has happened.
-	 */
-	panic("root_setup_intr");
+    /*
+     * If an interrupt mapping gets to here something bad has happened.
+     * Should probably panic.
+     */
+    return EINVAL;
 }
 
 static device_method_t root_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_suspend,	bus_generic_suspend),
-	DEVMETHOD(device_resume,	bus_generic_resume),
-
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	root_print_child),
+	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	bus_generic_read_ivar),
 	DEVMETHOD(bus_write_ivar,	bus_generic_write_ivar),
-	DEVMETHOD(bus_setup_intr,	root_setup_intr),
+	DEVMETHOD(bus_create_intr,	root_create_intr),
 
 	{ 0, 0 }
 };
@@ -1272,21 +979,21 @@ static driver_t root_driver = {
 	1,			/* no softc */
 };
 
-device_t	root_bus;
-devclass_t	root_devclass;
+device_t root_bus;
+devclass_t root_devclass;
 
 static int
-root_bus_module_handler(module_t mod, int what, void* arg)
+root_bus_module_handler(module_t mod, modeventtype_t what, void* arg)
 {
     switch (what) {
     case MOD_LOAD:
+	devclass_init();
 	compile_methods(&root_driver);
 	root_bus = make_device(NULL, "root", 0, NULL);
-	root_bus->desc = "System root bus";
 	root_bus->ops = root_driver.ops;
 	root_bus->driver = &root_driver;
 	root_bus->state = DS_ATTACHED;
-	root_devclass = devclass_find_internal("root", FALSE);
+	root_devclass = devclass_find("root");
 	return 0;
     }
 
@@ -1301,11 +1008,10 @@ static moduledata_t root_bus_mod = {
 DECLARE_MODULE(rootbus, root_bus_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST);
 
 void
-root_bus_configure(void)
+root_bus_configure()
 {
     device_t dev;
-
-    PDEBUG(("."));
+    int error;
 
     for (dev = TAILQ_FIRST(&root_bus->children); dev;
 	 dev = TAILQ_NEXT(dev, link)) {
@@ -1314,259 +1020,30 @@ root_bus_configure(void)
 }
 
 int
-driver_module_handler(module_t mod, int what, void *arg)
-{
-	int error, i;
-	struct driver_module_data *dmd;
-	devclass_t bus_devclass;
-
-	dmd = (struct driver_module_data *)arg;
-	bus_devclass = devclass_find_internal(dmd->dmd_busname, TRUE);
-	error = 0;
-
-	switch (what) {
-	case MOD_LOAD:
-		for (i = 0; !error && i < dmd->dmd_ndrivers; i++) {
-			PDEBUG(("Loading module: driver %s on bus %s",
-				DRIVERNAME(dmd->dmd_drivers[i]), 
-				dmd->dmd_busname));
-			error = devclass_add_driver(bus_devclass,
-						    dmd->dmd_drivers[i]);
-		}
-		if (error)
-			break;
-
-		/*
-		 * The drivers loaded in this way are assumed to all
-		 * implement the same devclass.
-		 */
-		*dmd->dmd_devclass =
-			devclass_find_internal(dmd->dmd_drivers[0]->name,
-					       TRUE);
-		break;
-
-	case MOD_UNLOAD:
-		for (i = 0; !error && i < dmd->dmd_ndrivers; i++) {
-			PDEBUG(("Unloading module: driver %s from bus %s",
-				DRIVERNAME(dmd->dmd_drivers[i]), 
-				dmd->dmd_busname));
-			error = devclass_delete_driver(bus_devclass,
-						       dmd->dmd_drivers[i]);
-		}
-		break;
-	}
-
-	if (!error && dmd->dmd_chainevh)
-		error = dmd->dmd_chainevh(mod, what, dmd->dmd_chainarg);
-	return (error);
-}
-
-#ifdef BUS_DEBUG
-
-/* the _short versions avoid iteration by not calling anything that prints
- * more than oneliners. I love oneliners.
- */
-
-static void
-print_method_list(device_method_t *m, int indent)
-{
-	int i;
-
-	if (!m)
-		return;
-
-	for (i = 0; m->desc; i++, m++)
-		indentprintf(("method %d: %s, offset=%d\n",
-			i, m->desc->name, m->desc->offset));
-}
-
-static void
-print_device_ops(device_ops_t ops, int indent)
+driver_module_handler(module_t mod, modeventtype_t what, void* arg)
 {
-	int i;
-	int count = 0;
-
-	if (!ops)
-		return;
-
-	/* we present a list of the methods that are pointing to the
-	 * error_method, but ignore the 0'th elements; it is always
-	 * error_method.
-	 */
-	for (i = 1; i < ops->maxoffset; i++) {
-		if (ops->methods[i] == error_method) {
-			if (count == 0)
-				indentprintf(("error_method:"));
-			printf(" %d", i);
-			count++;
-		}
-	}
-	if (count)
-		printf("\n");
-
-	indentprintf(("(%d method%s, %d valid, %d error_method%s)\n",
-		ops->maxoffset-1, (ops->maxoffset-1 == 1? "":"s"),
-		ops->maxoffset-1-count,
-		count, (count == 1? "":"'s")));
-}
-
-static void
-print_device_short(device_t dev, int indent)
-{
-	if (!dev)
-		return;
-
-	indentprintf(("device %d: <%s> %sparent,%schildren,%s%s%s%sivars,%ssoftc,busy=%d\n",
-		dev->unit, dev->desc,
-		(dev->parent? "":"no "),
-		(TAILQ_EMPTY(&dev->children)? "no ":""),
-		(dev->flags&DF_ENABLED? "enabled,":"disabled,"),
-		(dev->flags&DF_FIXEDCLASS? "fixed,":""),
-		(dev->flags&DF_WILDCARD? "wildcard,":""),
-		(dev->ivars? "":"no "),
-		(dev->softc? "":"no "),
-		dev->busy));
-}
-
-static void
-print_device(device_t dev, int indent)
-{
-	if (!dev)
-		return;
-
-	print_device_short(dev, indent);
-
-	indentprintf(("Parent:\n"));
-	print_device_short(dev->parent, indent+1);
-	indentprintf(("Methods:\n"));
-	print_device_ops(dev->ops, indent+1);
-	indentprintf(("Driver:\n"));
-	print_driver_short(dev->driver, indent+1);
-	indentprintf(("Devclass:\n"));
-	print_devclass_short(dev->devclass, indent+1);
-}
-
-void
-print_device_tree_short(device_t dev, int indent)
-/* print the device and all its children (indented) */
-{
-	device_t child;
-
-	if (!dev)
-		return;
-
-	print_device_short(dev, indent);
-
-	for (child = TAILQ_FIRST(&dev->children); child;
-		 child = TAILQ_NEXT(child, link))
-		print_device_tree_short(child, indent+1);
-}
-
-void
-print_device_tree(device_t dev, int indent)
-/* print the device and all its children (indented) */
-{
-	device_t child;
-
-	if (!dev)
-		return;
-
-	print_device(dev, indent);
-
-	for (child = TAILQ_FIRST(&dev->children); child;
-		 child = TAILQ_NEXT(child, link))
-		print_device_tree(child, indent+1);
-}
-
-static void
-print_driver_short(driver_t *driver, int indent)
-{
-	if (!driver)
-		return;
-
-	indentprintf(("driver %s: type = %s%s%s%s, softc size = %d\n",
-		driver->name,
-		/* yes, I know this looks silly, but going to bed at
-		 * two o'clock and having to get up at 7:30 again is silly
-		 * as well. As is sticking your head in a bucket of water.
-		 */
-		(driver->type == DRIVER_TYPE_TTY? "tty":""),
-		(driver->type == DRIVER_TYPE_BIO? "bio":""),
-		(driver->type == DRIVER_TYPE_NET? "net":""),
-		(driver->type == DRIVER_TYPE_MISC? "misc":""),
-		driver->softc));
-}
-
-static void
-print_driver(driver_t *driver, int indent)
-{
-	if (!driver)
-		return;
-
-	print_driver_short(driver, indent);
-	indentprintf(("Methods:\n"));
-	print_method_list(driver->methods, indent+1);
-	indentprintf(("Operations:\n"));
-	print_device_ops(driver->ops, indent+1);
-}
-
-
-static void
-print_driver_list(driver_list_t drivers, int indent)
-{
-	driver_t *driver;
-
-	for (driver = TAILQ_FIRST(&drivers); driver;
-	     driver = TAILQ_NEXT(driver, link))
-		print_driver(driver, indent);
-}
-
-static void
-print_devclass_short(devclass_t dc, int indent)
-{
-	if ( !dc )
-		return;
-
-	indentprintf(("devclass %s: max units = %d, next unit = %d\n",
-		dc->name, dc->maxunit, dc->nextunit));
-}
-
-static void
-print_devclass(devclass_t dc, int indent)
-{
-	int i;
-
-	if ( !dc )
-		return;
-
-	print_devclass_short(dc, indent);
-	indentprintf(("Drivers:\n"));
-	print_driver_list(dc->drivers, indent+1);
-
-	indentprintf(("Devices:\n"));
-	for (i = 0; i < dc->maxunit; i++)
-		if (dc->devices[i])
-			print_device(dc->devices[i], indent+1);
-}
-
-void
-print_devclass_list_short(void)
-{
-	devclass_t dc;
+    struct driver_module_data* data = (struct driver_module_data*) arg;
+    devclass_t bus_devclass = devclass_find_internal(data->busname, TRUE);
+    int error;
 
-	printf("Short listing of devclasses, drivers & devices:\n");
-	for (dc = TAILQ_FIRST(&devclasses); dc; dc = TAILQ_NEXT(dc, link))
-		print_devclass_short(dc, 0);
-}
+    switch (what) {
+    case MOD_LOAD:
+	if (error = devclass_add_driver(bus_devclass,
+					data->driver))
+	    return error;
+	*data->devclass =
+	    devclass_find_internal(data->driver->name, TRUE);
+	break;
 
-void
-print_devclass_list(void)
-{
-	devclass_t dc;
+    case MOD_UNLOAD:
+	if (error = devclass_delete_driver(bus_devclass,
+					   data->driver))
+	    return error;
+	break;
+    }
 
-	printf("Full listing of devclasses, drivers & devices:\n");
-	for (dc = TAILQ_FIRST(&devclasses); dc; dc = TAILQ_NEXT(dc, link))
-		print_devclass(dc, 0);
+    if (data->chainevh)
+	return data->chainevh(mod, what, data->chainarg);
+    else
+	return 0;
 }
-
-#endif