diff options
author | Poul-Henning Kamp <phk@FreeBSD.org> | 2000-07-03 13:06:29 +0000 |
---|---|---|
committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2000-07-03 13:06:29 +0000 |
commit | 9282307a5dece9060729e4bf621a25fc0afbc9f3 (patch) | |
tree | 10f350c6fa905a06a52a12a9d2e7f83855e7287f /sys/kern/subr_bus.c | |
parent | 3bc7ba9057bc955b414498370079145f58c5c678 (diff) | |
download | src-9282307a5dece9060729e4bf621a25fc0afbc9f3.tar.gz src-9282307a5dece9060729e4bf621a25fc0afbc9f3.zip |
Add device_set_softc() which does the obvious.
Not objected to by: dfr
Notes
Notes:
svn path=/head/; revision=62466
Diffstat (limited to 'sys/kern/subr_bus.c')
-rw-r--r-- | sys/kern/subr_bus.c | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index ec91ca92c40b..7b66e2e70ced 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -855,6 +855,18 @@ device_get_softc(device_t dev) return dev->softc; } +void +device_set_softc(device_t dev, void *softc) +{ + if (dev->softc && !(dev->flags & DF_EXTERNALSOFTC)) + free(dev->softc, M_BUS); + dev->softc = softc; + if (dev->softc) + dev->flags |= DF_EXTERNALSOFTC; + else + dev->flags &= ~DF_EXTERNALSOFTC; +} + void * device_get_ivars(device_t dev) { @@ -976,7 +988,7 @@ device_set_driver(device_t dev, driver_t *driver) if (dev->driver == driver) return 0; - if (dev->softc) { + if (dev->softc && !(dev->flags & DF_EXTERNALSOFTC)) { free(dev->softc, M_BUS); dev->softc = NULL; } @@ -984,13 +996,15 @@ device_set_driver(device_t dev, driver_t *driver) dev->driver = driver; if (driver) { kobj_init((kobj_t) dev, (kobj_class_t) driver); - dev->softc = malloc(driver->size, M_BUS, M_NOWAIT); - if (!dev->softc) { - kobj_init((kobj_t) dev, &null_class); - dev->driver = NULL; - return ENOMEM; + if (!(dev->flags & DF_EXTERNALSOFTC)) { + dev->softc = malloc(driver->size, M_BUS, M_NOWAIT); + if (!dev->softc) { + kobj_init((kobj_t) dev, &null_class); + dev->driver = NULL; + return ENOMEM; + } + bzero(dev->softc, driver->size); } - bzero(dev->softc, driver->size); } else kobj_init((kobj_t) dev, &null_class); return 0; |