[src/trunk]: src/sys/arch/arm/include s/vm_offset_t/vaddr_t/g

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/80d04507cfbf
branches:  trunk
changeset: 504487:80d04507cfbf
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Mar 04 03:40:58 2001 +0000

description:
s/vm_offset_t/vaddr_t/g

diffstat:

 sys/arch/arm/include/arm32/bus.h   |   4 ++--
 sys/arch/arm/include/arm32/pmap.h  |  26 +++++++++++++-------------
 sys/arch/arm/include/db_machdep.h  |   4 ++--
 sys/arch/arm/include/isa_machdep.h |  14 +++++++-------
 4 files changed, 24 insertions(+), 24 deletions(-)

diffs (151 lines):

diff -r 353529ff8ca3 -r 80d04507cfbf sys/arch/arm/include/arm32/bus.h
--- a/sys/arch/arm/include/arm32/bus.h  Sun Mar 04 03:40:39 2001 +0000
+++ b/sys/arch/arm/include/arm32/bus.h  Sun Mar 04 03:40:58 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus.h,v 1.1 2001/02/23 21:23:49 reinoud Exp $  */
+/*     $NetBSD: bus.h,v 1.2 2001/03/04 03:40:58 matt Exp $     */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -787,7 +787,7 @@
 int    _bus_dmamem_alloc_range __P((bus_dma_tag_t tag, 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));
+           vaddr_t low, vaddr_t high));
 #endif /* _ARM32_BUS_DMA_PRIVATE */
 
 #endif /* _ARM32_BUS_H_ */
diff -r 353529ff8ca3 -r 80d04507cfbf sys/arch/arm/include/arm32/pmap.h
--- a/sys/arch/arm/include/arm32/pmap.h Sun Mar 04 03:40:39 2001 +0000
+++ b/sys/arch/arm/include/arm32/pmap.h Sun Mar 04 03:40:58 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.1 2001/02/23 21:23:49 reinoud Exp $ */
+/*     $NetBSD: pmap.h,v 1.2 2001/03/04 03:50:33 matt Exp $    */
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -47,7 +47,7 @@
 struct l1pt {
        SIMPLEQ_ENTRY(l1pt)     pt_queue;       /* Queue pointers */
        struct pglist           pt_plist;       /* Allocated page list */
-       vm_offset_t             pt_va;          /* Allocated virtual address */
+       vaddr_t                 pt_va;          /* Allocated virtual address */
        int                     pt_flags;       /* Flags */
 };
 #define        PTFLAG_STATIC           1               /* Statically allocated */
@@ -61,8 +61,8 @@
        pd_entry_t              *pm_pdir;       /* KVA of page directory */
        struct l1pt             *pm_l1pt;       /* L1 descriptor */
        void                    *pm_unused1;    /* Reserved for l2 map */
-       vm_offset_t             pm_pptpt;       /* PA of pt's page table */
-       vm_offset_t             pm_vptpt;       /* VA of pt's page table */
+       vaddr_t                 pm_pptpt;       /* PA of pt's page table */
+       vaddr_t                 pm_vptpt;       /* VA of pt's page table */
        short                   pm_dref;        /* page directory ref count */
        short                   pm_count;       /* pmap reference count */
        simple_lock_data_t      pm_lock;        /* lock on pmap */
@@ -78,7 +78,7 @@
 typedef struct pv_entry {
        struct pv_entry *pv_next;       /* next pv_entry */
        pmap_t          pv_pmap;        /* pmap where mapping lies */
-       vm_offset_t     pv_va;          /* virtual address for mapping */
+       vaddr_t         pv_va;          /* virtual address for mapping */
        int             pv_flags;       /* flags */
 } *pv_entry_t;
 
@@ -115,7 +115,7 @@
  * entry address for each page hook.
  */
 typedef struct {
-        vm_offset_t va;
+        vaddr_t va;
         pt_entry_t *pte;
 } pagehook_t;
 
@@ -125,8 +125,8 @@
  * addresses of various pages
  */
 typedef struct {
-       vm_offset_t pv_pa;
-       vm_offset_t pv_va;
+       vaddr_t pv_pa;
+       vaddr_t pv_va;
 } pv_addr_t;
 
 /*
@@ -155,10 +155,10 @@
 /*
  * Functions that we need to export
  */
