* Fix a couple of places in the device pager where an address was

  truncated to 32 bits.
* Change the calling convention of the device mmap entry point to
  pass a vm_offset_t instead of an int for the offset allowing
  devices with a larger memory map than (1<<32) to be supported
  on the alpha (/dev/mem is one such).

These changes are required to allow the X server to mmap the various
I/O regions used for device port and memory access on the alpha.

5 files changed, 7 insertions, 7 deletions

diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index d26b9ee..1994f12 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.51 1998/06/07 17:10:02 dfr Exp $
+ *	$Id: mem.c,v 1.52 1998/06/21 11:33:29 bde Exp $
  */
 
 /*
@@ -381,7 +381,7 @@ mmrw(dev, uio, flags)
 * instead of going through read/write			*
 \*******************************************************/
 static int
-memmmap(dev_t dev, int offset, int nprot)
+memmmap(dev_t dev, vm_offset_t offset, int nprot)
 {
 	switch (minor(dev))
 	{
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index 0fd7e84..99217c0 100644
--- a/sys/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/i386/isa/pcvt/pcvt_drv.c
@@ -770,7 +770,7 @@ do_standard:
 }
 
 int
-pcmmap(Dev_t dev, int offset, int nprot)
+pcmmap(Dev_t dev, vm_offset_t offset, int nprot)
 {
 	if (offset > 0x20000 - PAGE_SIZE)
 		return -1;
diff --git a/sys/i386/isa/snd/sound.c b/sys/i386/isa/snd/sound.c
index 58b4b08..6a26c07 100644
--- a/sys/i386/isa/snd/sound.c
+++ b/sys/i386/isa/snd/sound.c
@@ -1226,7 +1226,7 @@ sndselect(dev_t i_dev, int rw, struct proc * p)
 #include <vm/vm_extern.h>
 
 static int
-sndmmap(dev_t dev, int offset, int nprot)
+sndmmap(dev_t dev, vm_offset_t offset, int nprot)
 {
     snddev_info *d = get_snddev_info(dev, NULL);
 
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index 2f7c4ab..e0f33a7 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -259,7 +259,7 @@ struct	spigot_softc	*ss = (struct spigot_softc *)&spigot_softc[unit];
 }
 
 static	int
-spigot_mmap(dev_t dev, int offset, int nprot)
+spigot_mmap(dev_t dev, vm_offset_t offset, int nprot)
 {
 struct	spigot_softc	*ss = (struct spigot_softc *)&spigot_softc[0];
 
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index d4178e8..a9c6fc9 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscons.c,v 1.285 1998/10/22 05:58:40 bde Exp $
+ *	$Id: syscons.c,v 1.286 1998/11/03 02:37:46 yokota Exp $
  */
 
 #include "sc.h"
@@ -3855,7 +3855,7 @@ next_code:
 }
 
 int
-scmmap(dev_t dev, int offset, int nprot)
+scmmap(dev_t dev, vm_offset_t offset, int nprot)
 {
     if (offset > 0x20000 - PAGE_SIZE)
 	return -1;