diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 2001-01-31 16:38:03 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 2001-01-31 16:38:03 +0000 |
| commit | 9337e383d2a63a9fe7f2562ce38cafac86e53c9e (patch) | |
| tree | 2e178808bc03f7a0d8fd4d76ede8b4dbdc18e5db | |
| parent | d43ec8d2f54af07f14bcad136dfe1c0ac9bdcf06 (diff) | |
OpenBSD does have paddr_t, I can't explain why I thought it didn't; art@
| -rw-r--r-- | sys/dev/ic/vga.c | 6 | ||||
| -rw-r--r-- | sys/dev/isa/pcdisplay.c | 4 | ||||
| -rw-r--r-- | sys/dev/wscons/wsdisplayvar.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c index 6441f204470..c2d59fb6e47 100644 --- a/sys/dev/ic/vga.c +++ b/sys/dev/ic/vga.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vga.c,v 1.15 2001/01/31 02:12:28 aaron Exp $ */ +/* $OpenBSD: vga.c,v 1.16 2001/01/31 16:38:00 aaron Exp $ */ /* $NetBSD: vga.c,v 1.28.2.1 2000/06/30 16:27:47 simonb Exp $ */ /* @@ -240,7 +240,7 @@ const struct wsscreen_list vga_screenlist = { }; int vga_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); -u_long vga_mmap __P((void *, off_t, int)); +paddr_t vga_mmap __P((void *, off_t, int)); int vga_alloc_screen __P((void *, const struct wsscreen_descr *, void **, int *, int *, long *)); void vga_free_screen __P((void *, void *)); @@ -647,7 +647,7 @@ vga_ioctl(v, cmd, data, flag, p) return -1; } -u_long +paddr_t vga_mmap(v, offset, prot) void *v; off_t offset; diff --git a/sys/dev/isa/pcdisplay.c b/sys/dev/isa/pcdisplay.c index 0cba2c79564..dd8daae7d5e 100644 --- a/sys/dev/isa/pcdisplay.c +++ b/sys/dev/isa/pcdisplay.c @@ -109,7 +109,7 @@ const struct wsscreen_list pcdisplay_screenlist = { }; static int pcdisplay_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); -static u_long pcdisplay_mmap __P((void *, off_t, int)); +static paddr_t pcdisplay_mmap __P((void *, off_t, int)); static int pcdisplay_alloc_screen __P((void *, const struct wsscreen_descr *, void **, int *, int *, long *)); static void pcdisplay_free_screen __P((void *, void *)); @@ -346,7 +346,7 @@ pcdisplay_ioctl(v, cmd, data, flag, p) return (-1); } -static u_long +static paddr_t pcdisplay_mmap(v, offset, prot) void *v; off_t offset; diff --git a/sys/dev/wscons/wsdisplayvar.h b/sys/dev/wscons/wsdisplayvar.h index 18561d195a8..fdd4cec4c65 100644 --- a/sys/dev/wscons/wsdisplayvar.h +++ b/sys/dev/wscons/wsdisplayvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsdisplayvar.h,v 1.4 2001/01/31 02:12:29 aaron Exp $ */ +/* $OpenBSD: wsdisplayvar.h,v 1.5 2001/01/31 16:38:02 aaron Exp $ */ /* $NetBSD: wsdisplayvar.h,v 1.14.4.1 2000/06/30 16:27:53 simonb Exp $ */ /* @@ -104,7 +104,7 @@ struct wsdisplay_font; struct wsdisplay_accessops { int (*ioctl) __P((void *v, u_long cmd, caddr_t data, int flag, struct proc *p)); - u_long (*mmap) __P((void *v, off_t off, int prot)); + paddr_t (*mmap) __P((void *v, off_t off, int prot)); int (*alloc_screen) __P((void *, const struct wsscreen_descr *, void **, int *, int *, long *)); void (*free_screen) __P((void *, void *)); |