diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2002-04-27 23:21:07 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2002-04-27 23:21:07 +0000 |
| commit | 68bd39a8215f0f8a94a812dd041e1f0257eadb4c (patch) | |
| tree | 0cf3291275ed21e599146dea724c8f4c962a61db /sys/arch/mvme68k/dev/ipic.c | |
| parent | d75a8327a6482df990b368070cf1e837f96bae60 (diff) | |
Jumbo commit to fix all compilation warnings on mvme68k (add prototypes,
add casts, fix a few errors and typos in the process, etc)
Diffstat (limited to 'sys/arch/mvme68k/dev/ipic.c')
| -rw-r--r-- | sys/arch/mvme68k/dev/ipic.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/sys/arch/mvme68k/dev/ipic.c b/sys/arch/mvme68k/dev/ipic.c index a1ce3ab839d..d95f397ac21 100644 --- a/sys/arch/mvme68k/dev/ipic.c +++ b/sys/arch/mvme68k/dev/ipic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipic.c,v 1.8 2002/03/14 01:26:37 millert Exp $ */ +/* $OpenBSD: ipic.c,v 1.9 2002/04/27 23:21:05 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -43,13 +43,20 @@ #include <sys/syslog.h> #include <sys/fcntl.h> #include <sys/device.h> + #include <machine/autoconf.h> #include <machine/cpu.h> + #include <mvme68k/dev/ipicreg.h> #include <mvme68k/dev/mcreg.h> -void ipicattach(struct device *, struct device *, void *); -int ipicmatch(struct device *, void *, void *); +void ipicattach(struct device *, struct device *, void *); +int ipicmatch(struct device *, void *, void *); + +int ipicprint(void *, const char *); +int ipicscan(struct device *, void *, void *); +caddr_t ipicmap(struct ipicsoftc *, caddr_t, int); +void ipicunmap(struct ipicsoftc *, caddr_t, int); struct cfattach ipic_ca = { sizeof(struct ipicsoftc), ipicmatch, ipicattach @@ -68,7 +75,7 @@ ipicmatch(parent, cf, args) struct confargs *ca = args; struct ipicreg *ipic = (struct ipicreg *)ca->ca_vaddr; - if (badvaddr(ipic, 1) || ipic->ipic_chipid != IPIC_CHIPID) + if (badvaddr((vaddr_t)ipic, 1) || ipic->ipic_chipid != IPIC_CHIPID) return (0); return (1); } @@ -95,7 +102,6 @@ ipicscan(parent, child, args) { struct cfdata *cf = child; struct ipicsoftc *sc = (struct ipicsoftc *)parent; - register struct confargs *ca = args; struct confargs oca; int slot, n = 0; caddr_t ipv, ipp; @@ -112,7 +118,7 @@ ipicscan(parent, child, args) /* XXX can we determing IPIC_IPSPACE automatically? */ for (slot = 0; slot < sc->sc_nip; slot++) { ipp = sc->sc_ipspace + (slot * IPIC_IP_MODSIZE); - if (badpaddr(ipp + IPIC_IP_IDOFFSET, 2)) + if (badpaddr((paddr_t)ipp + IPIC_IP_IDOFFSET, 2)) continue; ipv = mapiodev(ipp, NBPG); |