diff options
author | phk <phk@FreeBSD.org> | 2005-01-29 16:50:04 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2005-01-29 16:50:04 +0000 |
commit | 237e3ac2e92ccb019632944daf987795322d4090 (patch) | |
tree | a950aeb47ffba07aa36aefea75dce8b9c92e813c /sys/kern/kern_conf.c | |
parent | 1a5ece93a12777fe7b10a79d14f37529eb9ecdb5 (diff) | |
download | FreeBSD-src-237e3ac2e92ccb019632944daf987795322d4090.zip FreeBSD-src-237e3ac2e92ccb019632944daf987795322d4090.tar.gz |
Use MAXMINOR
Diffstat (limited to 'sys/kern/kern_conf.c')
-rw-r--r-- | sys/kern/kern_conf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index 5b67f91..5575e6b 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -252,7 +252,7 @@ minor(struct cdev *x) { if (x == NULL) return NODEV; - return(x->si_udev & 0xffff00ff); + return(x->si_udev & MAXMINOR); } int @@ -268,7 +268,7 @@ int minor2unit(int _minor) { - KASSERT((_minor & 0xff00) == 0, ("Illegal minor %x", _minor)); + KASSERT((_minor & ~MAXMINOR) == 0, ("Illegal minor %x", _minor)); return ((_minor & 0xff) | (_minor >> 8)); } @@ -351,13 +351,13 @@ findcdev(dev_t udev) int uminor(dev_t dev) { - return (dev & 0xffff00ff); + return (dev & MAXMINOR); } int umajor(dev_t dev) { - return ((dev & 0xff00) >> 8); + return ((dev & ~MAXMINOR) >> 8); } static void @@ -455,7 +455,7 @@ make_dev(struct cdevsw *devsw, int minornr, uid_t uid, gid_t gid, int perms, con va_list ap; int i; - KASSERT((minornr & ~0xffff00ff) == 0, + KASSERT((minornr & ~MAXMINOR) == 0, ("Invalid minor (0x%x) in make_dev", minornr)); if (!(devsw->d_flags & D_INIT)) |