summaryrefslogtreecommitdiff
path: root/sys/arch/hp300/dev
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2010-12-26 15:41:01 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2010-12-26 15:41:01 +0000
commit55d0ea063b25d8b25fea5135f59de22437ecd4ea (patch)
tree42c739678ad68f903e06cc29eb0db1df3bf6298e /sys/arch/hp300/dev
parent47f20d782a94ebc11fb4c7b43294559377be4989 (diff)
Kill pmap_phys_address(), and force every driver's mmap() routine to return
a physical address [more precisely, something suitable to pass to pmap_enter()'sphysical address argument]. This allows MI drivers to implement mmap() routines without having to know about the pmap_phys_address() implementation and #ifdef obfuscation.
Diffstat (limited to 'sys/arch/hp300/dev')
-rw-r--r--sys/arch/hp300/dev/diofb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/hp300/dev/diofb.c b/sys/arch/hp300/dev/diofb.c
index 25ba07ce5d7..45996399714 100644
--- a/sys/arch/hp300/dev/diofb.c
+++ b/sys/arch/hp300/dev/diofb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diofb.c,v 1.17 2009/09/05 14:09:35 miod Exp $ */
+/* $OpenBSD: diofb.c,v 1.18 2010/12/26 15:40:59 miod Exp $ */
/*
* Copyright (c) 2005, Miodrag Vallat
@@ -487,12 +487,12 @@ diofb_mmap(void * v, off_t offset, int prot)
switch (fb->mapmode) {
case WSDISPLAYIO_MODE_MAPPED:
if (offset >= 0 && offset < DIOFB_REGSPACE)
- return (((paddr_t)fb->regaddr + offset) >> PGSHIFT);
+ return ((paddr_t)fb->regaddr + offset);
offset -= DIOFB_REGSPACE;
/* FALLTHROUGH */
case WSDISPLAYIO_MODE_DUMBFB:
if (offset >= 0 && offset < fb->fbsize)
- return (((paddr_t)fb->fbaddr + offset) >> PGSHIFT);
+ return ((paddr_t)fb->fbaddr + offset);
break;
}