diff options
| author | simonb <simonb@NetBSD.org> | 2000-06-26 04:55:19 +0000 |
|---|---|---|
| committer | simonb <simonb@NetBSD.org> | 2000-06-26 04:55:19 +0000 |
| commit | 889c658b5bade4e72ee61a17ccc6b886541a16ee (patch) | |
| tree | 0f00804a921864ab4d9f6ef08d469cbdc9a9cf33 /sys/dev/ic | |
| parent | 472221aa398d2e7677796734a88fde50951e3ebc (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/dev/ic')
| -rw-r--r-- | sys/dev/ic/ad1848var.h | 4 | ||||
| -rw-r--r-- | sys/dev/ic/interwave.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/interwavevar.h | 4 | ||||
| -rw-r--r-- | sys/dev/ic/rrunner.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/vga.c | 10 |
5 files changed, 14 insertions, 14 deletions
diff --git a/sys/dev/ic/ad1848var.h b/sys/dev/ic/ad1848var.h index 08850ed3527..a554a4e8d27 100644 --- a/sys/dev/ic/ad1848var.h +++ b/sys/dev/ic/ad1848var.h @@ -1,4 +1,4 @@ -/* $NetBSD: ad1848var.h,v 1.6 1999/10/05 03:31:35 itohy Exp $ */ +/* $NetBSD: ad1848var.h,v 1.7 2000/06/26 04:56:18 simonb Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -199,7 +199,7 @@ int ad1848_from_vol __P((mixer_ctrl_t *, struct ad1848_volume *)); int ad1848_halt_output __P((void *)); int ad1848_halt_input __P((void *)); -int ad1848_mappage __P((void *, void *, int, int)); +paddr_t ad1848_mappage __P((void *, void *, off_t, int)); #ifdef AUDIO_DEBUG void ad1848_dump_regs __P((struct ad1848_softc *)); diff --git a/sys/dev/ic/interwave.c b/sys/dev/ic/interwave.c index a07f51438b7..e6e0242a418 100644 --- a/sys/dev/ic/interwave.c +++ b/sys/dev/ic/interwave.c @@ -1,4 +1,4 @@ -/* $NetBSD: interwave.c,v 1.12 2000/02/07 22:07:30 thorpej Exp $ */ +/* $NetBSD: interwave.c,v 1.13 2000/06/26 04:56:18 simonb Exp $ */ /* * Copyright (c) 1997, 1999 The NetBSD Foundation, Inc. @@ -1653,11 +1653,11 @@ iw_round_buffersize(addr, direction, size) return (size); } -int +paddr_t iw_mappage(addr, mem, off, prot) void *addr; void *mem; - int off; + off_t off; int prot; { return isa_mappage(mem, off, prot); diff --git a/sys/dev/ic/interwavevar.h b/sys/dev/ic/interwavevar.h index 8a1166ec534..c545868725f 100644 --- a/sys/dev/ic/interwavevar.h +++ b/sys/dev/ic/interwavevar.h @@ -1,4 +1,4 @@ -/* $NetBSD: interwavevar.h,v 1.7 2000/02/07 22:07:30 thorpej Exp $ */ +/* $NetBSD: interwavevar.h,v 1.8 2000/06/26 04:56:18 simonb Exp $ */ /* * Copyright (c) 1997, 1999 The NetBSD Foundation, Inc. @@ -250,7 +250,7 @@ int iw_query_devinfo __P((void *, mixer_devinfo_t *)); void * iw_malloc __P((void *, int, size_t, int, int)); void iw_free __P((void *,void *,int)); size_t iw_round_buffersize __P((void *, int, size_t)); -int iw_mappage __P((void *, void *, int, int)); +paddr_t iw_mappage __P((void *, void *, off_t, int)); int iw_get_props __P((void *)); #endif /* INTERWAVEVAR_H */ diff --git a/sys/dev/ic/rrunner.c b/sys/dev/ic/rrunner.c index c06058f49d4..3fbe0635db7 100644 --- a/sys/dev/ic/rrunner.c +++ b/sys/dev/ic/rrunner.c @@ -1,4 +1,4 @@ -/* $NetBSD: rrunner.c,v 1.16 2000/06/08 22:43:15 cgd Exp $ */ +/* $NetBSD: rrunner.c,v 1.17 2000/06/26 04:56:19 simonb Exp $ */ /* * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -132,7 +132,7 @@ void esh_fpstop __P((struct tty *tp, int rw)); int esh_fppoll __P((dev_t dev, int events, struct proc *p)); #ifdef MORE_DONE -int esh_fpmmap __P((dev_t, int, int)); +paddr_t esh_fpmmap __P((dev_t, off_t, int)); #endif /* General routines, not externally visable */ diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c index 30046677f4f..dbc37b2d199 100644 --- a/sys/dev/ic/vga.c +++ b/sys/dev/ic/vga.c @@ -1,4 +1,4 @@ -/* $NetBSD: vga.c,v 1.28 2000/06/17 07:11:50 soda Exp $ */ +/* $NetBSD: vga.c,v 1.29 2000/06/26 04:56:19 simonb Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -102,7 +102,7 @@ struct vga_config { void *switchcbarg; #ifdef arc - int (*vc_mmap) __P((void *, off_t, int)); + paddr_t (*vc_mmap) __P((void *, off_t, int)); #endif struct callout vc_switch_callout; @@ -235,7 +235,7 @@ const struct wsscreen_list vga_screenlist = { }; static int vga_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); -static int vga_mmap __P((void *, off_t, int)); +static paddr_t vga_mmap __P((void *, off_t, int)); static int vga_alloc_screen __P((void *, const struct wsscreen_descr *, void **, int *, int *, long *)); static void vga_free_screen __P((void *, void *)); @@ -524,7 +524,7 @@ vga_extended_attach(self, iot, memt, type, map) struct device *self; bus_space_tag_t iot, memt; int type; - int (*map) __P((void *, off_t, int)); + int (*map) __P((void *, vaddr_t, int)); { #endif /* arc */ int console; @@ -636,7 +636,7 @@ vga_ioctl(v, cmd, data, flag, p) return -1; } -static int +static paddr_t vga_mmap(v, offset, prot) void *v; off_t offset; |
