diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2003-01-16 04:17:11 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2003-01-16 04:17:11 +0000 |
| commit | 5844d2be44c6a5e1849783f2dbf3216068653c90 (patch) | |
| tree | 3629ff7a5ee51a63a6ff15306c2f119339b704bd /sys/arch/i386 | |
| parent | 9c82fff6b0c0956ba32aa6094a6ae198058c0f23 (diff) | |
getting rid of vm_offset_t.
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/isa/isa_machdep.c | 13 | ||||
| -rw-r--r-- | sys/arch/i386/isa/isa_machdep.h | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/sys/arch/i386/isa/isa_machdep.c b/sys/arch/i386/isa/isa_machdep.c index fda6b3822b8..949ab3171e5 100644 --- a/sys/arch/i386/isa/isa_machdep.c +++ b/sys/arch/i386/isa/isa_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.c,v 1.46 2002/06/10 22:27:33 niklas Exp $ */ +/* $OpenBSD: isa_machdep.c,v 1.47 2003/01/16 04:17:10 art Exp $ */ /* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */ #define ISA_DMA_STATS @@ -146,7 +146,7 @@ */ #define ISA_DMA_BOUNCE_THRESHOLD 0x00ffffff -extern vm_offset_t avail_end; +extern paddr_t avail_end; #define IDTVEC(name) __CONCAT(X,name) /* default interrupt vector table entries */ @@ -965,7 +965,7 @@ _isa_bus_dmamem_alloc(t, size, alignment, boundary, segs, nsegs, rsegs, flags) int *rsegs; int flags; { - vm_offset_t high; + paddr_t high; if (avail_end > ISA_DMA_BOUNCE_THRESHOLD) high = trunc_page(ISA_DMA_BOUNCE_THRESHOLD); @@ -1049,8 +1049,9 @@ _isa_dma_check_buffer(buf, buflen, segcnt, boundary, p) bus_size_t boundary; struct proc *p; { - vm_offset_t vaddr = (vm_offset_t)buf; - vm_offset_t pa, lastpa, endva; + vaddr_t vaddr = (vaddr_t)buf; + vaddr_t endva; + paddr_t pa, lastpa; u_long pagemask = ~(boundary - 1); pmap_t pmap; int nsegs; @@ -1069,7 +1070,7 @@ _isa_dma_check_buffer(buf, buflen, segcnt, boundary, p) /* * Get physical address for this segment. */ - pmap_extract(pmap, (vm_offset_t)vaddr, &pa); + pmap_extract(pmap, (vaddr_t)vaddr, &pa); pa = trunc_page(pa); /* diff --git a/sys/arch/i386/isa/isa_machdep.h b/sys/arch/i386/isa/isa_machdep.h index b83df1b7976..db7b99d6762 100644 --- a/sys/arch/i386/isa/isa_machdep.h +++ b/sys/arch/i386/isa/isa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.h,v 1.17 2002/03/14 03:15:54 millert Exp $ */ +/* $OpenBSD: isa_machdep.h,v 1.18 2003/01/16 04:17:10 art Exp $ */ /* $NetBSD: isa_machdep.h,v 1.7 1997/06/06 23:28:42 thorpej Exp $ */ /*- @@ -191,7 +191,7 @@ struct i386_isa_dma_cookie { #define DMA_BOUNCE_LOW 16 /* number of pages if memory <= 16M */ #endif -extern vm_offset_t isaphysmem; +extern vaddr_t isaphysmem; extern int isaphysmempgs; |