diff options
author | phk <phk@FreeBSD.org> | 1999-08-23 20:59:21 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1999-08-23 20:59:21 +0000 |
commit | 663cbe4fc26065f7af7d10faaee492a626156145 (patch) | |
tree | 32e619fadb473bfb85ff8e06044176f2ff323cce /sys/i386/isa/wd_cd.c | |
parent | 2a5ff1f726f814a9e4717afe3f14250f8030cace (diff) | |
download | FreeBSD-src-663cbe4fc26065f7af7d10faaee492a626156145.zip FreeBSD-src-663cbe4fc26065f7af7d10faaee492a626156145.tar.gz |
Convert DEVFS hooks in (most) drivers to make_dev().
Diskslice/label code not yet handled.
Vinum, i4b, alpha, pc98 not dealt with (left to respective Maintainers)
Add the correct hook for devfs to kern_conf.c
The net result of this excercise is that a lot less files depends on DEVFS,
and devtoname() gets more sensible output in many cases.
A few drivers had minor additional cleanups performed relating to cdevsw
registration.
A few drivers don't register a cdevsw{} anymore, but only use make_dev().
Diffstat (limited to 'sys/i386/isa/wd_cd.c')
-rw-r--r-- | sys/i386/isa/wd_cd.c | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/sys/i386/isa/wd_cd.c b/sys/i386/isa/wd_cd.c index 0613e7e..865f82b 100644 --- a/sys/i386/isa/wd_cd.c +++ b/sys/i386/isa/wd_cd.c @@ -25,12 +25,11 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: atapi-cd.c,v 1.19 1999/05/30 16:52:08 phk Exp $ + * $Id: atapi-cd.c,v 1.20 1999/05/31 11:25:51 phk Exp $ */ #include "wdc.h" #include "wcd.h" -#include "opt_devfs.h" #if NWCD > 0 && NWDC > 0 @@ -47,9 +46,6 @@ #include <sys/fcntl.h> #include <sys/conf.h> #include <sys/stat.h> -#ifdef DEVFS -#include <sys/devfsext.h> -#endif #include <i386/isa/atapi.h> #include <i386/isa/atapi-cd.h> @@ -144,24 +140,14 @@ acd_init_lun(struct atapi *ata, int unit, struct atapi_params *ap, int lun, } else ptr->device_stats = device_stats; -#ifdef DEVFS - ptr->ra_devfs_token = - devfs_add_devswf(&acd_cdevsw, dkmakeminor(lun, 0, 0), - DV_CHR, UID_ROOT, GID_OPERATOR, 0640, - "rwcd%da", lun); - ptr->rc_devfs_token = - devfs_add_devswf(&acd_cdevsw, dkmakeminor(lun, 0, RAW_PART), - DV_CHR, UID_ROOT, GID_OPERATOR, 0640, - "rwcd%dc", lun); - ptr->a_devfs_token = - devfs_add_devswf(&acd_cdevsw, dkmakeminor(lun, 0, 0), - DV_BLK, UID_ROOT, GID_OPERATOR, 0640, - "wcd%da", lun); - ptr->c_devfs_token = - devfs_add_devswf(&acd_cdevsw, dkmakeminor(lun, 0, RAW_PART), - DV_BLK, UID_ROOT, GID_OPERATOR, 0640, - "wcd%dc", lun); -#endif + make_dev(&acd_cdevsw, dkmakeminor(lun, 0, 0), + UID_ROOT, GID_OPERATOR, 0640, "rwcd%da", lun); + make_dev(&acd_cdevsw, dkmakeminor(lun, 0, RAW_PART), + UID_ROOT, GID_OPERATOR, 0640, "rwcd%dc", lun); + make_dev(&acd_cdevsw, dkmakeminor(lun, 0, 0), + UID_ROOT, GID_OPERATOR, 0640, "wcd%da", lun); + make_dev(&acd_cdevsw, dkmakeminor(lun, 0, RAW_PART), + UID_ROOT, GID_OPERATOR, 0640, "wcd%dc", lun); return ptr; } |