From cba8a5ddd3421596e3d16893e35ff5bc8a0e380e Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Tue, 23 Jul 1996 21:52:43 +0000 Subject: 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 :-) --- sys/dev/mcd/mcd.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'sys/dev/mcd') diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c index 3c10a16881e1c..c16c004722560 100644 --- a/sys/dev/mcd/mcd.c +++ b/sys/dev/mcd/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; } } -- cgit v1.3