diff options
| author | thorpej <thorpej@NetBSD.org> | 1998-01-12 18:03:58 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 1998-01-12 18:03:58 +0000 |
| commit | 2d73f5ea1836b57f73eef870e14aa8e9711c2c32 (patch) | |
| tree | 35fbf808d8cdb7e7df585a83ca8769c162070623 /sys/arch/atari/dev | |
| parent | 85ec3a65c8ce67166ba998184449a141ba639f76 (diff) | |
Update for changes to config.
Diffstat (limited to 'sys/arch/atari/dev')
| -rw-r--r-- | sys/arch/atari/dev/clock.c | 6 | ||||
| -rw-r--r-- | sys/arch/atari/dev/fd.c | 11 | ||||
| -rw-r--r-- | sys/arch/atari/dev/grf.c | 6 | ||||
| -rw-r--r-- | sys/arch/atari/dev/hdfd.c | 10 | ||||
| -rw-r--r-- | sys/arch/atari/dev/ite.c | 6 | ||||
| -rw-r--r-- | sys/arch/atari/dev/ite_cc.c | 6 | ||||
| -rw-r--r-- | sys/arch/atari/dev/ite_et.c | 6 | ||||
| -rw-r--r-- | sys/arch/atari/dev/kbd.c | 7 | ||||
| -rw-r--r-- | sys/arch/atari/dev/lpt.c | 6 | ||||
| -rw-r--r-- | sys/arch/atari/dev/ncr5380.c | 6 | ||||
| -rw-r--r-- | sys/arch/atari/dev/nvram.c | 6 | ||||
| -rw-r--r-- | sys/arch/atari/dev/ser.c | 6 | ||||
| -rw-r--r-- | sys/arch/atari/dev/wd.c | 10 | ||||
| -rw-r--r-- | sys/arch/atari/dev/zs.c | 6 |
14 files changed, 25 insertions, 73 deletions
diff --git a/sys/arch/atari/dev/clock.c b/sys/arch/atari/dev/clock.c index 8ee46e7edf5..f01c3a69744 100644 --- a/sys/arch/atari/dev/clock.c +++ b/sys/arch/atari/dev/clock.c @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.18 1997/02/26 12:26:44 leo Exp $ */ +/* $NetBSD: clock.c,v 1.19 1998/01/12 18:04:01 thorpej Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -101,9 +101,7 @@ struct cfattach clock_ca = { sizeof(struct clock_softc), clockmatch, clockattach }; -struct cfdriver clock_cd = { - NULL, "clock", DV_DULL, NULL, 0 -}; +extern struct cfdriver clock_cd; void statintr __P((struct clockframe)); diff --git a/sys/arch/atari/dev/fd.c b/sys/arch/atari/dev/fd.c index 44b8784a135..49b32b93fd1 100644 --- a/sys/arch/atari/dev/fd.c +++ b/sys/arch/atari/dev/fd.c @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.26 1997/10/08 23:41:17 thorpej Exp $ */ +/* $NetBSD: fd.c,v 1.27 1998/01/12 18:04:03 thorpej Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -241,10 +241,6 @@ struct cfattach fdc_ca = { sizeof(struct device), fdcmatch, fdcattach }; -struct cfdriver fdc_cd = { - NULL, "fdc", DV_DULL, NULL, 0 -}; - static int fdcmatch(pdp, cfp, auxp) struct device *pdp; @@ -261,7 +257,6 @@ fdcattach(pdp, dp, auxp) struct device *pdp, *dp; void *auxp; { - extern struct cfdriver fd_cd; struct fd_softc fdsoftc; int i, nfound, first_found; @@ -327,9 +322,7 @@ struct cfattach fd_ca = { sizeof(struct fd_softc), fdmatch, fdattach }; -struct cfdriver fd_cd = { - NULL, "fd", DV_DISK, NULL, 0 -}; +extern struct cfdriver fd_cd; static int fdmatch(pdp, cfp, auxp) diff --git a/sys/arch/atari/dev/grf.c b/sys/arch/atari/dev/grf.c index ffb3078809c..4449a7d65ca 100644 --- a/sys/arch/atari/dev/grf.c +++ b/sys/arch/atari/dev/grf.c @@ -1,4 +1,4 @@ -/* $NetBSD: grf.c,v 1.20 1997/04/25 19:25:38 leo Exp $ */ +/* $NetBSD: grf.c,v 1.21 1998/01/12 18:04:04 thorpej Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -108,9 +108,7 @@ struct cfattach grfbus_ca = { sizeof(struct device), grfbusmatch, grfbusattach }; -struct cfdriver grfbus_cd = { - NULL, "grfbus", DV_DULL -}; +extern struct cfdriver grfbus_cd; /* * only used in console init. diff --git a/sys/arch/atari/dev/hdfd.c b/sys/arch/atari/dev/hdfd.c index 11847f7e6f7..20785deee13 100644 --- a/sys/arch/atari/dev/hdfd.c +++ b/sys/arch/atari/dev/hdfd.c @@ -1,4 +1,4 @@ -/* $NetBSD: hdfd.c,v 1.8 1997/07/17 01:54:53 jtk Exp $ */ +/* $NetBSD: hdfd.c,v 1.9 1998/01/12 18:04:05 thorpej Exp $ */ /*- * Copyright (c) 1996 Leo Weppelman @@ -169,10 +169,6 @@ struct cfattach fdc_ca = { sizeof(struct fdc_softc), fdcprobe, fdcattach }; -struct cfdriver fdc_cd = { - NULL, "fdc", DV_DULL -}; - /* * Floppies come in various flavors, e.g., 1.2MB vs 1.44MB; here is how * we tell them apart. @@ -245,9 +241,7 @@ struct cfattach hdfd_ca = { sizeof(struct fd_softc), fdprobe, fdattach }; -struct cfdriver hdfd_cd = { - NULL, "hdfd", DV_DISK -}; +extern struct cfdriver hdfd_cd; void fdstrategy __P((struct buf *)); void fdstart __P((struct fd_softc *)); diff --git a/sys/arch/atari/dev/ite.c b/sys/arch/atari/dev/ite.c index 9e8c2795ec8..16a90342b96 100644 --- a/sys/arch/atari/dev/ite.c +++ b/sys/arch/atari/dev/ite.c @@ -1,4 +1,4 @@ -/* $NetBSD: ite.c,v 1.23 1997/06/29 20:30:49 leo Exp $ */ +/* $NetBSD: ite.c,v 1.24 1998/01/12 18:04:06 thorpej Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -141,9 +141,7 @@ struct cfattach ite_ca = { sizeof(struct ite_softc), itematch, iteattach }; -struct cfdriver ite_cd = { - NULL, "ite", DV_DULL, NULL, 0 -}; +extern struct cfdriver ite_cd; int itematch(pdp, cfp, auxp) diff --git a/sys/arch/atari/dev/ite_cc.c b/sys/arch/atari/dev/ite_cc.c index ac10d985e8d..0e4662fa022 100644 --- a/sys/arch/atari/dev/ite_cc.c +++ b/sys/arch/atari/dev/ite_cc.c @@ -1,4 +1,4 @@ -/* $NetBSD: ite_cc.c,v 1.13 1997/07/15 06:48:05 leo Exp $ */ +/* $NetBSD: ite_cc.c,v 1.14 1998/01/12 18:04:08 thorpej Exp $ */ /* * Copyright (c) 1996 Leo Weppelman @@ -119,10 +119,6 @@ struct cfattach grfcc_ca = { sizeof(struct grf_softc), grfccmatch, grfccattach }; -struct cfdriver grfcc_cd = { - NULL, "grfcc", DV_DULL -}; - /* * only used in console init. */ diff --git a/sys/arch/atari/dev/ite_et.c b/sys/arch/atari/dev/ite_et.c index 754de6fe14c..56e585c2148 100644 --- a/sys/arch/atari/dev/ite_et.c +++ b/sys/arch/atari/dev/ite_et.c @@ -1,4 +1,4 @@ -/* $NetBSD: ite_et.c,v 1.7 1997/07/15 06:48:06 leo Exp $ */ +/* $NetBSD: ite_et.c,v 1.8 1998/01/12 18:04:09 thorpej Exp $ */ /* * Copyright (c) 1996 Leo Weppelman. @@ -106,10 +106,6 @@ struct cfattach grfet_ca = { sizeof(struct grf_softc), grfetmatch, grfetattach }; -struct cfdriver grfet_cd = { - NULL, "grfet", DV_DULL -}; - /* * only used in console init. */ diff --git a/sys/arch/atari/dev/kbd.c b/sys/arch/atari/dev/kbd.c index e7e86a60e29..3f3239415dc 100644 --- a/sys/arch/atari/dev/kbd.c +++ b/sys/arch/atari/dev/kbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: kbd.c,v 1.16 1997/06/29 20:30:50 leo Exp $ */ +/* $NetBSD: kbd.c,v 1.17 1998/01/12 18:04:10 thorpej Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -91,11 +91,6 @@ struct cfattach kbd_ca = { sizeof(struct device), kbdmatch, kbdattach }; -struct cfdriver kbd_cd = { - NULL, "kbd", DV_DULL, NULL, 0 -}; - - /*ARGSUSED*/ static int kbdmatch(pdp, cfp, auxp) diff --git a/sys/arch/atari/dev/lpt.c b/sys/arch/atari/dev/lpt.c index 7182059c0e6..8c40d83d285 100644 --- a/sys/arch/atari/dev/lpt.c +++ b/sys/arch/atari/dev/lpt.c @@ -1,4 +1,4 @@ -/* $NetBSD: lpt.c,v 1.11 1997/07/30 15:43:37 leo Exp $ */ +/* $NetBSD: lpt.c,v 1.12 1998/01/12 18:04:11 thorpej Exp $ */ /* * Copyright (c) 1996 Leo Weppelman @@ -129,9 +129,7 @@ struct cfattach lp_ca = { sizeof(struct lpt_softc), lpmatch, lpattach }; -struct cfdriver lp_cd = { - NULL, "lpt", DV_DULL, NULL, 0 -}; +extern struct cfdriver lpt_cd; /*ARGSUSED*/ static int diff --git a/sys/arch/atari/dev/ncr5380.c b/sys/arch/atari/dev/ncr5380.c index f64c8ed774c..30d018caa8a 100644 --- a/sys/arch/atari/dev/ncr5380.c +++ b/sys/arch/atari/dev/ncr5380.c @@ -1,4 +1,4 @@ -/* $NetBSD: ncr5380.c,v 1.30 1997/08/27 11:23:40 bouyer Exp $ */ +/* $NetBSD: ncr5380.c,v 1.31 1998/01/12 18:04:12 thorpej Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -213,9 +213,7 @@ struct cfattach CANAME(DRNAME) = { sizeof(struct ncr_softc), ncr_match, ncr_attach }; -struct cfdriver CFNAME(DRNAME) = { - NULL, CFSTRING(DRNAME), DV_DULL, NULL, 0 -}; +extern struct cfdriver CFNAME(DRNAME); int ncr_match(pdp, cfp, auxp) diff --git a/sys/arch/atari/dev/nvram.c b/sys/arch/atari/dev/nvram.c index a70df9aa5f4..3bfae4adc98 100644 --- a/sys/arch/atari/dev/nvram.c +++ b/sys/arch/atari/dev/nvram.c @@ -1,4 +1,4 @@ -/* $NetBSD: nvram.c,v 1.6 1996/12/20 12:49:44 leo Exp $ */ +/* $NetBSD: nvram.c,v 1.7 1998/01/12 18:04:14 thorpej Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -68,9 +68,7 @@ struct cfattach nvr_ca = { sizeof(struct nvr_softc), nvr_match, nvr_attach }; -struct cfdriver nvr_cd = { - NULL, "nvr", DV_DULL, NULL, 0 -}; +extern struct cfdriver nvr_cd; /*ARGSUSED*/ static int diff --git a/sys/arch/atari/dev/ser.c b/sys/arch/atari/dev/ser.c index f7f3ab50301..d4e3a5edbba 100644 --- a/sys/arch/atari/dev/ser.c +++ b/sys/arch/atari/dev/ser.c @@ -1,4 +1,4 @@ -/* $NetBSD: ser.c,v 1.2 1997/08/27 06:59:19 leo Exp $ */ +/* $NetBSD: ser.c,v 1.3 1998/01/12 18:04:15 thorpej Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -175,9 +175,7 @@ struct cfattach ser_ca = { sizeof(struct ser_softc), sermatch, serattach }; -struct cfdriver ser_cd = { - NULL, "ser", DV_TTY, NULL, 0 -}; +extern struct cfdriver ser_cd; /*ARGSUSED*/ static int diff --git a/sys/arch/atari/dev/wd.c b/sys/arch/atari/dev/wd.c index 720cd90baf6..58fa2c8e77b 100644 --- a/sys/arch/atari/dev/wd.c +++ b/sys/arch/atari/dev/wd.c @@ -1,4 +1,4 @@ -/* $NetBSD: wd.c,v 1.7 1997/10/08 23:41:18 thorpej Exp $ */ +/* $NetBSD: wd.c,v 1.8 1998/01/12 18:04:16 thorpej Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -191,10 +191,6 @@ struct cfattach wdc_ca = { sizeof(struct wdc_softc), wdcprobe, wdcattach }; -struct cfdriver wdc_cd = { - NULL, "wdc", DV_DULL -}; - int wdprobe __P((struct device *, struct cfdata *, void *)); void wdattach __P((struct device *, struct device *, void *)); int wdprint __P((void *, const char *)); @@ -203,9 +199,7 @@ struct cfattach wd_ca = { sizeof(struct wd_softc), wdprobe, wdattach }; -struct cfdriver wd_cd = { - NULL, "wd", DV_DISK -}; +extern struct cfdriver wd_cd; void wdgetdefaultlabel __P((struct wd_softc *, struct disklabel *lp)); void wdgetdisklabel __P((struct wd_softc *)); diff --git a/sys/arch/atari/dev/zs.c b/sys/arch/atari/dev/zs.c index a43cb210d3e..cbdf0ecbab3 100644 --- a/sys/arch/atari/dev/zs.c +++ b/sys/arch/atari/dev/zs.c @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.27 1997/03/10 14:41:43 leo Exp $ */ +/* $NetBSD: zs.c,v 1.28 1998/01/12 18:04:17 thorpej Exp $ */ /* * Copyright (c) 1995 L. Weppelman (Atari modifications) @@ -195,9 +195,7 @@ struct cfattach zs_ca = { sizeof(struct zs_softc), zsmatch, zsattach }; -struct cfdriver zs_cd = { - NULL, "zs", DV_TTY, NULL, 0 -}; +extern struct cfdriver zs_cd; /* {b,c}devsw[] function prototypes */ dev_type_open(zsopen); |
