summaryrefslogtreecommitdiff
path: root/sys/arch/atari/dev
diff options
context:
space:
mode:
authorsimonb <simonb@NetBSD.org>2000-06-26 04:55:19 +0000
committersimonb <simonb@NetBSD.org>2000-06-26 04:55:19 +0000
commit889c658b5bade4e72ee61a17ccc6b886541a16ee (patch)
tree0f00804a921864ab4d9f6ef08d469cbdc9a9cf33 /sys/arch/atari/dev
parent472221aa398d2e7677796734a88fde50951e3ebc (diff)
Change the kernel mmap interface so that the offset to map is an
"off_t" and the return value is a "paddr_t" to allow mappings at offsets past 2^31 bytes. Somewhat inspired by FreeBSD, which only changed the offset to a "vm_offset_t". Includes updates for the i386, pc532 and sh3 mmmmap from Jason Thorpe.
Diffstat (limited to 'sys/arch/atari/dev')
-rw-r--r--sys/arch/atari/dev/grf.c15
-rw-r--r--sys/arch/atari/dev/view.c15
2 files changed, 16 insertions, 14 deletions
diff --git a/sys/arch/atari/dev/grf.c b/sys/arch/atari/dev/grf.c
index c5d94514bd3..66165d2a749 100644
--- a/sys/arch/atari/dev/grf.c
+++ b/sys/arch/atari/dev/grf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: grf.c,v 1.22 1998/12/20 14:32:53 thomas Exp $ */
+/* $NetBSD: grf.c,v 1.23 2000/06/26 04:55:34 simonb Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -282,10 +282,11 @@ grfpoll(dev, events, p)
* map the contents of a graphics display card into process'
* memory space.
*/
-int
+paddr_t
grfmmap(dev, off, prot)
-dev_t dev;
-int off, prot;
+ dev_t dev;
+ off_t off;
+ int prot;
{
struct grf_softc *gp;
struct grfinfo *gi;
@@ -301,19 +302,19 @@ int off, prot;
* control registers
*/
if (off >= 0 && off < gi->gd_regsize)
- return(((u_int)gi->gd_regaddr + off) >> PGSHIFT);
+ return(((paddr_t)gi->gd_regaddr + off) >> PGSHIFT);
/*
* VGA memory
*/
if (off >= vgabase && off < (vgabase + gi->gd_vgasize))
- return(((u_int)gi->gd_vgaaddr - vgabase + off) >> PGSHIFT);
+ return(((paddr_t)gi->gd_vgaaddr - vgabase + off) >> PGSHIFT);
/*
* frame buffer
*/
if (off >= linbase && off < (linbase + gi->gd_fbsize))
- return(((u_int)gi->gd_fbaddr - linbase + off) >> PGSHIFT);
+ return(((paddr_t)gi->gd_fbaddr - linbase + off) >> PGSHIFT);
return(-1);
}
diff --git a/sys/arch/atari/dev/view.c b/sys/arch/atari/dev/view.c
index 5a588ac94f6..c9098f88e2f 100644
--- a/sys/arch/atari/dev/view.c
+++ b/sys/arch/atari/dev/view.c
@@ -1,4 +1,4 @@
-/* $NetBSD: view.c,v 1.16 1998/12/20 14:32:53 thomas Exp $ */
+/* $NetBSD: view.c,v 1.17 2000/06/26 04:55:34 simonb Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -398,10 +398,11 @@ struct proc *p;
}
/*ARGSUSED*/
-int
+paddr_t
viewmmap(dev, off, prot)
-dev_t dev;
-int off, prot;
+ dev_t dev;
+ off_t off;
+ int prot;
{
struct view_softc *vu;
bmap_t *bm;
@@ -418,19 +419,19 @@ int off, prot;
* control registers
*/
if (off >= 0 && off < bm->reg_size)
- return(((u_int)bm->hw_regs + off) >> PGSHIFT);
+ return(((paddr_t)bm->hw_regs + off) >> PGSHIFT);
/*
* VGA memory
*/
if (off >= bmd_vga && off < (bmd_vga + bm->vga_mappable))
- return(((u_int)bm->vga_address - bmd_vga + off) >> PGSHIFT);
+ return(((paddr_t)bm->vga_address - bmd_vga + off) >> PGSHIFT);
/*
* frame buffer
*/
if (off >= bmd_lin && off < (bmd_lin + bm->phys_mappable))
- return(((u_int)bmd_start - bmd_lin + off) >> PGSHIFT);
+ return(((paddr_t)bmd_start - bmd_lin + off) >> PGSHIFT);
return(-1);
}