[src/trunk]: src/sys/arch/pmax clean up vm_{offset, size}_t, use {v, p}{addr, si...

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

details:   https://anonhg.NetBSD.org/src/rev/2c69cd383dfd
branches:  trunk
changeset: 482814:2c69cd383dfd
user:      soda <soda%NetBSD.org@localhost>
date:      Tue Feb 22 12:22:19 2000 +0000

description:
clean up vm_{offset,size}_t, use {v,p}{addr,size}_t instead

diffstat:

 sys/arch/pmax/dev/px.c    |  12 ++++++------
 sys/arch/pmax/pmax/kadb.c |  14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diffs (90 lines):

diff -r b172efa57b86 -r 2c69cd383dfd sys/arch/pmax/dev/px.c
--- a/sys/arch/pmax/dev/px.c    Tue Feb 22 12:17:52 2000 +0000
+++ b/sys/arch/pmax/dev/px.c    Tue Feb 22 12:22:19 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: px.c,v 1.28 2000/02/03 04:09:16 nisimura Exp $ */
+/*     $NetBSD: px.c,v 1.29 2000/02/22 12:22:19 soda Exp $     */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.28 2000/02/03 04:09:16 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.29 2000/02/22 12:22:19 soda Exp $");
 
 /*
  * px.c: driver for the DEC TURBOchannel 2D and 3D accelerated framebuffers
@@ -113,7 +113,7 @@
 static void    px_make_cursor __P((struct px_info *));
 static int     px_rect __P((struct px_info *, int, int, int, int, int));
 static void    px_qvss_init __P((struct px_info *));
-static int     px_mmap_info  __P((struct proc *, dev_t, vm_offset_t *));
+static int     px_mmap_info  __P((struct proc *, dev_t, vaddr_t *));
 static void    px_cursor_hack __P((struct fbinfo *, int, int));
 static int     px_probe_sram __P((struct px_info *));
 static void    px_bt459_flush __P((struct px_info *));
@@ -1768,7 +1768,7 @@
                /*
                 * Map card info.
                 */
-               return (px_mmap_info(p, dev, (vm_offset_t *)data));
+               return (px_mmap_info(p, dev, (vaddr_t *)data));
 
        case QIOCPMSTATE:
                /*
@@ -1920,12 +1920,12 @@
 px_mmap_info (p, dev, va)
        struct proc *p;
        dev_t dev;
-       vm_offset_t *va;
+       vaddr_t *va;
 {
        struct specinfo si;
        struct vnode vn;
        vm_prot_t prot;
-       vm_size_t size;
+       vsize_t size;
        int flags;
 
        vn.v_type = VCHR;                       /* XXX */
diff -r b172efa57b86 -r 2c69cd383dfd sys/arch/pmax/pmax/kadb.c
--- a/sys/arch/pmax/pmax/kadb.c Tue Feb 22 12:17:52 2000 +0000
+++ b/sys/arch/pmax/pmax/kadb.c Tue Feb 22 12:22:19 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kadb.c,v 1.6 1999/04/24 08:01:12 simonb Exp $  */
+/*     $NetBSD: kadb.c,v 1.7 2000/02/22 12:22:20 soda Exp $    */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -244,11 +244,11 @@
        i = suiword((caddr_t)va, MIPS_BREAK_SSTEP);
        if (i < 0) {
                struct proc *p = curproc;
-               vm_offset_t sa, ea;
+               vaddr_t sa, ea;
                int rv;
 
-               sa = trunc_page((vm_offset_t)va);
-               ea = round_page((vm_offset_t)va+sizeof(int)-1);
+               sa = trunc_page((vaddr_t)va);
+               ea = round_page((vaddr_t)va+sizeof(int)-1);
                rv = vm_map_protect(&p->p_vmspace->vm_map, sa, ea,
                        VM_PROT_DEFAULT, FALSE);
                if (rv == KERN_SUCCESS) {
@@ -299,11 +299,11 @@
        i = suiword((caddr_t)va, kdb_ss_instr);
        if (i < 0) {
                struct proc *p = curproc;
-               vm_offset_t sa, ea;
+               vaddr_t sa, ea;
                int rv;
 
-               sa = trunc_page((vm_offset_t)va);
-               ea = round_page((vm_offset_t)va+sizeof(int)-1);
+               sa = trunc_page((vaddr_t)va);
+               ea = round_page((vaddr_t)va+sizeof(int)-1);
                rv = vm_map_protect(&p->p_vmspace->vm_map, sa, ea,
                        VM_PROT_DEFAULT, FALSE);
                if (rv == KERN_SUCCESS) {