diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-11-24 22:43:20 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-11-24 22:43:20 +0000 |
| commit | 1b1b775efbf1ce5de10a4e90ce6f1b8fef11cf6d (patch) | |
| tree | 8f11d2dab7028064b566ebe83b7f71890c6f1224 /sys/arch/mvme68k/include | |
| parent | 3b6fc494d6c3ea81b031d03cd56c0569869c875f (diff) | |
Prefer vaddr_t and paddr_t types in device softc, instead of void * and
heavy casts. Improves readability, no functional change.
Diffstat (limited to 'sys/arch/mvme68k/include')
| -rw-r--r-- | sys/arch/mvme68k/include/autoconf.h | 12 | ||||
| -rw-r--r-- | sys/arch/mvme68k/include/cpu.h | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sys/arch/mvme68k/include/autoconf.h b/sys/arch/mvme68k/include/autoconf.h index d435c4c4aaa..0ffe2051fa7 100644 --- a/sys/arch/mvme68k/include/autoconf.h +++ b/sys/arch/mvme68k/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.10 2005/08/01 15:45:28 miod Exp $ */ +/* $OpenBSD: autoconf.h,v 1.11 2005/11/24 22:43:19 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -30,8 +30,8 @@ struct confargs { int ca_bustype; - void *ca_vaddr; - void *ca_paddr; + vaddr_t ca_vaddr; + paddr_t ca_paddr; int ca_offset; int ca_len; int ca_ipl; @@ -48,14 +48,14 @@ struct confargs { #define BUS_IP 7 /* VME162 IP module bus */ /* the following are from the prom/bootblocks */ -void *bootaddr; /* PA of boot device */ +paddr_t bootaddr; /* PA of boot device */ int bootctrllun; /* ctrl_lun of boot device */ int bootdevlun; /* dev_lun of boot device */ int bootpart; /* boot partition (disk) */ struct device *bootdv; /* boot device */ -void *mapiodev(void *pa, int size); -void unmapiodev(void *kva, int size); +vaddr_t mapiodev(paddr_t, int); +void unmapiodev(vaddr_t, int); #endif diff --git a/sys/arch/mvme68k/include/cpu.h b/sys/arch/mvme68k/include/cpu.h index 3b84bc9941a..3622cf2563b 100644 --- a/sys/arch/mvme68k/include/cpu.h +++ b/sys/arch/mvme68k/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.21 2005/08/14 12:52:39 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.22 2005/11/24 22:43:19 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -146,8 +146,8 @@ extern int want_resched; extern int astpending; #define aston() (astpending = 1) -extern char *intiobase, *intiolimit; -extern char *iiomapbase; +extern vaddr_t intiobase, intiolimit; +extern vaddr_t iiomapbase; extern int iiomapsize; /* physical memory sections for mvme147 */ @@ -168,10 +168,10 @@ extern int iiomapsize; * conversion between physical and kernel virtual addresses is easy. */ #define ISIIOVA(va) \ - ((char *)(va) >= intiobase && (char *)(va) < intiolimit) -#define IIOV(pa) ((int)(pa)-(int)iiomapbase+(int)intiobase) -#define IIOP(va) ((int)(va)-(int)intiobase+(int)iiomapbase) -#define IIOPOFF(pa) ((int)(pa)-(int)iiomapbase) + ((va) >= intiobase && (va) < intiolimit) +#define IIOV(pa) ((pa) - iiomapbase + intiobase) +#define IIOP(va) ((va) - intiobase + iiomapbase) +#define IIOPOFF(pa) ((pa) - iiomapbase) extern int cputyp; #define CPU_147 0x147 |