diff options
author | phk <phk@FreeBSD.org> | 1996-07-23 21:52:43 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1996-07-23 21:52:43 +0000 |
commit | 507c8709748944c310d7a558ec0e27130fadb6f4 (patch) | |
tree | b7107b6c401f05c3026e9bfb11ea285a7b376aba /sys/isa | |
parent | b27f4b2c811818ccd3f03bd1aad99a231b5b2b18 (diff) | |
download | FreeBSD-src-507c8709748944c310d7a558ec0e27130fadb6f4.zip FreeBSD-src-507c8709748944c310d7a558ec0e27130fadb6f4.tar.gz |
Make a "DWIM" function for adding [bc]devsw entries for bdev drivers.
Saves about 280 butes of source per driver, 56 bytes in object size
and another 56 bytes moves from data to bss.
No functional change intended nor expected.
GENERIC should be about one k smaller now :-)
Diffstat (limited to 'sys/isa')
-rw-r--r-- | sys/isa/fd.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/sys/isa/fd.c b/sys/isa/fd.c index 9f37832..ac20996 100644 --- a/sys/isa/fd.c +++ b/sys/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; } } |