diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2000-08-29 16:29:02 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2000-08-29 16:29:02 +0000 |
| commit | a6b1634eb2fe66b140e841df681393291bcae452 (patch) | |
| tree | e4eb108fac77b4c80b57cbf6fd3514c1303f0661 | |
| parent | 7c438dbe9c2fe3a31914032aa6a8c92071d0ae35 (diff) | |
Notes
| -rw-r--r-- | sys/dev/ccd/ccd.c | 40 | ||||
| -rw-r--r-- | sys/geom/geom_ccd.c | 40 |
2 files changed, 64 insertions, 16 deletions
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c index 5a478f71abec..0dd13fb6424b 100644 --- a/sys/dev/ccd/ccd.c +++ b/sys/dev/ccd/ccd.c @@ -87,6 +87,7 @@ * Moffett Field, CA 94035 */ +#include "opt_devfs.h" #include "ccd.h" #include <sys/param.h> @@ -108,6 +109,10 @@ #include <sys/ccdvar.h> +#ifdef DEVFS +#include <sys/eventhandler.h> +#include <fs/devfs/devfs.h> +#endif #if defined(CCDDEBUG) && !defined(DEBUG) #define DEBUG @@ -284,6 +289,29 @@ putccdbuf(struct ccdbuf *cbp) #define CCD_OFFSET 16 #endif +#ifdef DEVFS +static void +ccd_clone(void *arg, char *name, int namelen, dev_t *dev) +{ + int i, u; + char *s; + + if (*dev != NODEV) + return; + i = devfs_stdclone(name, &s, "ccd", &u); + if (i != 2) + return; + if (u >= numccd) + return; + if (*s <= 'a' || *s >= 'h') + return; + if (s[1] != '\0') + return; + *dev = make_dev(&ccd_cdevsw, u * 8 + *s - 'a', + UID_ROOT, GID_OPERATOR, 0640, name); +} +#endif DEVFS + /* * Called by main() during pseudo-device attachment. All we need * to do is allocate enough space for devices to be configured later, and @@ -318,8 +346,11 @@ ccdattach() cdevsw_add(&ccd_cdevsw); /* XXX: is this necessary? */ - for (i = 0; i < numccd; ++i) + for (i = 0; i < numccd; ++i) ccddevs[i].ccd_dk = -1; +#ifdef DEVFS + EVENTHANDLER_REGISTER(devfs_clone, ccd_clone, 0, 1000); +#endif } static int @@ -1704,10 +1735,3 @@ printiinfo(ii) } } #endif - - -/* Local Variables: */ -/* c-argdecl-indent: 8 */ -/* c-continued-statement-offset: 8 */ -/* c-indent-level: 8 */ -/* End: */ diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c index 5a478f71abec..0dd13fb6424b 100644 --- a/sys/geom/geom_ccd.c +++ b/sys/geom/geom_ccd.c @@ -87,6 +87,7 @@ * Moffett Field, CA 94035 */ +#include "opt_devfs.h" #include "ccd.h" #include <sys/param.h> @@ -108,6 +109,10 @@ #include <sys/ccdvar.h> +#ifdef DEVFS +#include <sys/eventhandler.h> +#include <fs/devfs/devfs.h> +#endif #if defined(CCDDEBUG) && !defined(DEBUG) #define DEBUG @@ -284,6 +289,29 @@ putccdbuf(struct ccdbuf *cbp) #define CCD_OFFSET 16 #endif +#ifdef DEVFS +static void +ccd_clone(void *arg, char *name, int namelen, dev_t *dev) +{ + int i, u; + char *s; + + if (*dev != NODEV) + return; + i = devfs_stdclone(name, &s, "ccd", &u); + if (i != 2) + return; + if (u >= numccd) + return; + if (*s <= 'a' || *s >= 'h') + return; + if (s[1] != '\0') + return; + *dev = make_dev(&ccd_cdevsw, u * 8 + *s - 'a', + UID_ROOT, GID_OPERATOR, 0640, name); +} +#endif DEVFS + /* * Called by main() during pseudo-device attachment. All we need * to do is allocate enough space for devices to be configured later, and @@ -318,8 +346,11 @@ ccdattach() cdevsw_add(&ccd_cdevsw); /* XXX: is this necessary? */ - for (i = 0; i < numccd; ++i) + for (i = 0; i < numccd; ++i) ccddevs[i].ccd_dk = -1; +#ifdef DEVFS + EVENTHANDLER_REGISTER(devfs_clone, ccd_clone, 0, 1000); +#endif } static int @@ -1704,10 +1735,3 @@ printiinfo(ii) } } #endif - - -/* Local Variables: */ -/* c-argdecl-indent: 8 */ -/* c-continued-statement-offset: 8 */ -/* c-indent-level: 8 */ -/* End: */ |