diff options
Diffstat (limited to 'sys/i386/isa')
-rw-r--r-- | sys/i386/isa/fd.c | 16 | ||||
-rw-r--r-- | sys/i386/isa/matcd/matcd.c | 18 | ||||
-rw-r--r-- | sys/i386/isa/mcd.c | 16 | ||||
-rw-r--r-- | sys/i386/isa/scd.c | 17 | ||||
-rw-r--r-- | sys/i386/isa/wcd.c | 14 | ||||
-rw-r--r-- | sys/i386/isa/wd.c | 17 | ||||
-rw-r--r-- | sys/i386/isa/wt.c | 17 |
7 files changed, 20 insertions, 95 deletions
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c index 9f37832..ac20996 100644 --- a/sys/i386/isa/fd.c +++ b/sys/i386/isa/fd.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.89 1996/05/03 20:15:11 phk Exp $ + * $Id: fd.c,v 1.90 1996/07/12 07:40:59 bde Exp $ * */ @@ -64,7 +64,6 @@ #include <machine/clock.h> #include <machine/ioctl_fd.h> #include <sys/disklabel.h> -#include <sys/diskslice.h> #include <sys/buf.h> #include <sys/uio.h> #include <sys/malloc.h> @@ -348,16 +347,11 @@ static d_strategy_t fdstrategy; #define CDEV_MAJOR 9 #define BDEV_MAJOR 2 -extern struct cdevsw fd_cdevsw; +static struct cdevsw fd_cdevsw; static struct bdevsw fd_bdevsw = { Fdopen, fdclose, fdstrategy, fdioctl, /*2*/ nodump, nopsize, 0, "fd", &fd_cdevsw, -1 }; -static struct cdevsw fd_cdevsw = - { Fdopen, fdclose, rawread, rawwrite, /*9*/ - fdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, fdstrategy, "fd", - &fd_bdevsw, -1 }; static struct isa_device *fdcdevs[NFDC]; @@ -1971,13 +1965,9 @@ static fd_devsw_installed = 0; static void fd_drvinit(void *notused ) { - dev_t dev; if( ! fd_devsw_installed ) { - dev = makedev(CDEV_MAJOR, 0); - cdevsw_add(&dev,&fd_cdevsw, NULL); - dev = makedev(BDEV_MAJOR, 0); - bdevsw_add(&dev,&fd_bdevsw, NULL); + bdevsw_add_generic(BDEV_MAJOR,CDEV_MAJOR, &fd_bdevsw); fd_devsw_installed = 1; } } diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c index 362acda..70c0a12 100644 --- a/sys/i386/isa/matcd/matcd.c +++ b/sys/i386/isa/matcd/matcd.c @@ -337,7 +337,7 @@ static char MATCDVERSION[]="Version 1(26) 18-Oct-95"; static char MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank Durda IV"; /* The proceeding strings may not be changed*/ -/* $Id: matcd.c,v 1.17 1996/05/03 16:49:14 phk Exp $ */ +/* $Id: matcd.c,v 1.18 1996/06/08 09:17:51 bde Exp $ */ /*--------------------------------------------------------------------------- Include declarations @@ -534,20 +534,12 @@ static d_strategy_t matcdstrategy; #define CDEV_MAJOR 46 #define BDEV_MAJOR 17 -extern struct cdevsw matcd_cdevsw; +static struct cdevsw matcd_cdevsw; static struct bdevsw matcd_bdevsw = { matcdopen, matcdclose, matcdstrategy, matcdioctl, /*17*/ nodump, matcdsize, 0, "matcd", &matcd_cdevsw, -1 }; -static struct cdevsw matcd_cdevsw = - { matcdopen, matcdclose, rawread, nowrite, /*46*/ - matcdioctl, nostop, nullreset, nodevtotty,/* SB cd */ - seltrue, nommap, matcdstrategy, "matcd", - &matcd_bdevsw, -1}; - - - /*--------------------------------------------------------------------------- Internal function declarations ---------------------------------------------------------------------------*/ @@ -2689,13 +2681,9 @@ static matcd_devsw_installed = 0; static void matcd_drvinit(void *unused) { - dev_t dev; if( ! matcd_devsw_installed ) { - dev = makedev(CDEV_MAJOR,0); - cdevsw_add(&dev,&matcd_cdevsw,NULL); - dev = makedev(BDEV_MAJOR,0); - bdevsw_add(&dev,&matcd_bdevsw,NULL); + bdevsw_add_generic(BDEV_MAJOR,CDEV_MAJOR, &matcd_bdevsw); matcd_devsw_installed = 1; } } diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c index 3c10a16..c16c004 100644 --- a/sys/i386/isa/mcd.c +++ b/sys/i386/isa/mcd.c @@ -40,7 +40,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mcd.c,v 1.80 1996/06/12 05:03:47 gpalmer Exp $ + * $Id: mcd.c,v 1.81 1996/06/18 01:22:27 bde Exp $ */ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -220,17 +220,11 @@ static d_strategy_t mcdstrategy; #define CDEV_MAJOR 29 #define BDEV_MAJOR 7 -extern struct cdevsw mcd_cdevsw; +static struct cdevsw mcd_cdevsw; static struct bdevsw mcd_bdevsw = { mcdopen, mcdclose, mcdstrategy, mcdioctl, /*7*/ nodump, mcdsize, 0, "mcd", &mcd_cdevsw, -1 }; -static struct cdevsw mcd_cdevsw = - { mcdopen, mcdclose, rawread, nowrite, /*29*/ - mcdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, mcdstrategy, "mcd", - &mcd_bdevsw, -1 }; - #define mcd_put(port,byte) outb(port,byte) #define MCD_RETRYS 5 @@ -1816,13 +1810,9 @@ static mcd_devsw_installed = 0; static void mcd_drvinit(void *unused) { - dev_t dev; if( ! mcd_devsw_installed ) { - dev = makedev(CDEV_MAJOR,0); - cdevsw_add(&dev,&mcd_cdevsw,NULL); - dev = makedev(BDEV_MAJOR,0); - bdevsw_add(&dev,&mcd_bdevsw,NULL); + bdevsw_add_generic(BDEV_MAJOR,CDEV_MAJOR, &mcd_bdevsw); mcd_devsw_installed = 1; } } diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c index df219c7..454cd5b 100644 --- a/sys/i386/isa/scd.c +++ b/sys/i386/isa/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; } } diff --git a/sys/i386/isa/wcd.c b/sys/i386/isa/wcd.c index 2723204..ea04098 100644 --- a/sys/i386/isa/wcd.c +++ b/sys/i386/isa/wcd.c @@ -47,17 +47,11 @@ static d_strategy_t wcdstrategy; #define CDEV_MAJOR 69 #define BDEV_MAJOR 19 -extern struct cdevsw wcd_cdevsw; +static struct cdevsw wcd_cdevsw; static struct bdevsw wcd_bdevsw = { wcdbopen, wcdbclose, wcdstrategy, wcdioctl, /*19*/ nodump, nopsize, 0, "wcd", &wcd_cdevsw, -1 }; -static struct cdevsw wcd_cdevsw = - { wcdropen, wcdrclose, rawread, nowrite, /*69*/ - wcdioctl, nostop, nullreset, nodevtotty,/* atapi */ - seltrue, nommap, wcdstrategy, "wcd", - &wcd_bdevsw, -1 }; - #ifndef ATAPI_STATIC static #endif @@ -1232,13 +1226,9 @@ static wcd_devsw_installed = 0; static void wcd_drvinit(void *unused) { - dev_t dev; if( ! wcd_devsw_installed ) { - dev = makedev(CDEV_MAJOR, 0); - cdevsw_add(&dev,&wcd_cdevsw, NULL); - dev = makedev(BDEV_MAJOR, 0); - bdevsw_add(&dev,&wcd_bdevsw, NULL); + bdevsw_add_generic(BDEV_MAJOR,CDEV_MAJOR, &wcd_bdevsw); wcd_devsw_installed = 1; } } diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c index 958c51e..09ae4f0 100644 --- a/sys/i386/isa/wd.c +++ b/sys/i386/isa/wd.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.110 1996/06/12 05:03:51 gpalmer Exp $ + * $Id: wd.c,v 1.111 1996/07/21 09:28:50 phk Exp $ */ /* TODO: @@ -318,18 +318,11 @@ static d_psize_t wdsize; #define CDEV_MAJOR 3 #define BDEV_MAJOR 0 -extern struct cdevsw wd_cdevsw; +static struct cdevsw wd_cdevsw; static struct bdevsw wd_bdevsw = { wdopen, wdclose, wdstrategy, wdioctl, /*0*/ wddump, wdsize, 0, "wd", &wd_cdevsw, -1 }; -static struct cdevsw wd_cdevsw = - { wdopen, wdclose, rawread, rawwrite, /*3*/ - wdioctl, nostop, nullreset, nodevtotty,/* wd */ - seltrue, nommap, wdstrategy, "wd", - &wd_bdevsw, -1 }; - - /* * Probe for controller. */ @@ -2167,13 +2160,9 @@ static wd_devsw_installed = 0; static void wd_drvinit(void *unused) { - dev_t dev; if( ! wd_devsw_installed ) { - dev = makedev(CDEV_MAJOR,0); - cdevsw_add(&dev,&wd_cdevsw,NULL); - dev = makedev(BDEV_MAJOR,0); - bdevsw_add(&dev,&wd_bdevsw,NULL); + bdevsw_add_generic(BDEV_MAJOR,CDEV_MAJOR, &wd_bdevsw); wd_devsw_installed = 1; } } diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c index dc4e6c9..2b4c792 100644 --- a/sys/i386/isa/wt.c +++ b/sys/i386/isa/wt.c @@ -20,7 +20,7 @@ * the original CMU copyright notice. * * Version 1.3, Thu Nov 11 12:09:13 MSK 1993 - * $Id: wt.c,v 1.31 1996/03/28 14:28:55 scrappy Exp $ + * $Id: wt.c,v 1.32 1996/04/08 19:40:57 smpatel Exp $ * */ @@ -208,18 +208,11 @@ static d_strategy_t wtstrategy; #define CDEV_MAJOR 10 #define BDEV_MAJOR 3 -extern struct cdevsw wt_cdevsw; +static struct cdevsw wt_cdevsw; static struct bdevsw wt_bdevsw = { wtopen, wtclose, wtstrategy, wtioctl, /*3*/ wtdump, wtsize, B_TAPE, "wt", &wt_cdevsw, -1 }; -static struct cdevsw wt_cdevsw = - { wtopen, wtclose, rawread, rawwrite, /*10*/ - wtioctl, nostop, nullreset, nodevtotty,/* wt */ - seltrue, nommap, wtstrategy, "wt", - &wt_bdevsw, -1 }; - - static inline void wt_registerdev(struct isa_device *id) { @@ -1017,13 +1010,9 @@ static wt_devsw_installed = 0; static void wt_drvinit(void *unused) { - dev_t dev; if( ! wt_devsw_installed ) { - dev = makedev(CDEV_MAJOR, 0); - cdevsw_add(&dev,&wt_cdevsw, NULL); - dev = makedev(BDEV_MAJOR, 0); - bdevsw_add(&dev,&wt_bdevsw, NULL); + bdevsw_add_generic(BDEV_MAJOR,CDEV_MAJOR, &wt_bdevsw); wt_devsw_installed = 1; } } |