summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraaron <aaron@openbsd.org>2001-01-31 02:12:28 +0000
committeraaron <aaron@openbsd.org>2001-01-31 02:12:28 +0000
commit85dd27d363c8c1afaa135c93816bcc41c4ab75be (patch)
tree5b855be820430259807c38260f72e2815f304bc9
parentone entry for ttyC0; brad (diff)
downloadwireguard-openbsd-85dd27d363c8c1afaa135c93816bcc41c4ab75be.tar.xz
wireguard-openbsd-85dd27d363c8c1afaa135c93816bcc41c4ab75be.zip
Some int -> u_long (I incorrectly converted paddr_t to int when porting this).
-rw-r--r--sys/dev/ic/vga.c6
-rw-r--r--sys/dev/isa/pcdisplay.c4
-rw-r--r--sys/dev/wscons/wsdisplayvar.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c
index 43f0feb7d3e..6441f204470 100644
--- a/sys/dev/ic/vga.c
+++ b/sys/dev/ic/vga.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga.c,v 1.14 2000/11/22 01:39:38 aaron Exp $ */
+/* $OpenBSD: vga.c,v 1.15 2001/01/31 02:12:28 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 *));
-int vga_mmap __P((void *, off_t, int));
+u_long 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;
}
-int
+u_long
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 a4e7f5be015..0cba2c79564 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 int pcdisplay_mmap __P((void *, off_t, int));
+static u_long 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 int
+static u_long
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 413a774fb79..18561d195a8 100644
--- a/sys/dev/wscons/wsdisplayvar.h
+++ b/sys/dev/wscons/wsdisplayvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplayvar.h,v 1.3 2000/11/15 20:00:39 aaron Exp $ */
+/* $OpenBSD: wsdisplayvar.h,v 1.4 2001/01/31 02:12:29 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));
- int (*mmap) __P((void *v, off_t off, int prot));
+ u_long (*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 *));