Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Replace more vm_offset_t, vm_size_t with vaddr_t, v...
details: https://anonhg.NetBSD.org/src/rev/46c8b81ac970
branches: trunk
changeset: 802419:46c8b81ac970
user: matt <matt%NetBSD.org@localhost>
date: Sat Sep 13 18:08:38 2014 +0000
description:
Replace more vm_offset_t, vm_size_t with vaddr_t, vsize_t
Use paddr_t for msgbufphys
diffstat:
sys/arch/acorn26/acorn26/db_interface.c | 10 +++++-----
sys/arch/acorn26/include/vmparam.h | 8 ++++----
sys/arch/acorn32/podulebus/esc.c | 8 ++++----
sys/arch/acorn32/podulebus/podulebus.c | 8 ++++----
sys/arch/acorn32/podulebus/ptsc.c | 14 +++++++-------
sys/arch/acorn32/podulebus/sfas.c | 8 ++++----
sys/arch/arm/at91/at91bus.c | 16 ++++++++--------
sys/arch/arm/footbridge/isa/isa_io.c | 14 +++++++-------
sys/arch/arm/include/db_machdep.h | 4 ++--
sys/arch/arm/iomd/vidcaudio.c | 8 ++++----
sys/arch/epoc32/epoc32/machdep.c | 14 +++++++-------
sys/arch/evbarm/adi_brh/brh_machdep.c | 14 +++++++-------
sys/arch/evbarm/armadillo/armadillo9_machdep.c | 16 ++++++++--------
sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c | 12 ++++++------
sys/arch/evbarm/hdl_g/hdlg_machdep.c | 14 +++++++-------
sys/arch/evbarm/imx31/imx31lk_machdep.c | 14 +++++++-------
sys/arch/evbarm/iq80310/iq80310_machdep.c | 14 +++++++-------
sys/arch/evbarm/iq80321/iq80321_machdep.c | 14 +++++++-------
sys/arch/evbarm/ixdp425/ixdp425_machdep.c | 14 +++++++-------
sys/arch/evbarm/ixm1200/ixm1200_machdep.c | 14 +++++++-------
sys/arch/evbarm/lubbock/lubbock_machdep.c | 14 +++++++-------
sys/arch/evbarm/mini2440/mini2440_machdep.c | 16 ++++++++--------
sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c | 14 +++++++-------
sys/arch/evbarm/nslu2/nslu2_machdep.c | 14 +++++++-------
sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c | 16 ++++++++--------
sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c | 16 ++++++++--------
sys/arch/evbarm/tsarm/isa/isa_io.c | 14 +++++++-------
sys/arch/evbarm/tsarm/tsarm_machdep.c | 16 ++++++++--------
sys/arch/evbarm/viper/viper_machdep.c | 14 +++++++-------
sys/arch/iyonix/iyonix/iyonix_machdep.c | 16 ++++++++--------
sys/arch/netwinder/netwinder/netwinder_machdep.c | 16 ++++++++--------
31 files changed, 202 insertions(+), 202 deletions(-)
diffs (truncated from 1258 to 300 lines):
diff -r 5eadecfcfb78 -r 46c8b81ac970 sys/arch/acorn26/acorn26/db_interface.c
--- a/sys/arch/acorn26/acorn26/db_interface.c Sat Sep 13 17:50:27 2014 +0000
+++ b/sys/arch/acorn26/acorn26/db_interface.c Sat Sep 13 18:08:38 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.20 2014/03/08 16:55:38 skrll Exp $ */
+/* $NetBSD: db_interface.c,v 1.21 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright (c) 1996 Scott K. Stevens
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.20 2014/03/08 16:55:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.21 2014/09/13 18:08:38 matt Exp $");
#include "opt_ddb.h"
@@ -167,7 +167,7 @@
volatile bool db_validating, db_faulted;
int
-db_validate_address(vm_offset_t addr)
+db_validate_address(vaddr_t addr)
{
db_faulted = false;
@@ -181,7 +181,7 @@
* Read bytes from kernel address space for debugger.
*/
void
-db_read_bytes(vm_offset_t addr, size_t size, char *data)
+db_read_bytes(vaddr_t addr, size_t size, char *data)
{
char *src;
@@ -211,7 +211,7 @@
* Write bytes to kernel address space for debugger.
*/
void
-db_write_bytes(vm_offset_t addr, size_t size, const char *data)
+db_write_bytes(vaddr_t addr, size_t size, const char *data)
{
#if 0
extern char _stext_[], _etext[];
diff -r 5eadecfcfb78 -r 46c8b81ac970 sys/arch/acorn26/include/vmparam.h
--- a/sys/arch/acorn26/include/vmparam.h Sat Sep 13 17:50:27 2014 +0000
+++ b/sys/arch/acorn26/include/vmparam.h Sat Sep 13 18:08:38 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.12 2011/08/26 09:26:14 reinoud Exp $ */
+/* $NetBSD: vmparam.h,v 1.13 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -79,13 +79,13 @@
#define KVM_SIZE 0x00800000 /* 8Mb */
/* User VM range */
-#define VM_MIN_ADDRESS ((vm_offset_t)0x00008000)
-#define VM_MAX_ADDRESS ((vm_offset_t)0x02000000 - KVM_SIZE)
+#define VM_MIN_ADDRESS ((vaddr_t)0x00008000)
+#define VM_MAX_ADDRESS ((vaddr_t)0x02000000 - KVM_SIZE)
#define VM_MAXUSER_ADDRESS VM_MAX_ADDRESS
/* Kernel VM range */
#define VM_MIN_KERNEL_ADDRESS VM_MAX_ADDRESS
-#define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)0x02000000)
+#define VM_MAX_KERNEL_ADDRESS ((vaddr_t)0x02000000)
#define VM_MAXKERN_ADDRESS VM_MAX_KERNEL_ADDRESS
/* XXX max. amount of KVM to be used by buffers. */
diff -r 5eadecfcfb78 -r 46c8b81ac970 sys/arch/acorn32/podulebus/esc.c
--- a/sys/arch/acorn32/podulebus/esc.c Sat Sep 13 17:50:27 2014 +0000
+++ b/sys/arch/acorn32/podulebus/esc.c Sat Sep 13 18:08:38 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: esc.c,v 1.27 2014/02/22 19:03:06 matt Exp $ */
+/* $NetBSD: esc.c,v 1.28 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esc.c,v 1.27 2014/02/22 19:03:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esc.c,v 1.28 2014/09/13 18:08:38 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -254,7 +254,7 @@
l2pte_set(ptep, npte, opte);
PTE_SYNC(ptep);
cpu_tlb_flushD();
- cpu_dcache_wbinv_range((vm_offset_t)dev->sc_bump_va, PAGE_SIZE);
+ cpu_dcache_wbinv_range((vaddr_t)dev->sc_bump_va, PAGE_SIZE);
printf(" dmabuf V0x%08x P0x%08x", (u_int)dev->sc_bump_va, (u_int)dev->sc_bump_pa);
}
@@ -892,7 +892,7 @@
/* Flush the caches. */
if (len && !(mode & ESC_SELECT_I))
- cpu_dcache_wbinv_range((vm_offset_t)buf, len);
+ cpu_dcache_wbinv_range((vaddr_t)buf, len);
}
int
diff -r 5eadecfcfb78 -r 46c8b81ac970 sys/arch/acorn32/podulebus/podulebus.c
--- a/sys/arch/acorn32/podulebus/podulebus.c Sat Sep 13 17:50:27 2014 +0000
+++ b/sys/arch/acorn32/podulebus/podulebus.c Sat Sep 13 18:08:38 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus.c,v 1.27 2014/03/21 16:43:00 christos Exp $ */
+/* $NetBSD: podulebus.c,v 1.28 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -43,7 +43,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.27 2014/03/21 16:43:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.28 2014/09/13 18:08:38 matt Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -429,7 +429,7 @@
* are built during initarm
*/
/* Map the FAST and SYNC simple podules */
- pmap_map_section((vm_offset_t)pmap_kernel()->pm_pdir,
+ pmap_map_section((vaddr_t)pmap_kernel()->pm_pdir,
SYNC_PODULE_BASE & 0xfff00000, SYNC_PODULE_HW_BASE & 0xfff00000,
VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE);
cpu_tlb_flushD();
@@ -440,7 +440,7 @@
for (loop1 = loop * EASI_SIZE; loop1 < ((loop + 1) * EASI_SIZE);
loop1 += L1_S_SIZE)
- pmap_map_section((vm_offset_t)pmap_kernel()->pm_pdir,
+ pmap_map_section((vaddr_t)pmap_kernel()->pm_pdir,
EASI_BASE + loop1, EASI_HW_BASE + loop1,
VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE);
}
diff -r 5eadecfcfb78 -r 46c8b81ac970 sys/arch/acorn32/podulebus/ptsc.c
--- a/sys/arch/acorn32/podulebus/ptsc.c Sat Sep 13 17:50:27 2014 +0000
+++ b/sys/arch/acorn32/podulebus/ptsc.c Sat Sep 13 18:08:38 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ptsc.c,v 1.18 2012/10/27 17:17:23 chs Exp $ */
+/* $NetBSD: ptsc.c,v 1.19 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ptsc.c,v 1.18 2012/10/27 17:17:23 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ptsc.c,v 1.19 2014/09/13 18:08:38 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -385,7 +385,7 @@
ptsc_build_dma_chain(void *v1, void *v2, void *p, int l)
{
#if 0
- vm_offset_t pa, lastpa;
+ vaddr_t pa, lastpa;
char *ptr;
int len, prelen, postlen, max_t, n;
#endif
@@ -404,12 +404,12 @@
n = 0;
if (l < 512)
- set_link(n, (vm_offset_t)p, l, SFAS_CHAIN_BUMP);
+ set_link(n, (vaddr_t)p, l, SFAS_CHAIN_BUMP);
else if (p >= (void *)0xFF000000) {
while(l != 0) {
len = ((l > sc->sc_bump_sz) ? sc->sc_bump_sz : l);
- set_link(n, (vm_offset_t)p, len, SFAS_CHAIN_BUMP);
+ set_link(n, (vaddr_t)p, len, SFAS_CHAIN_BUMP);
p += len;
l -= len;
@@ -423,7 +423,7 @@
if (prelen) {
prelen = 4-prelen;
- set_link(n, (vm_offset_t)ptr, prelen, SFAS_CHAIN_BUMP);
+ set_link(n, (vaddr_t)ptr, prelen, SFAS_CHAIN_BUMP);
ptr += prelen;
len -= prelen;
}
@@ -449,7 +449,7 @@
}
if (len)
- set_link(n, (vm_offset_t)ptr, len, SFAS_CHAIN_BUMP);
+ set_link(n, (vaddr_t)ptr, len, SFAS_CHAIN_BUMP);
}
return(n);
diff -r 5eadecfcfb78 -r 46c8b81ac970 sys/arch/acorn32/podulebus/sfas.c
--- a/sys/arch/acorn32/podulebus/sfas.c Sat Sep 13 17:50:27 2014 +0000
+++ b/sys/arch/acorn32/podulebus/sfas.c Sat Sep 13 18:08:38 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sfas.c,v 1.24 2014/02/22 19:03:06 matt Exp $ */
+/* $NetBSD: sfas.c,v 1.25 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sfas.c,v 1.24 2014/02/22 19:03:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfas.c,v 1.25 2014/09/13 18:08:38 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -250,7 +250,7 @@
l2pte_set(ptep, npte, opte);
PTE_SYNC(ptep);
cpu_tlb_flushD();
- cpu_dcache_wbinv_range((vm_offset_t)dev->sc_bump_va, PAGE_SIZE);
+ cpu_dcache_wbinv_range((vaddr_t)dev->sc_bump_va, PAGE_SIZE);
printf(" dmabuf V0x%08x P0x%08x", (u_int)dev->sc_bump_va, (u_int)dev->sc_bump_pa);
}
@@ -813,7 +813,7 @@
/* Flush the caches. */
if (len && !(mode & SFAS_SELECT_I))
- cpu_dcache_wbinv_range((vm_offset_t)buf, len);
+ cpu_dcache_wbinv_range((vaddr_t)buf, len);
}
int
diff -r 5eadecfcfb78 -r 46c8b81ac970 sys/arch/arm/at91/at91bus.c
--- a/sys/arch/arm/at91/at91bus.c Sat Sep 13 17:50:27 2014 +0000
+++ b/sys/arch/arm/at91/at91bus.c Sat Sep 13 18:08:38 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: at91bus.c,v 1.17 2013/08/18 15:58:19 matt Exp $ */
+/* $NetBSD: at91bus.c,v 1.18 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.17 2013/08/18 15:58:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.18 2014/09/13 18:08:38 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -98,14 +98,14 @@
/* boot configuration: */
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_freeend_low;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_freeend_low;
+vaddr_t physical_end;
u_int free_pages;
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
//static struct arm32_dma_range dma_ranges[4];
diff -r 5eadecfcfb78 -r 46c8b81ac970 sys/arch/arm/footbridge/isa/isa_io.c
--- a/sys/arch/arm/footbridge/isa/isa_io.c Sat Sep 13 17:50:27 2014 +0000
+++ b/sys/arch/arm/footbridge/isa/isa_io.c Sat Sep 13 18:08:38 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_io.c,v 1.7 2012/02/12 16:34:07 matt Exp $ */
+/* $NetBSD: isa_io.c,v 1.8 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright 1997
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.7 2012/02/12 16:34:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.8 2014/09/13 18:08:38 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -222,7 +222,7 @@
/* bus space functions */
void
Home |
Main Index |
Thread Index |
Old Index