summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authormhitch <mhitch@NetBSD.org>1996-03-17 05:53:57 +0000
committermhitch <mhitch@NetBSD.org>1996-03-17 05:53:57 +0000
commitb00a2c1e303cb2b6f16b97beb7e59fbf068ec418 (patch)
tree68a15abd1321fce98001dc6e74bbcb2d7d7fd4f6 /sys/arch
parent9c70ac56a8612b72b1995a3045e9950781381ab1 (diff)
Clean up typos and other errors from new device attachment changes.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amiga/amiga/swapgeneric.c14
-rw-r--r--sys/arch/amiga/conf/files.amiga6
-rw-r--r--sys/arch/amiga/dev/clock.c4
-rw-r--r--sys/arch/amiga/dev/fd.c3
-rw-r--r--sys/arch/amiga/dev/flsc.c2
-rw-r--r--sys/arch/amiga/dev/grf_cl.c4
-rw-r--r--sys/arch/amiga/dev/grf_cv.c4
-rw-r--r--sys/arch/amiga/dev/grf_rh.c4
-rw-r--r--sys/arch/amiga/dev/grf_ul.c4
-rw-r--r--sys/arch/amiga/dev/idesc.c4
-rw-r--r--sys/arch/amiga/dev/if_es.c4
-rw-r--r--sys/arch/amiga/dev/ite.c4
-rw-r--r--sys/arch/amiga/dev/kbd.c6
-rw-r--r--sys/arch/amiga/dev/mfc.c4
-rw-r--r--sys/arch/amiga/dev/msc.c4
-rw-r--r--sys/arch/amiga/dev/ser.c4
16 files changed, 38 insertions, 37 deletions
diff --git a/sys/arch/amiga/amiga/swapgeneric.c b/sys/arch/amiga/amiga/swapgeneric.c
index 3cb570e0f75..8a69c4fea45 100644
--- a/sys/arch/amiga/amiga/swapgeneric.c
+++ b/sys/arch/amiga/amiga/swapgeneric.c
@@ -1,4 +1,4 @@
-/* $NetBSD: swapgeneric.c,v 1.20 1996/01/07 22:01:46 thorpej Exp $ */
+/* $NetBSD: swapgeneric.c,v 1.21 1996/03/17 05:54:41 mhitch Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
@@ -68,13 +68,13 @@ struct swdevt swdevt[] = {
};
#if NFD > 0
-extern struct cfdriver fdcd;
+extern struct cfdriver fd_cd;
#endif
#if NSD > 0
-extern struct cfdriver sdcd;
+extern struct cfdriver sd_cd;
#endif
#if NCD > 0
-extern struct cfdriver cdcd;
+extern struct cfdriver cd_cd;
#endif
struct genericconf {
@@ -91,13 +91,13 @@ struct genericconf {
*/
struct genericconf genericconf[] = {
#if NFD > 0
- {&fdcd, makedev(2, 0)},
+ {&fd_cd, makedev(2, 0)},
#endif
#if NSD > 0
- {&sdcd, makedev(4, 0)},
+ {&sd_cd, makedev(4, 0)},
#endif
#if NCD > 0
- {&cdcd, makedev(7, 0)},
+ {&cd_cd, makedev(7, 0)},
#endif
{ 0 },
};
diff --git a/sys/arch/amiga/conf/files.amiga b/sys/arch/amiga/conf/files.amiga
index a79cd547336..2f6615294d7 100644
--- a/sys/arch/amiga/conf/files.amiga
+++ b/sys/arch/amiga/conf/files.amiga
@@ -1,4 +1,4 @@
-# $NetBSD: files.amiga,v 1.37 1996/03/17 01:16:52 thorpej Exp $
+# $NetBSD: files.amiga,v 1.38 1996/03/17 05:53:57 mhitch Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -122,7 +122,7 @@ attach ed at zbus with ed_zbus
file arch/amiga/dev/if_ed.c ed_zbus needs-flag
# C=/Ameristar A2060 / 560
-device bah at zbus: ifnet, arc
+device bah: ifnet, arc
attach bah at zbus with bah_zbus
file arch/amiga/dev/if_bah.c bah_zbus needs-flag
@@ -145,7 +145,7 @@ file arch/amiga/dev/msc.c msc needs-count
# bsc/Alf Data MultiFaceCard
device mfc { unit = -1 }
-attach mfs at zbus
+attach mfc at zbus
device mfcs
attach mfcs at mfc
diff --git a/sys/arch/amiga/dev/clock.c b/sys/arch/amiga/dev/clock.c
index 94825563807..13fbc7fdf38 100644
--- a/sys/arch/amiga/dev/clock.c
+++ b/sys/arch/amiga/dev/clock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.11 1996/03/17 01:17:04 thorpej Exp $ */
+/* $NetBSD: clock.c,v 1.12 1996/03/17 05:58:30 mhitch Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -94,7 +94,7 @@ struct cfdriver clock_cd = {
int
clockmatch(pdp, match, auxp)
struct device *pdp;
- void void *match, *auxp;
+ void *match, *auxp;
{
struct cfdata *cfp = match;
diff --git a/sys/arch/amiga/dev/fd.c b/sys/arch/amiga/dev/fd.c
index e37e73c3414..06bc0313375 100644
--- a/sys/arch/amiga/dev/fd.c
+++ b/sys/arch/amiga/dev/fd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.26 1996/03/17 01:17:06 thorpej Exp $ */
+/* $NetBSD: fd.c,v 1.27 1996/03/17 05:58:32 mhitch Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -192,6 +192,7 @@ int nfdtype = sizeof(fdtype) / sizeof(*fdtype);
struct cfattach fd_ca = {
sizeof(struct fd_softc), fdmatch, fdattach
+};
struct cfdriver fd_cd = {
NULL, "fd", DV_DISK, NULL, 0
diff --git a/sys/arch/amiga/dev/flsc.c b/sys/arch/amiga/dev/flsc.c
index 51f5259ba6c..cb8d53b4cbd 100644
--- a/sys/arch/amiga/dev/flsc.c
+++ b/sys/arch/amiga/dev/flsc.c
@@ -93,7 +93,7 @@ void flsc_led __P((struct sfas_softc *sc, int mode));
* if we are an Advanced Systems & Software FastlaneZ3
*/
int
-flscmatch(pdp, void, auxp)
+flscmatch(pdp, match, auxp)
struct device *pdp;
void *match, *auxp;
{
diff --git a/sys/arch/amiga/dev/grf_cl.c b/sys/arch/amiga/dev/grf_cl.c
index 544d493e0f0..c73657d1fe1 100644
--- a/sys/arch/amiga/dev/grf_cl.c
+++ b/sys/arch/amiga/dev/grf_cl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_cl.c,v 1.7 1996/03/17 01:17:11 thorpej Exp $ */
+/* $NetBSD: grf_cl.c,v 1.8 1996/03/17 05:58:35 mhitch Exp $ */
/*
* Copyright (c) 1995 Ezra Story
@@ -162,7 +162,7 @@ static unsigned char cl_imageptr[8 * 64], cl_maskptr[8 * 64];
static unsigned char cl_sprred[2], cl_sprgreen[2], cl_sprblue[2];
/* standard driver stuff */
-struct cfattac grfcl_ca = {
+struct cfattach grfcl_ca = {
sizeof(struct grf_softc), grfclmatch, grfclattach
};
diff --git a/sys/arch/amiga/dev/grf_cv.c b/sys/arch/amiga/dev/grf_cv.c
index 106af6a16a2..c689bd38488 100644
--- a/sys/arch/amiga/dev/grf_cv.c
+++ b/sys/arch/amiga/dev/grf_cv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_cv.c,v 1.10 1996/03/17 01:17:13 thorpej Exp $ */
+/* $NetBSD: grf_cv.c,v 1.11 1996/03/17 05:58:36 mhitch Exp $ */
/*
* Copyright (c) 1995 Michael Teske
@@ -63,7 +63,7 @@
#include <amiga/dev/grf_cvreg.h>
#include <amiga/dev/zbusvar.h>
-int grfcvmatch __P((struct device *, struct cfdata *, void *));
+int grfcvmatch __P((struct device *, void *, void *));
void grfcvattach __P((struct device *, struct device *, void *));
int grfcvprint __P((void *, char *));
diff --git a/sys/arch/amiga/dev/grf_rh.c b/sys/arch/amiga/dev/grf_rh.c
index 4afb1ca5ab7..0a472198ae5 100644
--- a/sys/arch/amiga/dev/grf_rh.c
+++ b/sys/arch/amiga/dev/grf_rh.c
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_rh.c,v 1.12 1996/03/17 01:17:16 thorpej Exp $ */
+/* $NetBSD: grf_rh.c,v 1.13 1996/03/17 05:58:39 mhitch Exp $ */
/*
* Copyright (c) 1994 Markus Wild
@@ -1419,7 +1419,7 @@ void grfrhattach __P((struct device *, struct device *, void *));
int grfrhprint __P((void *, char *));
int grfrhmatch __P((struct device *, void *, void *));
-struct cfdriver grfrh_ca = {
+struct cfattach grfrh_ca = {
sizeof(struct grf_softc), grfrhmatch, grfrhattach
};
diff --git a/sys/arch/amiga/dev/grf_ul.c b/sys/arch/amiga/dev/grf_ul.c
index e8f646936a1..b166237b492 100644
--- a/sys/arch/amiga/dev/grf_ul.c
+++ b/sys/arch/amiga/dev/grf_ul.c
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_ul.c,v 1.13 1996/03/17 01:17:20 thorpej Exp $ */
+/* $NetBSD: grf_ul.c,v 1.14 1996/03/17 05:58:41 mhitch Exp $ */
#define UL_DEBUG
/*
@@ -434,7 +434,7 @@ struct cfattach grful_ca = {
sizeof(struct grf_ul_softc), grfulmatch, grfulattach
};
-struct cfdriver grfulcd = {
+struct cfdriver grful_cd = {
NULL, "grful", DV_DULL, NULL, 0
};
diff --git a/sys/arch/amiga/dev/idesc.c b/sys/arch/amiga/dev/idesc.c
index 0c3a9ba7bf9..d1d277e6e24 100644
--- a/sys/arch/amiga/dev/idesc.c
+++ b/sys/arch/amiga/dev/idesc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: idesc.c,v 1.16 1996/03/17 01:17:24 thorpej Exp $ */
+/* $NetBSD: idesc.c,v 1.17 1996/03/17 05:58:43 mhitch Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@@ -266,7 +266,7 @@ struct scsi_device idesc_scsidev = {
NULL, /* Use default done routine */
};
-struct cfdriver idesc_ca = {
+struct cfattach idesc_ca = {
sizeof(struct idec_softc), idescmatch, idescattach
};
diff --git a/sys/arch/amiga/dev/if_es.c b/sys/arch/amiga/dev/if_es.c
index b5a9df7839c..71753c89712 100644
--- a/sys/arch/amiga/dev/if_es.c
+++ b/sys/arch/amiga/dev/if_es.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_es.c,v 1.9 1996/03/17 01:17:33 thorpej Exp $ */
+/* $NetBSD: if_es.c,v 1.10 1996/03/17 05:58:45 mhitch Exp $ */
/*
* Copyright (c) 1995 Michael L. Hitch
@@ -125,7 +125,7 @@ int esmatch __P((struct device *, void *, void *));
void esattach __P((struct device *, struct device *, void *));
struct cfattach es_ca = {
- sizeof(stuct es_softc), esmatch, esattach
+ sizeof(struct es_softc), esmatch, esattach
};
struct cfdriver es_cd = {
diff --git a/sys/arch/amiga/dev/ite.c b/sys/arch/amiga/dev/ite.c
index d907ba8e120..34bcbb744f1 100644
--- a/sys/arch/amiga/dev/ite.c
+++ b/sys/arch/amiga/dev/ite.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.37 1996/03/17 01:17:39 thorpej Exp $ */
+/* $NetBSD: ite.c,v 1.38 1996/03/17 05:58:48 mhitch Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -119,7 +119,7 @@ static void iteprecheckwrap __P((struct ite_softc *));
static void itecheckwrap __P((struct ite_softc *));
struct cfattach ite_ca = {
- sizeof(struct ite_softc, itematch, iteattach
+ sizeof(struct ite_softc), itematch, iteattach
};
struct cfdriver ite_cd = {
diff --git a/sys/arch/amiga/dev/kbd.c b/sys/arch/amiga/dev/kbd.c
index bd5beb25f43..d8528ea4054 100644
--- a/sys/arch/amiga/dev/kbd.c
+++ b/sys/arch/amiga/dev/kbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.c,v 1.16 1996/03/17 01:17:42 thorpej Exp $ */
+/* $NetBSD: kbd.c,v 1.17 1996/03/17 05:58:50 mhitch Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -61,8 +61,8 @@ struct kbd_softc {
};
struct kbd_softc kbd_softc;
-void kbdattach __P((struct device *, void *, void *));
-int kbdmatch __P((struct device *, struct cfdata *, void *));
+int kbdmatch __P((struct device *, void *, void *));
+void kbdattach __P((struct device *, struct device *, void *));
struct cfattach kbd_ca = {
sizeof(struct device), kbdmatch, kbdattach
diff --git a/sys/arch/amiga/dev/mfc.c b/sys/arch/amiga/dev/mfc.c
index 1fe4b24399f..6b6802f360c 100644
--- a/sys/arch/amiga/dev/mfc.c
+++ b/sys/arch/amiga/dev/mfc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mfc.c,v 1.10 1996/03/17 01:17:43 thorpej Exp $ */
+/* $NetBSD: mfc.c,v 1.11 1996/03/17 05:58:52 mhitch Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@@ -191,7 +191,7 @@ int mfcpmatch __P((struct device *, void *, void *));
int mfcintr __P((struct mfc_softc *));
void mfcsmint __P((register int unit));
-struct mfc_ca = {
+struct cfattach mfc_ca = {
sizeof(struct mfc_softc), mfcmatch, mfcattach
};
diff --git a/sys/arch/amiga/dev/msc.c b/sys/arch/amiga/dev/msc.c
index 15ea2bb1e95..54d4b768f15 100644
--- a/sys/arch/amiga/dev/msc.c
+++ b/sys/arch/amiga/dev/msc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: msc.c,v 1.4 1996/03/17 01:17:48 thorpej Exp $ */
+/* $NetBSD: msc.c,v 1.5 1996/03/17 05:58:54 mhitch Exp $ */
/*
* Copyright (c) 1993 Zik.
@@ -174,7 +174,7 @@ struct cfattach msc_ca = {
};
struct cfdriver msc_cd = {
- NULL, "msc",DV_TTY, sizeof(struct device), NULL, 0
+ NULL, "msc",DV_TTY, NULL, 0
};
#if DEBUG_MSC
diff --git a/sys/arch/amiga/dev/ser.c b/sys/arch/amiga/dev/ser.c
index 51f94c599a5..df7d7b102d8 100644
--- a/sys/arch/amiga/dev/ser.c
+++ b/sys/arch/amiga/dev/ser.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ser.c,v 1.29 1996/03/17 01:17:53 thorpej Exp $ */
+/* $NetBSD: ser.c,v 1.30 1996/03/17 05:58:58 mhitch Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -73,7 +73,7 @@ struct ser_softc {
};
struct cfattach ser_ca = {
- sizeof(ser_softc), sermatch, serattach
+ sizeof(struct ser_softc), sermatch, serattach
};
struct cfdriver ser_cd = {