diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-06-11 10:15:59 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-06-11 10:15:59 +0000 |
| commit | ca9ff19887c8f2b865a16ee630a49c870a1e7cd4 (patch) | |
| tree | 19f3681a938edd77a06dd61e6c91fe09f42f7626 /sys/arch/mvme68k/dev/nvram.c | |
| parent | bdd1db152fb75eb7de037e218459b5e7116ceb22 (diff) | |
use void * for pa/va instead of caddr_t
Diffstat (limited to 'sys/arch/mvme68k/dev/nvram.c')
| -rw-r--r-- | sys/arch/mvme68k/dev/nvram.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/mvme68k/dev/nvram.c b/sys/arch/mvme68k/dev/nvram.c index 5e63f0118ac..708aa23490f 100644 --- a/sys/arch/mvme68k/dev/nvram.c +++ b/sys/arch/mvme68k/dev/nvram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nvram.c,v 1.3 1996/04/28 11:06:11 deraadt Exp $ */ +/* $OpenBSD: nvram.c,v 1.4 1996/06/11 10:15:16 deraadt Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -47,8 +47,8 @@ struct nvramsoftc { struct device sc_dev; - caddr_t sc_paddr; - caddr_t sc_vaddr; + void * sc_paddr; + void * sc_vaddr; int sc_len; struct clockreg *sc_regs; }; @@ -72,7 +72,7 @@ nvrammatch(parent, vcf, args) struct cfdata *cf = vcf; struct confargs *ca = args; -/*X*/ if (ca->ca_vaddr == (caddr_t)-1) +/*X*/ if (ca->ca_vaddr == (void *)-1) /*X*/ return (1); return (!badvaddr(ca->ca_vaddr, 1)); } @@ -92,8 +92,8 @@ nvramattach(parent, self, args) if (cputyp == CPU_147) sc->sc_len = MK48T02_SIZE; -/*X*/ if (sc->sc_vaddr == (caddr_t)-1) -/*X*/ sc->sc_vaddr = mapiodev((caddr_t)sc->sc_paddr, +/*X*/ if (sc->sc_vaddr == (void *)-1) +/*X*/ sc->sc_vaddr = mapiodev((void *)sc->sc_paddr, /*X*/ max(sc->sc_len, NBPG)); /*X*/ if (sc->sc_vaddr == NULL) /*X*/ panic("failed to map!\n"); |