Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arm vm_offset_t -> vaddr_t,paddr_t
details: https://anonhg.NetBSD.org/src/rev/3aaa221d811c
branches: trunk
changeset: 525394:3aaa221d811c
user: thorpej <thorpej%NetBSD.org@localhost>
date: Wed Apr 10 19:35:22 2002 +0000
description:
vm_offset_t -> vaddr_t,paddr_t
diffstat:
sys/arch/arm/arm/db_trace.c | 6 +++---
sys/arch/arm/arm32/bus_dma.c | 30 +++++++++++++++---------------
sys/arch/arm/arm32/db_interface.c | 4 ++--
sys/arch/arm/iomd/beep.c | 8 ++++----
sys/arch/arm/iomd/iomd_dma.c | 6 +++---
sys/arch/arm/iomd/lmcaudio.c | 18 +++++++++---------
sys/arch/arm/iomd/vidcaudio.c | 18 +++++++++---------
7 files changed, 45 insertions(+), 45 deletions(-)
diffs (truncated from 329 to 300 lines):
diff -r 4ac184a4450f -r 3aaa221d811c sys/arch/arm/arm/db_trace.c
--- a/sys/arch/arm/arm/db_trace.c Wed Apr 10 19:01:59 2002 +0000
+++ b/sys/arch/arm/arm/db_trace.c Wed Apr 10 19:35:22 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.6 2002/03/24 15:49:38 bjh21 Exp $ */
+/* $NetBSD: db_trace.c,v 1.7 2002/04/10 19:35:22 thorpej Exp $ */
/*
* Copyright (c) 2000, 2001 Ben Harris
@@ -31,7 +31,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.6 2002/03/24 15:49:38 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.7 2002/04/10 19:35:22 thorpej Exp $");
#include <sys/proc.h>
#include <sys/user.h>
@@ -44,7 +44,7 @@
#include <ddb/db_sym.h>
#include <ddb/db_output.h>
-#define INKERNEL(va) (((vm_offset_t)(va)) >= VM_MIN_KERNEL_ADDRESS)
+#define INKERNEL(va) (((vaddr_t)(va)) >= VM_MIN_KERNEL_ADDRESS)
/*
* APCS stack frames are awkward beasts, so I don't think even trying to use
diff -r 4ac184a4450f -r 3aaa221d811c sys/arch/arm/arm32/bus_dma.c
--- a/sys/arch/arm/arm32/bus_dma.c Wed Apr 10 19:01:59 2002 +0000
+++ b/sys/arch/arm/arm32/bus_dma.c Wed Apr 10 19:35:22 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.10 2002/04/05 16:58:04 thorpej Exp $ */
+/* $NetBSD: bus_dma.c,v 1.11 2002/04/10 19:35:22 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
#include <arm/cpufunc.h>
int _bus_dmamap_load_buffer(bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int, vm_offset_t *, int *, int);
+ bus_size_t, struct proc *, int, paddr_t *, int *, int);
int _bus_dma_inrange(bus_dma_segment_t *, int, bus_addr_t);
/*
@@ -143,7 +143,7 @@
_bus_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
bus_size_t buflen, struct proc *p, int flags)
{
- vm_offset_t lastaddr;
+ paddr_t lastaddr;
int seg, error;
#ifdef DEBUG_DMA
@@ -181,7 +181,7 @@
_bus_dmamap_load_mbuf(bus_dma_tag_t t, bus_dmamap_t map, struct mbuf *m0,
int flags)
{
- vm_offset_t lastaddr;
+ paddr_t lastaddr;
int seg, error, first;
struct mbuf *m;
@@ -230,7 +230,7 @@
_bus_dmamap_load_uio(bus_dma_tag_t t, bus_dmamap_t map, struct uio *uio,
int flags)
{
- vm_offset_t lastaddr;
+ paddr_t lastaddr;
int seg, i, error, first;
bus_size_t minlen, resid;
struct proc *p = NULL;
@@ -443,10 +443,10 @@
* by bus-specific DMA memory allocation functions.
*/
-extern vm_offset_t physical_start;
-extern vm_offset_t physical_freestart;
-extern vm_offset_t physical_freeend;
-extern vm_offset_t physical_end;
+extern paddr_t physical_start;
+extern paddr_t physical_freestart;
+extern paddr_t physical_freeend;
+extern paddr_t physical_end;
int
_bus_dmamem_alloc(bus_dma_tag_t t, bus_size_t size, bus_size_t alignment,
@@ -505,7 +505,7 @@
_bus_dmamem_map(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
size_t size, caddr_t *kvap, int flags)
{
- vm_offset_t va;
+ vaddr_t va;
bus_addr_t addr;
int curseg;
pt_entry_t *ptep/*, pte*/;
@@ -581,7 +581,7 @@
#endif /* DIAGNOSTIC */
size = round_page(size);
- uvm_km_free(kernel_map, (vm_offset_t)kva, size);
+ uvm_km_free(kernel_map, (vaddr_t)kva, size);
}
/*
@@ -628,12 +628,12 @@
*/
int
_bus_dmamap_load_buffer(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
- bus_size_t buflen, struct proc *p, int flags, vm_offset_t *lastaddrp,
+ bus_size_t buflen, struct proc *p, int flags, paddr_t *lastaddrp,
int *segp, int first)
{
bus_size_t sgsize;
bus_addr_t curaddr, lastaddr, baddr, bmask;
- vm_offset_t vaddr = (vm_offset_t)buf;
+ vaddr_t vaddr = (vaddr_t)buf;
int seg;
pmap_t pmap;
@@ -746,9 +746,9 @@
int
_bus_dmamem_alloc_range(bus_dma_tag_t t, bus_size_t size, bus_size_t alignment,
bus_size_t boundary, bus_dma_segment_t *segs, int nsegs, int *rsegs,
- int flags, vm_offset_t low, vm_offset_t high)
+ int flags, paddr_t low, paddr_t high)
{
- vm_offset_t curaddr, lastaddr;
+ paddr_t curaddr, lastaddr;
struct vm_page *m;
struct pglist mlist;
int curseg, error;
diff -r 4ac184a4450f -r 3aaa221d811c sys/arch/arm/arm32/db_interface.c
--- a/sys/arch/arm/arm32/db_interface.c Wed Apr 10 19:01:59 2002 +0000
+++ b/sys/arch/arm/arm32/db_interface.c Wed Apr 10 19:35:22 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.19 2002/04/09 19:37:16 thorpej Exp $ */
+/* $NetBSD: db_interface.c,v 1.20 2002/04/10 19:35:23 thorpej Exp $ */
/*
* Copyright (c) 1996 Scott K. Stevens
@@ -179,7 +179,7 @@
*/
void
db_read_bytes(addr, size, data)
- vm_offset_t addr;
+ vaddr_t addr;
size_t size;
char *data;
{
diff -r 4ac184a4450f -r 3aaa221d811c sys/arch/arm/iomd/beep.c
--- a/sys/arch/arm/iomd/beep.c Wed Apr 10 19:01:59 2002 +0000
+++ b/sys/arch/arm/iomd/beep.c Wed Apr 10 19:35:22 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: beep.c,v 1.7 2002/04/04 16:56:36 thorpej Exp $ */
+/* $NetBSD: beep.c,v 1.8 2002/04/10 19:35:23 thorpej Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe
@@ -42,7 +42,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: beep.c,v 1.7 2002/04/04 16:56:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beep.c,v 1.8 2002/04/10 19:35:23 thorpej Exp $");
#include <sys/systm.h>
#include <sys/conf.h>
@@ -79,8 +79,8 @@
u_int sc_sound_end0;
u_int sc_sound_cur1;
u_int sc_sound_end1;
- vm_offset_t sc_buffer0;
- vm_offset_t sc_buffer1;
+ vaddr_t sc_buffer0;
+ vaddr_t sc_buffer1;
};
int beepprobe __P((struct device *parent, struct cfdata *cf, void *aux));
diff -r 4ac184a4450f -r 3aaa221d811c sys/arch/arm/iomd/iomd_dma.c
--- a/sys/arch/arm/iomd/iomd_dma.c Wed Apr 10 19:01:59 2002 +0000
+++ b/sys/arch/arm/iomd/iomd_dma.c Wed Apr 10 19:35:22 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iomd_dma.c,v 1.4 2002/02/18 11:40:42 bjh21 Exp $ */
+/* $NetBSD: iomd_dma.c,v 1.5 2002/04/10 19:35:23 thorpej Exp $ */
/*
* Copyright (c) 1995 Scott Stevens
@@ -144,7 +144,7 @@
{
struct dma_ctrl *dp = cookie;
u_char status = (*dp->dc_st) & DMA_ST_MASK;
- vm_offset_t cur;
+ paddr_t cur;
int len;
int bufap = 0;
@@ -219,7 +219,7 @@
/*
* Flush the cache for this address
*/
- cpu_dcache_wbinv_range((vm_offset_t)dp->dc_nextaddr, len);
+ cpu_dcache_wbinv_range((vaddr_t)dp->dc_nextaddr, len);
dp->dc_nextaddr += len;
dp->dc_len -= len;
diff -r 4ac184a4450f -r 3aaa221d811c sys/arch/arm/iomd/lmcaudio.c
--- a/sys/arch/arm/iomd/lmcaudio.c Wed Apr 10 19:01:59 2002 +0000
+++ b/sys/arch/arm/iomd/lmcaudio.c Wed Apr 10 19:35:22 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lmcaudio.c,v 1.4 2001/11/27 01:03:53 thorpej Exp $ */
+/* $NetBSD: lmcaudio.c,v 1.5 2002/04/10 19:35:24 thorpej Exp $ */
/*
* Copyright (c) 1996, Danny C Tsen.
@@ -67,15 +67,15 @@
#include <arm/iomd/lmc1982.h>
struct audio_general {
- vm_offset_t silence;
- vm_offset_t beep;
+ vaddr_t silence;
+ vaddr_t beep;
irqhandler_t ih;
void (*intr) ();
void *arg;
- vm_offset_t next_cur;
- vm_offset_t next_end;
+ paddr_t next_cur;
+ paddr_t next_end;
void (*next_intr) ();
void *next_arg;
@@ -103,7 +103,7 @@
void lmcaudio_timeout __P((void *arg));
int lmcaudio_intr __P((void *arg));
-int lmcaudio_dma_program __P((vm_offset_t cur, vm_offset_t end, void (*intr)(), void *arg));
+int lmcaudio_dma_program __P((vaddr_t cur, vaddr_t end, void (*intr)(), void *arg));
void lmcaudio_dummy_routine __P((void *arg));
int lmcaudio_rate __P((int rate));
void lmcaudio_shutdown __P((void));
@@ -417,7 +417,7 @@
cc = NBPG;
}
}
- lmcaudio_dma_program((vm_offset_t)p, (vm_offset_t)(p+cc), intr, arg);
+ lmcaudio_dma_program((vaddr_t)p, (vaddr_t)(p+cc), intr, arg);
return(0);
}
@@ -539,8 +539,8 @@
int
lmcaudio_dma_program(cur, end, intr, arg)
- vm_offset_t cur;
- vm_offset_t end;
+ vaddr_t cur;
+ vaddr_t end;
void (*intr)();
void *arg;
{
diff -r 4ac184a4450f -r 3aaa221d811c sys/arch/arm/iomd/vidcaudio.c
--- a/sys/arch/arm/iomd/vidcaudio.c Wed Apr 10 19:01:59 2002 +0000
+++ b/sys/arch/arm/iomd/vidcaudio.c Wed Apr 10 19:35:22 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vidcaudio.c,v 1.7 2002/04/05 16:58:06 thorpej Exp $ */
+/* $NetBSD: vidcaudio.c,v 1.8 2002/04/10 19:35:24 thorpej Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson
@@ -38,7 +38,7 @@
#include <sys/param.h> /* proc.h */
-__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.7 2002/04/05 16:58:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.8 2002/04/10 19:35:24 thorpej Exp $");
#include <sys/conf.h> /* autoconfig functions */
#include <sys/device.h> /* device calls */
@@ -67,14 +67,14 @@
#undef DEBUG
struct audio_general {
- vm_offset_t silence;
+ vaddr_t silence;
irqhandler_t ih;
void (*intr) (void *);
void *arg;
- vm_offset_t next_cur;
- vm_offset_t next_end;
+ paddr_t next_cur;
+ paddr_t next_end;
void (*next_intr) (void *);
void *next_arg;
Home |
Main Index |
Thread Index |
Old Index