Module Name: src
Committed By: matt
Date: Sat Sep 13 17:41:03 UTC 2014
Modified Files:
src/sys/arch/arm/include: cpufunc_proto.h ofw.h types.h
Log Message:
vm_offset_t -> vaddr_t, vm_size_t -> vsize_t
nuke vm_offset_t and vm_size_t
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/include/cpufunc_proto.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/include/ofw.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/include/types.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/cpufunc_proto.h
diff -u src/sys/arch/arm/include/cpufunc_proto.h:1.2 src/sys/arch/arm/include/cpufunc_proto.h:1.3
--- src/sys/arch/arm/include/cpufunc_proto.h:1.2 Sat Apr 19 00:33:24 2014
+++ src/sys/arch/arm/include/cpufunc_proto.h Sat Sep 13 17:41:03 2014
@@ -333,11 +333,11 @@ void pj4b_context_switch(u_int);
void pj4b_tlb_flushID(void);
void pj4b_tlb_flushID_SE(vaddr_t);
-void pj4b_icache_sync_range(vm_offset_t, vm_size_t);
-void pj4b_idcache_wbinv_range(vm_offset_t, vm_size_t);
-void pj4b_dcache_wbinv_range(vm_offset_t, vm_size_t);
-void pj4b_dcache_inv_range(vm_offset_t, vm_size_t);
-void pj4b_dcache_wb_range(vm_offset_t, vm_size_t);
+void pj4b_icache_sync_range(vaddr_t, vsize_t);
+void pj4b_idcache_wbinv_range(vaddr_t, vsize_t);
+void pj4b_dcache_wbinv_range(vaddr_t, vsize_t);
+void pj4b_dcache_inv_range(vaddr_t, vsize_t);
+void pj4b_dcache_wb_range(vaddr_t, vsize_t);
void pj4b_drain_writebuf(void);
void pj4b_drain_readbuf(void);
Index: src/sys/arch/arm/include/ofw.h
diff -u src/sys/arch/arm/include/ofw.h:1.4 src/sys/arch/arm/include/ofw.h:1.5
--- src/sys/arch/arm/include/ofw.h:1.4 Wed Jan 29 00:42:15 2014
+++ src/sys/arch/arm/include/ofw.h Sat Sep 13 17:41:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw.h,v 1.4 2014/01/29 00:42:15 matt Exp $ */
+/* $NetBSD: ofw.h,v 1.5 2014/09/13 17:41:03 matt Exp $ */
/*
* Copyright 1997
@@ -52,13 +52,12 @@ void ofw_init(ofw_handle_t);
void ofw_boot(int, char *);
void ofw_getbootinfo(char **, char **);
void ofw_configmem(void);
-void ofw_configisa(vm_offset_t *, vm_offset_t *);
-void ofw_configisadma(vm_offset_t *);
-int ofw_isadmarangeintersect(vm_offset_t, vm_offset_t,
- vm_offset_t *, vm_offset_t *);
-vm_offset_t ofw_gettranslation(vm_offset_t);
-vm_offset_t ofw_map(vm_offset_t, vm_size_t, int);
-vm_offset_t ofw_getcleaninfo(void);
+void ofw_configisa(vaddr_t *, vaddr_t *);
+void ofw_configisadma(vaddr_t *);
+int ofw_isadmarangeintersect(vaddr_t, vaddr_t, vaddr_t *, vaddr_t *);
+vaddr_t ofw_gettranslation(vaddr_t);
+vaddr_t ofw_map(vaddr_t, vsize_t, int);
+vaddr_t ofw_getcleaninfo(void);
#ifdef OFWGENCFG
/* Implemented in <ofw/ofwgencfg_machdep.c> */
Index: src/sys/arch/arm/include/types.h
diff -u src/sys/arch/arm/include/types.h:1.28 src/sys/arch/arm/include/types.h:1.29
--- src/sys/arch/arm/include/types.h:1.28 Tue Aug 5 06:24:56 2014
+++ src/sys/arch/arm/include/types.h Sat Sep 13 17:41:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.28 2014/08/05 06:24:56 skrll Exp $ */
+/* $NetBSD: types.h,v 1.29 2014/09/13 17:41:03 matt Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -46,9 +46,6 @@ typedef struct label_t { /* Used by setj
/* NB: This should probably be if defined(_KERNEL) */
#if defined(_NETBSD_SOURCE)
-typedef unsigned long vm_offset_t; /* depreciated */
-typedef unsigned long vm_size_t; /* depreciated */
-
typedef unsigned long paddr_t;
typedef unsigned long psize_t;
typedef unsigned long vaddr_t;
