diff options
Diffstat (limited to 'sys/gnu')
| -rw-r--r-- | sys/gnu/ext2fs/ext2_vfsops.c | 3 | ||||
| -rw-r--r-- | sys/gnu/fs/ext2fs/ext2_vfsops.c | 3 | ||||
| -rw-r--r-- | sys/gnu/i386/isa/dgb.c | 22 | ||||
| -rw-r--r-- | sys/gnu/i386/isa/dgm.c | 23 |
4 files changed, 11 insertions, 40 deletions
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c index 43f8ead..db93539 100644 --- a/sys/gnu/ext2fs/ext2_vfsops.c +++ b/sys/gnu/ext2fs/ext2_vfsops.c @@ -276,8 +276,7 @@ ext2_mount(mp, path, data, ndp, p) vrele(devvp); return (ENOTBLK); } - if (major(devvp->v_rdev) >= nblkdev || - bdevsw(devvp->v_rdev) == NULL) { + if (bdevsw(devvp->v_rdev) == NULL) { vrele(devvp); return (ENXIO); } diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c index 43f8ead..db93539 100644 --- a/sys/gnu/fs/ext2fs/ext2_vfsops.c +++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c @@ -276,8 +276,7 @@ ext2_mount(mp, path, data, ndp, p) vrele(devvp); return (ENOTBLK); } - if (major(devvp->v_rdev) >= nblkdev || - bdevsw(devvp->v_rdev) == NULL) { + if (bdevsw(devvp->v_rdev) == NULL) { vrele(devvp); return (ENXIO); } diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c index b39c89d..e16c979 100644 --- a/sys/gnu/i386/isa/dgb.c +++ b/sys/gnu/i386/isa/dgb.c @@ -1,5 +1,5 @@ /*- - * dgb.c $Id: dgb.c,v 1.48 1999/05/08 07:02:24 phk Exp $ + * dgb.c $Id: dgb.c,v 1.49 1999/05/30 16:51:56 phk Exp $ * * Digiboard driver. * @@ -425,7 +425,10 @@ dgbprobe(dev) int i, v; u_long win_size; /* size of vizible memory window */ int unit=dev->id_unit; + static int once; + if (!once++) + cdevsw_add(&dgb_cdevsw); sc->unit=dev->id_unit; sc->port=dev->id_iobase; @@ -2301,21 +2304,4 @@ disc_optim(tp, t) tp->t_state &= ~TS_CAN_BYPASS_L_RINT; } - -static int dgb_devsw_installed; - -static void -dgb_drvinit(void *unused) -{ - dev_t dev; - - if( ! dgb_devsw_installed ) { - dev = makedev(CDEV_MAJOR, 0); - cdevsw_add(&dev,&dgb_cdevsw, NULL); - dgb_devsw_installed = 1; - } -} - -SYSINIT(dgbdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,dgb_drvinit,NULL) - #endif /* NDGB > 0 */ diff --git a/sys/gnu/i386/isa/dgm.c b/sys/gnu/i386/isa/dgm.c index 5f3ff63..6fa36ba 100644 --- a/sys/gnu/i386/isa/dgm.c +++ b/sys/gnu/i386/isa/dgm.c @@ -1,5 +1,5 @@ /*- - * $Id: dgm.c,v 1.13 1999/05/08 07:02:25 phk Exp $ + * $Id: dgm.c,v 1.14 1999/05/30 16:51:58 phk Exp $ * * This driver and the associated header files support the ISA PC/Xem * Digiboards. Its evolutionary roots are described below. @@ -397,6 +397,10 @@ dgmprobe(dev) struct dgm_softc *sc= &dgm_softc[dev->id_unit]; int i, v; int unit=dev->id_unit; + static int once; + + if (!once++) + cdevsw_add(&dgm_cdevsw); sc->unit=dev->id_unit; sc->port=dev->id_iobase; @@ -2105,21 +2109,4 @@ disc_optim(tp, t) tp->t_state &= ~TS_CAN_BYPASS_L_RINT; } - -static int dgm_devsw_installed; - -static void -dgm_drvinit(void *unused) -{ - dev_t dev; - - if( ! dgm_devsw_installed ) { - dev = makedev(CDEV_MAJOR, 0); - cdevsw_add(&dev,&dgm_cdevsw, NULL); - dgm_devsw_installed = 1; - } -} - -SYSINIT(dgmdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,dgm_drvinit,NULL) - #endif /* NDGM > 0 */ |
