diff options
Diffstat (limited to 'sys/dev/scd/scd.c')
| -rw-r--r-- | sys/dev/scd/scd.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c index df219c7db347..454cd5b20c47 100644 --- a/sys/dev/scd/scd.c +++ b/sys/dev/scd/scd.c @@ -41,7 +41,7 @@ */ -/* $Id: scd.c,v 1.22 1996/06/18 01:22:30 bde Exp $ */ +/* $Id: scd.c,v 1.23 1996/07/12 04:11:25 bde Exp $ */ /* Please send any comments to micke@dynas.se */ @@ -194,18 +194,11 @@ static d_strategy_t scdstrategy; #define CDEV_MAJOR 45 #define BDEV_MAJOR 16 -extern struct cdevsw scd_cdevsw; +static struct cdevsw scd_cdevsw; static struct bdevsw scd_bdevsw = { scdopen, scdclose, scdstrategy, scdioctl, /*16*/ nodump, nopsize, 0, "scd", &scd_cdevsw, -1 }; -static struct cdevsw scd_cdevsw = - { scdopen, scdclose, rawread, nowrite, /*45*/ - scdioctl, nostop, nullreset, nodevtotty,/* sony cd */ - seltrue, nommap, scdstrategy, "scd", - &scd_bdevsw, -1 }; - - static struct kern_devconf kdc_scd[NSCD] = { { 0, 0, 0, /* filled in by dev_attach */ "scd", 0, { MDDT_ISA, 0, "bio" }, @@ -1550,13 +1543,9 @@ static scd_devsw_installed = 0; static void scd_drvinit(void *unused) { - dev_t dev; if( ! scd_devsw_installed ) { - dev = makedev(CDEV_MAJOR, 0); - cdevsw_add(&dev,&scd_cdevsw, NULL); - dev = makedev(BDEV_MAJOR, 0); - bdevsw_add(&dev,&scd_bdevsw, NULL); + bdevsw_add_generic(BDEV_MAJOR,CDEV_MAJOR, &scd_bdevsw); scd_devsw_installed = 1; } } |