diff options
author | briggs <briggs@cvs.openbsd.org> | 1997-03-12 13:37:02 +0000 |
---|---|---|
committer | briggs <briggs@cvs.openbsd.org> | 1997-03-12 13:37:02 +0000 |
commit | 8f99a2710ce0e52fc56f7952b4fb9d4e16ce96c7 (patch) | |
tree | 991a8092fe277fafe95f444a3bf8d84ac5b9ee3e /sys/arch/mac68k/dev | |
parent | a194f37816e1e5528129b12e336f3c88b1fea781 (diff) |
Remove some more warnings left over from NetBSD's new config.
Diffstat (limited to 'sys/arch/mac68k/dev')
-rw-r--r-- | sys/arch/mac68k/dev/adb.c | 8 | ||||
-rw-r--r-- | sys/arch/mac68k/dev/grf.c | 8 | ||||
-rw-r--r-- | sys/arch/mac68k/dev/grf_mv.c | 8 | ||||
-rw-r--r-- | sys/arch/mac68k/dev/if_ae_nubus.c | 5 | ||||
-rw-r--r-- | sys/arch/mac68k/dev/obio.c | 15 | ||||
-rw-r--r-- | sys/arch/mac68k/dev/z8530tty.c | 3 | ||||
-rw-r--r-- | sys/arch/mac68k/dev/zs.c | 6 |
7 files changed, 26 insertions, 27 deletions
diff --git a/sys/arch/mac68k/dev/adb.c b/sys/arch/mac68k/dev/adb.c index 33614c3e4bb..30a41769194 100644 --- a/sys/arch/mac68k/dev/adb.c +++ b/sys/arch/mac68k/dev/adb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adb.c,v 1.7 1997/02/23 06:04:52 briggs Exp $ */ +/* $OpenBSD: adb.c,v 1.8 1997/03/12 13:36:56 briggs Exp $ */ /* $NetBSD: adb.c,v 1.13 1996/12/16 16:17:02 scottr Exp $ */ /*- @@ -49,7 +49,7 @@ e* notice, this list of conditions and the following disclaimer in the /* * Function declarations. */ -static int adbmatch __P((struct device *, struct cfdata *, void *)); +static int adbmatch __P((struct device *, void *, void *)); static void adbattach __P((struct device *, struct device *, void *)); /* @@ -94,9 +94,9 @@ struct cfdriver adb_cd = { }; static int -adbmatch(parent, cf, aux) +adbmatch(parent, vcf, aux) struct device *parent; - struct cfdata *cf; + void *vcf; void *aux; { return 1; diff --git a/sys/arch/mac68k/dev/grf.c b/sys/arch/mac68k/dev/grf.c index 233524a8d02..8e86c877e1f 100644 --- a/sys/arch/mac68k/dev/grf.c +++ b/sys/arch/mac68k/dev/grf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf.c,v 1.6 1997/03/08 16:16:50 briggs Exp $ */ +/* $OpenBSD: grf.c,v 1.7 1997/03/12 13:36:57 briggs Exp $ */ /* $NetBSD: grf.c,v 1.41 1997/02/24 06:20:04 scottr Exp $ */ /* @@ -83,7 +83,7 @@ #define iteoff(u,f) #endif -int grfmatch __P((struct device *, struct cfdata *, void *)); +int grfmatch __P((struct device *, void *, void *)); void grfattach __P((struct device *, struct device *, void *)); struct cfdriver grf_cd = { @@ -103,9 +103,9 @@ static int grfdebug = (GDB_DEVNO|GDB_MMAP|GDB_IOMAP|GDB_LOCK); #endif int -grfmatch(parent, cf, aux) +grfmatch(parent, vcf, aux) struct device *parent; - struct cfdata *cf; + void *vcf; void *aux; { struct grfbus_attach_args *ga = aux; diff --git a/sys/arch/mac68k/dev/grf_mv.c b/sys/arch/mac68k/dev/grf_mv.c index febd98d1873..bfdc7f581e1 100644 --- a/sys/arch/mac68k/dev/grf_mv.c +++ b/sys/arch/mac68k/dev/grf_mv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_mv.c,v 1.7 1997/03/08 16:16:51 briggs Exp $ */ +/* $OpenBSD: grf_mv.c,v 1.8 1997/03/12 13:36:57 briggs Exp $ */ /* $NetBSD: grf_mv.c,v 1.17 1997/02/24 06:20:06 scottr Exp $ */ /* @@ -60,7 +60,7 @@ static char zero = 0; static int grfmv_mode __P((struct grf_softc *gp, int cmd, void *arg)); static caddr_t grfmv_phys __P((struct grf_softc *gp, vm_offset_t addr)); -static int grfmv_match __P((struct device *, struct cfdata *, void *)); +static int grfmv_match __P((struct device *, void *, void *)); static void grfmv_attach __P((struct device *, struct device *, void *)); struct cfdriver macvid_cd = { @@ -162,9 +162,9 @@ grfmv_intr(vsc, slot) } static int -grfmv_match(parent, cf, aux) +grfmv_match(parent, vcf, aux) struct device *parent; - struct cfdata *cf; + void *vcf; void *aux; { struct nubus_attach_args *na = (struct nubus_attach_args *) aux; diff --git a/sys/arch/mac68k/dev/if_ae_nubus.c b/sys/arch/mac68k/dev/if_ae_nubus.c index a0f519067db..40e44f052e3 100644 --- a/sys/arch/mac68k/dev/if_ae_nubus.c +++ b/sys/arch/mac68k/dev/if_ae_nubus.c @@ -1,4 +1,5 @@ /* $NetBSD: if_ae_nubus.c,v 1.5 1997/02/28 08:56:06 scottr Exp $ */ +/* $OpenBSD: if_ae_nubus.c,v 1.2 1997/03/12 13:36:58 briggs Exp $ */ /* * Copyright (C) 1997 Scott Reynolds @@ -101,7 +102,6 @@ ae_nubus_match(parent, vcf, aux) bus_space_unmap(na->na_tag, bsh, NBMEMSIZE); -printf("ae_nubus_match returning %d\n", rv); return rv; } @@ -123,7 +123,6 @@ ae_nubus_attach(parent, self, aux) int i; #endif -printf("ae_nubus_attach\n"); bst = na->na_tag; if (bus_space_map(bst, NUBUS_SLOT2PA(na->slot), NBMEMSIZE, 0, &bsh)) { @@ -143,7 +142,6 @@ printf("ae_nubus_attach\n"); success = 0; -printf("ae_nubus_attach vendor switch\n"); switch (sc->vendor) { case AE_VENDOR_APPLE: /* Apple-compatible cards */ case AE_VENDOR_ASANTE: @@ -299,7 +297,6 @@ printf("ae_nubus_attach vendor switch\n"); default: break; } -printf("ae_nubus_attach vendor switch done\n"); if (!success) { bus_space_unmap(bst, bsh, NBMEMSIZE); diff --git a/sys/arch/mac68k/dev/obio.c b/sys/arch/mac68k/dev/obio.c index f8ad9d607f6..3f20bd45623 100644 --- a/sys/arch/mac68k/dev/obio.c +++ b/sys/arch/mac68k/dev/obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: obio.c,v 1.3 1997/03/08 16:16:57 briggs Exp $ */ +/* $OpenBSD: obio.c,v 1.4 1997/03/12 13:36:58 briggs Exp $ */ /* $NetBSD: obio.c,v 1.7 1997/02/13 19:01:07 scottr Exp $ */ /* @@ -45,10 +45,10 @@ #include <mac68k/dev/obiovar.h> -static int obio_match __P((struct device *, struct cfdata *, void *)); +static int obio_match __P((struct device *, void *, void *)); static void obio_attach __P((struct device *, struct device *, void *)); static int obio_print __P((void *, const char *)); -static int obio_search __P((struct device *, struct cfdata *, void *)); +static int obio_search __P((struct device *, void *, void *)); struct cfattach obio_ca = { sizeof(struct device), obio_match, obio_attach @@ -59,9 +59,9 @@ struct cfdriver obio_cd = { }; static int -obio_match(parent, cf, aux) +obio_match(parent, vcf, aux) struct device *parent; - struct cfdata *cf; + void *vcf; void *aux; { static int obio_matched = 0; @@ -100,12 +100,13 @@ obio_print(args, name) } int -obio_search(parent, cf, aux) +obio_search(parent, vcf, aux) struct device *parent; - struct cfdata *cf; + void *vcf; void *aux; { struct obio_attach_args oa; + struct cfdata *cf = (struct cfdata *) vcf; oa.oa_addr = cf->cf_loc[0]; oa.oa_drq = cf->cf_loc[1]; diff --git a/sys/arch/mac68k/dev/z8530tty.c b/sys/arch/mac68k/dev/z8530tty.c index cb35ad8adbc..f32adbd1152 100644 --- a/sys/arch/mac68k/dev/z8530tty.c +++ b/sys/arch/mac68k/dev/z8530tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530tty.c,v 1.7 1997/03/11 21:03:02 gene Exp $ */ +/* $OpenBSD: z8530tty.c,v 1.8 1997/03/12 13:36:58 briggs Exp $ */ /* $NetBSD: z8530tty.c,v 1.10 1996/12/18 05:17:44 scottr Exp $ */ /* @@ -122,6 +122,7 @@ zstty_match(parent, vcf, aux) void *vcf; void *aux; { + struct cfdata *cf = (struct cfdata *) vcf; struct zsc_attach_args *args = aux; struct cfdata *cf = vcf; diff --git a/sys/arch/mac68k/dev/zs.c b/sys/arch/mac68k/dev/zs.c index 8cdeb5fa071..9c27764eca4 100644 --- a/sys/arch/mac68k/dev/zs.c +++ b/sys/arch/mac68k/dev/zs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zs.c,v 1.8 1997/03/11 21:03:03 gene Exp $ */ +/* $OpenBSD: zs.c,v 1.9 1997/03/12 13:36:59 briggs Exp $ */ /* $NetBSD: zs.c,v 1.12 1996/12/18 05:04:22 scottr Exp $ */ /* @@ -204,9 +204,9 @@ int zssoft __P((void *)); * Is the zs chip present? */ static int -zsc_match(parent, cf, aux) +zsc_match(parent, vcf, aux) struct device *parent; - void *cf; + void *vcf; void *aux; { return 1; |