-extern boolean_t pmap_testbit __P((vm_offset_t, int));
-extern void pmap_changebit __P((vm_offset_t, int, int));
-extern vm_offset_t pmap_map __P((vm_offset_t, vm_offset_t, vm_offset_t, int));
-void   pmap_procwr __P((struct proc *, vm_offset_t, u_long));
+extern boolean_t pmap_testbit __P((vaddr_t, int));
+extern void pmap_changebit __P((vaddr_t, int, int));
+extern vaddr_t pmap_map __P((vaddr_t, vaddr_t, vaddr_t, int));
+void   pmap_procwr __P((struct proc *, vaddr_t, u_long));
 #define        PMAP_NEED_PROCWR
 
 #endif /* _KERNEL */
@@ -177,7 +177,7 @@
        ((*vtopte(va) & PG_FRAME) | ((unsigned int)(va) & ~PG_FRAME))
 
 /* L1 and L2 page table macros */
-#define pmap_pde(m, v) (&((m)->pm_pdir[((vm_offset_t)(v) >> PDSHIFT)&4095]))
+#define pmap_pde(m, v) (&((m)->pm_pdir[((vaddr_t)(v) >> PDSHIFT)&4095]))
 #define pmap_pte_pa(pte)       (*(pte) & PG_FRAME)
 #define pmap_pde_v(pde)                (*(pde) != 0)
 #define pmap_pte_v(pte)                (*(pte) != 0)
diff -r 353529ff8ca3 -r 80d04507cfbf sys/arch/arm/include/db_machdep.h
--- a/sys/arch/arm/include/db_machdep.h Sun Mar 04 03:40:39 2001 +0000
+++ b/sys/arch/arm/include/db_machdep.h Sun Mar 04 03:40:58 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_machdep.h,v 1.1 2001/02/23 21:23:47 reinoud Exp $   */
+/*     $NetBSD: db_machdep.h,v 1.2 2001/03/04 03:50:33 matt Exp $      */
 
 /*
  * Copyright (c) 1996 Scott K Stevens
@@ -42,7 +42,7 @@
 
 /* end of mangling */
 
-typedef        vm_offset_t     db_addr_t;      /* address - unsigned */
+typedef        vaddr_t         db_addr_t;      /* address - unsigned */
 typedef        long            db_expr_t;      /* expression - signed */
 
 typedef trapframe_t db_regs_t;
diff -r 353529ff8ca3 -r 80d04507cfbf sys/arch/arm/include/isa_machdep.h
--- a/sys/arch/arm/include/isa_machdep.h        Sun Mar 04 03:40:39 2001 +0000
+++ b/sys/arch/arm/include/isa_machdep.h        Sun Mar 04 03:40:58 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isa_machdep.h,v 1.1 2001/02/23 21:23:47 reinoud Exp $  */
+/*     $NetBSD: isa_machdep.h,v 1.2 2001/03/04 03:50:33 matt Exp $     */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -166,17 +166,17 @@
 #define VGA_BUF             0xA0000
 #define VGA_BUF_LEN         (0xBFFFF - 0xA0000)
 
-void           isa_init(vm_offset_t, vm_offset_t);
-void           isa_io_init(vm_offset_t, vm_offset_t);
-void           isa_dma_init(void);
-vm_offset_t    isa_io_data_vaddr(void);
-vm_offset_t    isa_mem_data_vaddr(void);
+void   isa_init(vaddr_t, vaddr_t);
+void   isa_io_init(vaddr_t, vaddr_t);
+void   isa_dma_init(void);
+vaddr_t        isa_io_data_vaddr(void);
+vaddr_t        isa_mem_data_vaddr(void);
 int isa_intr_alloc(isa_chipset_tag_t ic, int mask, int type, int *irq);
 
 /*
  * Miscellanous functions.
  */
 void sysbeep(int, int);                /* beep with the system speaker */
-void isa_fillw(u_short val, void *addr, size_t len);
+void isa_fillw(u_int val, void *addr, size_t len);
 
 #endif /* _ARM32_ISA_MACHDEP_H_ XXX */