diff --git a/sys/arch/pmax/dev/fb_usrreq.c b/sys/arch/pmax/dev/fb_usrreq.c index be4b1d766d5e..06f8483b35f0 100644 --- a/sys/arch/pmax/dev/fb_usrreq.c +++ b/sys/arch/pmax/dev/fb_usrreq.c @@ -1,4 +1,4 @@ -/* $NetBSD: fb_usrreq.c,v 1.12 1998/11/19 15:38:23 mrg Exp $ */ +/* $NetBSD: fb_usrreq.c,v 1.13 1999/01/16 07:05:05 nisimura Exp $ */ /*ARGSUSED*/ int @@ -251,7 +251,7 @@ fbmmap(dev, off, prot) (fi = fbcd.cd_devs[minor(dev)]) == NULL) return(-1); - len = mips_round_page(((vm_offset_t)fi->fi_fbu & PGOFSET) + len = mips_round_page(((vaddr_t)fi->fi_fbu & PGOFSET) + sizeof(*fi->fi_fbu)); if (off < len) return (int)mips_btop(MIPS_KSEG0_TO_PHYS(fi->fi_fbu) + off); diff --git a/sys/arch/pmax/dev/qvss_compat.c b/sys/arch/pmax/dev/qvss_compat.c index 54c2d4b41e0a..74156e3a095c 100644 --- a/sys/arch/pmax/dev/qvss_compat.c +++ b/sys/arch/pmax/dev/qvss_compat.c @@ -1,4 +1,4 @@ -/* $NetBSD: qvss_compat.c,v 1.12 1998/03/31 11:32:53 jonathan Exp $ */ +/* $NetBSD: qvss_compat.c,v 1.13 1999/01/16 07:05:05 nisimura Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -473,17 +473,17 @@ fbmmap_fb(fi, dev, data, p) struct proc *p; { int error; - vm_offset_t addr; - vm_size_t len; + vaddr_t addr; + vsize_t len; struct vnode vn; struct specinfo si; struct fbuaccess *fbp; register struct fbuaccess *fbu = fi->fi_fbu; - len = mips_round_page(((vm_offset_t)fbu & PGOFSET) + + len = mips_round_page(((vaddr_t)fbu & PGOFSET) + sizeof(struct fbuaccess)) + mips_round_page(fi->fi_type.fb_size); - addr = (vm_offset_t)0x20000000; /* XXX */ + addr = (vaddr_t)0x20000000; /* XXX */ vn.v_type = VCHR; /* XXX */ vn.v_specinfo = &si; /* XXX */ vn.v_rdev = dev; /* XXX */ @@ -494,15 +494,15 @@ fbmmap_fb(fi, dev, data, p) #if defined(UVM) error = uvm_mmap(&p->p_vmspace->vm_map, &addr, len, VM_PROT_ALL, VM_PROT_ALL, MAP_SHARED, (caddr_t)&vn, - (vm_offset_t)0); + (vaddr_t)0); #else error = vm_mmap(&p->p_vmspace->vm_map, &addr, len, VM_PROT_ALL, VM_PROT_ALL, MAP_SHARED, (caddr_t)&vn, - (vm_offset_t)0); + (vaddr_t)0); #endif if (error) return (error); - fbp = (struct fbuaccess *)(addr + ((vm_offset_t)fbu & PGOFSET)); + fbp = (struct fbuaccess *)(addr + ((vaddr_t)fbu & PGOFSET)); *(PM_Info **)data = &fbp->scrInfo; fbu->scrInfo.qe.events = fbp->events; fbu->scrInfo.qe.tcs = fbp->tcs;