28c28
< __FBSDID("$FreeBSD: head/sys/kern/kern_conf.c 130585 2004-06-16 09:47:26Z phk $");
---
> __FBSDID("$FreeBSD: head/sys/kern/kern_conf.c 130640 2004-06-17 17:16:53Z phk $");
54c54
< * udev_t's show that a prime halfway between two powers of two works
---
> * dev_t's show that a prime halfway between two powers of two works
72a73
> static struct cdev *newdev(int x, int y);
73a75
>
128,129d129
< static struct cdev *makedev(int x, int y);
<
250,251c250,251
< if (x == NODEV)
< return NOUDEV;
---
> if (x == NULL)
> return NODEV;
258,259c258,259
< if (x == NODEV)
< return NOUDEV;
---
> if (x == NULL)
> return NODEV;
268,269c268,269
< if (x == NODEV)
< return NOUDEV;
---
> if (x == NULL)
> return NODEV;
307c307
< makedev(int x, int y)
---
> newdev(int x, int y)
310c310
< udev_t udev;
---
> dev_t udev;
313,314c313,314
< if (x == umajor(NOUDEV) && y == uminor(NOUDEV))
< panic("makedev of NOUDEV");
---
> if (x == umajor(NODEV) && y == uminor(NODEV))
> panic("newdev of NODEV");
340c340
< udev_t
---
> dev_t
343,344c343,344
< if (x == NODEV)
< return (NOUDEV);
---
> if (x == NULL)
> return (NODEV);
349c349
< udev2dev(udev_t udev)
---
> findcdev(dev_t udev)
354,355c354,355
< if (udev == NOUDEV)
< return (NODEV);
---
> if (udev == NODEV)
> return (NULL);
361c361
< return (NODEV);
---
> return (NULL);
365c365
< uminor(udev_t dev)
---
> uminor(dev_t dev)
371c371
< umajor(udev_t dev)
---
> umajor(dev_t dev)
376,381d375
< udev_t
< makeudev(int x, int y)
< {
< return ((x << 8) | y);
< }
<
482c476
< dev = makedev(devsw->d_maj, minornr);
---
> dev = newdev(devsw->d_maj, minornr);
753c747
< dev = makedev(csw->d_maj, unit2minor(unit | extra));
---
> dev = newdev(csw->d_maj, unit2minor(unit | extra));
797c791
< udev_t ud;
---
> dev_t ud;
803c797
< if (ud == NOUDEV)
---
> if (ud == NODEV)
805,806c799,800
< dev = udev2dev(ud);
< if (dev == NODEV)
---
> dev = findcdev(ud);
> if (dev == NULL)