diff options
author | phk <phk@FreeBSD.org> | 1999-05-11 19:55:07 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1999-05-11 19:55:07 +0000 |
commit | 7e26ca1d1a4bb6507cb6f9241f2d35b1048eaecd (patch) | |
tree | 31ecebf331e4a644fafb96ecafe7d2b6b1a24d39 /sys/miscfs/devfs | |
parent | c783fdfffac012af2a31c3939b62a23b94680404 (diff) | |
download | FreeBSD-src-7e26ca1d1a4bb6507cb6f9241f2d35b1048eaecd.zip FreeBSD-src-7e26ca1d1a4bb6507cb6f9241f2d35b1048eaecd.tar.gz |
Divorce "dev_t" from the "major|minor" bitmap, which is now called
udev_t in the kernel but still called dev_t in userland.
Provide functions to manipulate both types:
major() umajor()
minor() uminor()
makedev() umakedev()
dev2udev() udev2dev()
For now they're functions, they will become in-line functions
after one of the next two steps in this process.
Return major/minor/makedev to macro-hood for userland.
Register a name in cdevsw[] for the "filedescriptor" driver.
In the kernel the udev_t appears in places where we have the
major/minor number combination, (ie: a potential device: we
may not have the driver nor the device), like in inodes, vattr,
cdevsw registration and so on, whereas the dev_t appears where
we carry around a reference to a actual device.
In the future the cdevsw and the aliased-from vnode will be hung
directly from the dev_t, along with up to two softc pointers for
the device driver and a few houskeeping bits. This will essentially
replace the current "alias" check code (same buck, bigger bang).
A little stunt has been provided to try to catch places where the
wrong type is being used (dev_t vs udev_t), if you see something
not working, #undef DEVT_FASCIST in kern/kern_conf.c and see if
it makes a difference. If it does, please try to track it down
(many hands make light work) or at least try to reproduce it
as simply as possible, and describe how to do that.
Without DEVT_FASCIST I belive this patch is a no-op.
Stylistic/posixoid comments about the userland view of the <sys/*.h>
files welcome now, from userland they now contain the end result.
Next planned step: make all dev_t's refer to the same devsw[] which
means convert BLK's to CHR's at the perimeter of the vnodes and
other places where they enter the game (bootdev, mknod, sysctl).
Diffstat (limited to 'sys/miscfs/devfs')
-rw-r--r-- | sys/miscfs/devfs/devfs_vnops.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c index 55771ec..7dc9476 100644 --- a/sys/miscfs/devfs/devfs_vnops.c +++ b/sys/miscfs/devfs/devfs_vnops.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: devfs_vnops.c,v 1.72 1999/04/28 11:37:15 phk Exp $ + * $Id: devfs_vnops.c,v 1.73 1999/05/06 20:00:27 phk Exp $ */ @@ -411,15 +411,15 @@ DBPRINT(("getattr\n")); switch (file_node->type) { case DEV_DIR: - vap->va_rdev = (dev_t)file_node->dvm; + vap->va_rdev = (udev_t)file_node->dvm; vap->va_mode |= (S_IFDIR); break; case DEV_CDEV: - vap->va_rdev = file_node->by.Cdev.dev; + vap->va_rdev = dev2udev(file_node->by.Cdev.dev); vap->va_mode |= (S_IFCHR); break; case DEV_BDEV: - vap->va_rdev = file_node->by.Bdev.dev; + vap->va_rdev = dev2udev(file_node->by.Bdev.dev); vap->va_mode |= (S_IFBLK); break; case DEV_SLNK: |