aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/ccd
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>1999-05-11 19:55:07 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>1999-05-11 19:55:07 +0000
commitbfbb9ce67005673c7b7c8b2267024adef44f7d1d (patch)
tree9ffcbddb82416102ac7aed6b4c9c9b5bf02d13e3 /sys/dev/ccd
parentac9a7ff18c4b3ed2974b52ffccdddff73dfd5cad (diff)
downloadsrc-bfbb9ce67005673c7b7c8b2267024adef44f7d1d.tar.gz
src-bfbb9ce67005673c7b7c8b2267024adef44f7d1d.zip
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).
Notes
Notes: svn path=/head/; revision=47028
Diffstat (limited to 'sys/dev/ccd')
-rw-r--r--sys/dev/ccd/ccd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index c904d6cc6b55..1ff7fd72922e 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -1,4 +1,4 @@
-/* $Id: ccd.c,v 1.45 1999/05/07 07:03:17 phk Exp $ */
+/* $Id: ccd.c,v 1.46 1999/05/07 10:09:42 phk Exp $ */
/* $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ */
@@ -361,7 +361,7 @@ ccdinit(ccd, cpaths, p)
free(cs->sc_cinfo, M_DEVBUF);
return (error);
}
- ci->ci_dev = va.va_rdev;
+ ci->ci_dev = udev2dev(va.va_rdev, 2);
/*
* Get partition information for the component.