summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2002-10-06 23:12:32 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2002-10-06 23:12:32 +0000
commitde3b2766edcbaeae3299fcec745e85fcf919ffa1 (patch)
treeaf1a67c5277dd942bc9c37ebb8ad947d894d5622
parentbb28c1cc5bccba31a1e92e390edcc8add60875f9 (diff)
Remove some '#if 0' cruft.
-rw-r--r--sys/kern/subr_autoconf.c61
-rw-r--r--sys/sys/device.h6
2 files changed, 2 insertions, 65 deletions
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index b83a261c397..7464ec9a111 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_autoconf.c,v 1.31 2002/04/24 21:53:12 espie Exp $ */
+/* $OpenBSD: subr_autoconf.c,v 1.32 2002/10/06 23:12:31 art Exp $ */
/* $NetBSD: subr_autoconf.c,v 1.21 1996/04/04 06:06:18 cgd Exp $ */
/*
@@ -876,62 +876,3 @@ evcnt_attach(dev, name, ev)
strcpy(ev->ev_name, name);
TAILQ_INSERT_TAIL(&allevents, ev, ev_list);
}
-
-#if 0
-int
-attach_loadable(parentname, parentunit, cftable)
- char *parentname;
- int parentunit;
- struct cftable *cftable;
-{
- int found = 0;
- struct device *d;
-
- TAILQ_INSERT_TAIL(&allcftables, cftable, list);
-
- for(d = alldevs.tqh_first; d != NULL; d = d->dv_list.tqe_next) {
- struct cfdriver *drv = d->dv_cfdata->cf_driver;
-
- if (strcmp(parentname, drv->cd_name) == NULL &&
- (parentunit == -1 || parentunit == d->dv_unit)) {
- int s;
-
- s = splhigh(); /* ??? */
- found |= (*d->dv_cfdata->cf_attach->ca_reprobe)(d,
- &(cftable->tab[0]));
- splx(s);
- }
- }
- if (!found)
- TAILQ_REMOVE(&allcftables, cftable, list);
- return(found);
-}
-
-int
-devcf_intable(struct device *, void *);
-
-int
-devcf_intable(dev, arg)
- struct device *dev;
- void *arg;
-{
- struct cftable *tbl = arg;
- struct cfdata *cf;
-
- for(cf = tbl->tab; cf->cf_driver; cf++) {
- if (dev->dv_cfdata == cf)
- return(1);
- }
- return(0);
-}
-
-int
-detach_loadable(cftable)
- struct cftable *cftable;
-{
- if (!detach_devices(devcf_intable, cftable, 0, 0))
- return(0);
- TAILQ_REMOVE(&allcftables, cftable, list);
- return(1);
-}
-#endif
diff --git a/sys/sys/device.h b/sys/sys/device.h
index f2a6d53206b..450ea5f5c1b 100644
--- a/sys/sys/device.h
+++ b/sys/sys/device.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: device.h,v 1.25 2002/09/06 18:12:47 deraadt Exp $ */
+/* $OpenBSD: device.h,v 1.26 2002/10/06 23:12:31 art Exp $ */
/* $NetBSD: device.h,v 1.15 1996/04/09 20:55:24 cgd Exp $ */
/*
@@ -218,10 +218,6 @@ void device_register(struct device *, void *);
/* compatibility definitions */
#define config_found(d, a, p) config_found_sm((d), (a), (p), NULL)
-#if 0
-extern int attach_loadable(char *, int, struct cftable *);
-extern int detach_loadable(struct cftable *);
-#endif
#endif /* _KERNEL */