d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split the initialization of the cdevsw into a separate function.

Browse Source
This commit is contained in:
Poul-Henning Kamp 2004-02-15 10:35:33 +00:00
parent 96cf36028e
commit 2a3faf2fbd
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=125846
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/kern/kern_conf.c
View File

@ -325,16 +325,11 @@ makeudev(int x, int y)
return ((x << 8) | y);
}
dev_t
make_dev(struct cdevsw *devsw, int minor, uid_t uid, gid_t gid, int perms, const char *fmt, ...)
static void
prep_cdevsw(struct cdevsw *devsw)
{
dev_t dev;
va_list ap;
int i;
KASSERT((minor & ~0xffff00ff) == 0,
("Invalid minor (0x%x) in make_dev", minor));
if (devsw->d_open == NULL) devsw->d_open = null_open;
if (devsw->d_close == NULL) devsw->d_close = null_close;
if (devsw->d_read == NULL) devsw->d_read = no_read;
@ -365,7 +360,19 @@ make_dev(struct cdevsw *devsw, int minor, uid_t uid, gid_t gid, int perms, const
reserved_majors[devsw->d_maj] = devsw->d_maj;
}
}
}
dev_t
make_dev(struct cdevsw *devsw, int minor, uid_t uid, gid_t gid, int perms, const char *fmt, ...)
{
dev_t dev;
va_list ap;
int i;
KASSERT((minor & ~0xffff00ff) == 0,
("Invalid minor (0x%x) in make_dev", minor));
prep_cdevsw(devsw);
dev = makedev(devsw->d_maj, minor);
if (dev->si_flags & SI_CHEAPCLONE &&
dev->si_flags & SI_NAMED &&