1995-10-02 09:24:44 +00:00
|
|
|
/*-
|
|
|
|
* Parts Copyright (c) 1995 Terrence R. Lambert
|
|
|
|
* Copyright (c) 1995 Julian R. Elischer
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
|
|
* must display the following acknowledgement:
|
|
|
|
* This product includes software developed by Terrence R. Lambert.
|
|
|
|
* 4. The name Terrence R. Lambert may not be used to endorse or promote
|
|
|
|
* products derived from this software without specific prior written
|
|
|
|
* permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY Julian R. Elischer ``AS IS'' AND ANY
|
|
|
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE TERRENCE R. LAMBERT BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*
|
1999-07-04 14:58:56 +00:00
|
|
|
* $Id: kern_conf.c,v 1.46 1999/07/03 08:22:30 phk Exp $
|
1995-10-02 09:24:44 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <sys/param.h>
|
1995-10-02 10:15:40 +00:00
|
|
|
#include <sys/systm.h>
|
1998-06-07 17:13:14 +00:00
|
|
|
#include <sys/module.h>
|
1995-10-02 09:24:44 +00:00
|
|
|
#include <sys/conf.h>
|
1995-12-21 20:09:46 +00:00
|
|
|
#include <sys/vnode.h>
|
|
|
|
|
1999-05-31 11:29:30 +00:00
|
|
|
#define cdevsw_ALLOCSTART (NUMCDEVSW/2)
|
1995-12-21 20:09:46 +00:00
|
|
|
|
1999-05-31 11:29:30 +00:00
|
|
|
struct cdevsw *cdevsw[NUMCDEVSW];
|
1995-12-21 20:09:46 +00:00
|
|
|
|
1999-05-31 11:29:30 +00:00
|
|
|
int bmaj2cmaj[NUMCDEVSW];
|
1999-05-07 10:11:40 +00:00
|
|
|
|
1995-12-21 20:09:46 +00:00
|
|
|
/*
|
|
|
|
* Routine to convert from character to block device number.
|
|
|
|
*
|
|
|
|
* A minimal stub routine can always return NODEV.
|
|
|
|
*/
|
|
|
|
dev_t
|
|
|
|
chrtoblk(dev_t dev)
|
|
|
|
{
|
|
|
|
struct cdevsw *cd;
|
|
|
|
|
1999-05-08 06:40:31 +00:00
|
|
|
if((cd = devsw(dev)) != NULL) {
|
1998-07-04 22:30:26 +00:00
|
|
|
if (cd->d_bmaj != -1)
|
|
|
|
return(makedev(cd->d_bmaj,minor(dev)));
|
1995-12-21 20:09:46 +00:00
|
|
|
}
|
|
|
|
return(NODEV);
|
|
|
|
}
|
1995-10-02 09:24:44 +00:00
|
|
|
|
1999-05-31 11:29:30 +00:00
|
|
|
struct cdevsw *
|
|
|
|
devsw(dev_t dev)
|
|
|
|
{
|
|
|
|
return(cdevsw[major(dev)]);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct cdevsw *
|
|
|
|
bdevsw(dev_t dev)
|
|
|
|
{
|
|
|
|
struct cdevsw *c;
|
|
|
|
int i = major(dev);
|
|
|
|
|
|
|
|
if (bmaj2cmaj[i] == 254)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
c = cdevsw[bmaj2cmaj[major(dev)]];
|
|
|
|
if (!c) {
|
|
|
|
printf("bogus bdev dev_t %p, no cdev\n", (void *)dev);
|
|
|
|
Debugger("Bummer");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
/* CMAJ zero is the console, which has no strategy so this works */
|
|
|
|
if (c->d_strategy)
|
|
|
|
return (c);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Add a cdevsw entry
|
|
|
|
*/
|
|
|
|
|
1998-07-04 22:30:26 +00:00
|
|
|
int
|
1999-05-31 11:29:30 +00:00
|
|
|
cdevsw_add(struct cdevsw *newentry)
|
1996-07-23 21:52:43 +00:00
|
|
|
{
|
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).
1999-05-11 19:55:07 +00:00
|
|
|
int i;
|
|
|
|
static int setup;
|
|
|
|
|
|
|
|
if (!setup) {
|
1999-05-31 11:29:30 +00:00
|
|
|
for (i = 0; i < NUMCDEVSW; i++)
|
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).
1999-05-11 19:55:07 +00:00
|
|
|
if (!bmaj2cmaj[i])
|
|
|
|
bmaj2cmaj[i] = 254;
|
|
|
|
setup++;
|
|
|
|
}
|
1998-07-04 22:30:26 +00:00
|
|
|
|
1999-05-31 11:29:30 +00:00
|
|
|
if (newentry->d_maj < 0 || newentry->d_maj >= NUMCDEVSW) {
|
|
|
|
printf("%s: ERROR: driver has bogus cdevsw->d_maj = %d\n",
|
|
|
|
newentry->d_name, newentry->d_maj);
|
|
|
|
return EINVAL;
|
1998-07-04 22:30:26 +00:00
|
|
|
}
|
1996-07-23 21:52:43 +00:00
|
|
|
|
1999-07-03 08:22:30 +00:00
|
|
|
if (cdevsw[newentry->d_maj]) {
|
|
|
|
printf("WARNING: \"%s\" is usurping \"%s\"'s cdevsw[]\n",
|
|
|
|
newentry->d_name, cdevsw[newentry->d_maj]->d_name);
|
|
|
|
}
|
1999-05-31 11:29:30 +00:00
|
|
|
cdevsw[newentry->d_maj] = newentry;
|
|
|
|
|
1999-07-03 08:22:30 +00:00
|
|
|
if (newentry->d_bmaj >= 0 && newentry->d_bmaj < NUMCDEVSW) {
|
|
|
|
if (bmaj2cmaj[newentry->d_bmaj] != 254) {
|
|
|
|
printf("WARNING: \"%s\" is usurping \"%s\"'s bmaj\n",
|
|
|
|
newentry->d_name,
|
|
|
|
cdevsw[bmaj2cmaj[newentry->d_bmaj]]->d_name);
|
|
|
|
}
|
1999-05-31 11:29:30 +00:00
|
|
|
bmaj2cmaj[newentry->d_bmaj] = newentry->d_maj;
|
1999-07-03 08:22:30 +00:00
|
|
|
}
|
1998-07-04 22:30:26 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
1999-06-25 07:49:01 +00:00
|
|
|
/*
|
|
|
|
* Remove a cdevsw entry
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
|
|
|
cdevsw_remove(struct cdevsw *oldentry)
|
|
|
|
{
|
|
|
|
if (oldentry->d_maj < 0 || oldentry->d_maj >= NUMCDEVSW) {
|
|
|
|
printf("%s: ERROR: driver has bogus cdevsw->d_maj = %d\n",
|
|
|
|
oldentry->d_name, oldentry->d_maj);
|
|
|
|
return EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
cdevsw[oldentry->d_maj] = NULL;
|
|
|
|
|
|
|
|
if (oldentry->d_bmaj >= 0 && oldentry->d_bmaj < NUMCDEVSW)
|
|
|
|
bmaj2cmaj[oldentry->d_bmaj] = NULL;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
1998-06-07 17:13:14 +00:00
|
|
|
int
|
1999-05-07 10:11:40 +00:00
|
|
|
devsw_module_handler(module_t mod, int what, void* arg)
|
1998-06-07 17:13:14 +00:00
|
|
|
{
|
1999-05-07 10:11:40 +00:00
|
|
|
struct devsw_module_data* data = (struct devsw_module_data*) arg;
|
1999-06-26 11:39:27 +00:00
|
|
|
int error = 0;
|
1998-06-07 17:13:14 +00:00
|
|
|
|
|
|
|
switch (what) {
|
|
|
|
case MOD_LOAD:
|
1999-05-31 11:29:30 +00:00
|
|
|
error = cdevsw_add(data->cdevsw);
|
1999-03-23 21:11:47 +00:00
|
|
|
if (!error && data->chainevh)
|
|
|
|
error = data->chainevh(mod, what, data->chainarg);
|
|
|
|
return error;
|
1998-06-07 17:13:14 +00:00
|
|
|
|
|
|
|
case MOD_UNLOAD:
|
1999-03-23 21:11:47 +00:00
|
|
|
if (data->chainevh) {
|
|
|
|
error = data->chainevh(mod, what, data->chainarg);
|
|
|
|
if (error)
|
|
|
|
return error;
|
|
|
|
}
|
1999-06-26 11:39:27 +00:00
|
|
|
cdevsw_remove(data->cdevsw);
|
1999-03-23 21:11:47 +00:00
|
|
|
return error;
|
1998-06-07 17:13:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (data->chainevh)
|
|
|
|
return data->chainevh(mod, what, data->chainarg);
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
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).
1999-05-11 19:55:07 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* dev_t and u_dev_t primitives
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define DEVT_FASCIST 1
|
|
|
|
|
|
|
|
int
|
|
|
|
major(dev_t x)
|
|
|
|
{
|
1999-05-12 13:06:34 +00:00
|
|
|
uintptr_t i = (uintptr_t)x;
|
1999-05-12 11:06:56 +00:00
|
|
|
|
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).
1999-05-11 19:55:07 +00:00
|
|
|
#ifdef DEVT_FASCIST
|
1999-05-18 13:14:43 +00:00
|
|
|
return(255 - ((i >> 8) & 0xff));
|
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).
1999-05-11 19:55:07 +00:00
|
|
|
#else
|
1999-05-12 11:06:56 +00:00
|
|
|
return((i >> 8) & 0xff);
|
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).
1999-05-11 19:55:07 +00:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
minor(dev_t x)
|
|
|
|
{
|
1999-05-12 13:06:34 +00:00
|
|
|
uintptr_t i = (uintptr_t)x;
|
1999-05-12 11:06:56 +00:00
|
|
|
|
|
|
|
return(i & 0xffff00ff);
|
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).
1999-05-11 19:55:07 +00:00
|
|
|
}
|
|
|
|
|
1999-06-01 18:56:26 +00:00
|
|
|
dev_t
|
|
|
|
makebdev(int x, int y)
|
|
|
|
{
|
|
|
|
return (makedev(x, y));
|
|
|
|
}
|
|
|
|
|
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).
1999-05-11 19:55:07 +00:00
|
|
|
dev_t
|
|
|
|
makedev(int x, int y)
|
|
|
|
{
|
|
|
|
#ifdef DEVT_FASCIST
|
1999-06-26 11:39:27 +00:00
|
|
|
return ((dev_t)(uintptr_t) (((255 - x) << 8) | y));
|
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).
1999-05-11 19:55:07 +00:00
|
|
|
#else
|
1999-06-26 11:39:27 +00:00
|
|
|
return ((dev_t)(uintptr_t) ((x << 8) | y));
|
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).
1999-05-11 19:55:07 +00:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
udev_t
|
|
|
|
dev2udev(dev_t x)
|
|
|
|
{
|
|
|
|
return umakedev(major(x), minor(x));
|
|
|
|
}
|
|
|
|
|
|
|
|
dev_t
|
|
|
|
udev2dev(udev_t x, int b)
|
|
|
|
{
|
|
|
|
return makedev(umajor(x), uminor(x));
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
uminor(udev_t dev)
|
|
|
|
{
|
|
|
|
return(dev & 0xffff00ff);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
umajor(udev_t dev)
|
|
|
|
{
|
|
|
|
return((dev & 0xff00) >> 8);
|
|
|
|
}
|
|
|
|
|
|
|
|
udev_t
|
|
|
|
umakedev(int x, int y)
|
|
|
|
{
|
|
|
|
return ((x << 8) | y);
|
|
|
|
}
|
|
|
|
|