summaryrefslogtreecommitdiff
path: root/sys/dev/isa
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/isa')
-rw-r--r--sys/dev/isa/ad1848.c6
-rw-r--r--sys/dev/isa/ad1848var.h4
-rw-r--r--sys/dev/isa/ess.c8
-rw-r--r--sys/dev/isa/isadma.c6
-rw-r--r--sys/dev/isa/isadmavar.h4
-rw-r--r--sys/dev/isa/sbdsp.c6
-rw-r--r--sys/dev/isa/sbdspvar.h4
7 files changed, 19 insertions, 19 deletions
diff --git a/sys/dev/isa/ad1848.c b/sys/dev/isa/ad1848.c
index 8542b2ad56c..71ff0985d27 100644
--- a/sys/dev/isa/ad1848.c
+++ b/sys/dev/isa/ad1848.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ad1848.c,v 1.21 2001/04/12 07:51:56 csapuntz Exp $ */
+/* $OpenBSD: ad1848.c,v 1.22 2001/10/31 11:00:24 art Exp $ */
/* $NetBSD: ad1848.c,v 1.45 1998/01/30 02:02:38 augustss Exp $ */
/*
@@ -1670,11 +1670,11 @@ ad1848_round(addr, size)
return size;
}
-int
+paddr_t
ad1848_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/isa/ad1848var.h b/sys/dev/isa/ad1848var.h
index a0ab67c73a1..a866a2637a1 100644
--- a/sys/dev/isa/ad1848var.h
+++ b/sys/dev/isa/ad1848var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ad1848var.h,v 1.8 1999/01/07 06:14:46 niklas Exp $ */
+/* $OpenBSD: ad1848var.h,v 1.9 2001/10/31 11:00:24 art Exp $ */
/* $NetBSD: ad1848var.h,v 1.22 1998/01/19 22:18:26 augustss Exp $ */
/*
@@ -221,7 +221,7 @@ void ad1848_mute_channel __P((struct ad1848_softc *, int device, int mute));
void *ad1848_malloc __P((void *, unsigned long, int, int));
void ad1848_free __P((void *, void *, int));
unsigned long ad1848_round __P((void *, unsigned long));
-int ad1848_mappage __P((void *, void *, int, int));
+paddr_t ad1848_mappage __P((void *, void *, off_t, int));
int ad1848_get_props __P((void *));
diff --git a/sys/dev/isa/ess.c b/sys/dev/isa/ess.c
index 3b17037b357..4e2ad288181 100644
--- a/sys/dev/isa/ess.c
+++ b/sys/dev/isa/ess.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ess.c,v 1.4 2001/07/18 21:37:52 deraadt Exp $ */
+/* $OpenBSD: ess.c,v 1.5 2001/10/31 11:00:24 art Exp $ */
/* $NetBSD: ess.c,v 1.44.4.1 1999/06/21 01:18:00 thorpej Exp $ */
/*
@@ -151,7 +151,7 @@ int ess_get_port __P((void *, mixer_ctrl_t *));
void *ess_malloc __P((void *, unsigned long, int, int));
void ess_free __P((void *, void *, int));
unsigned long ess_round_buffersize __P((void *, unsigned long));
-int ess_mappage __P((void *, void *, int, int));
+paddr_t ess_mappage __P((void *, void *, off_t, int));
int ess_query_devinfo __P((void *, mixer_devinfo_t *));
@@ -2191,11 +2191,11 @@ ess_round_buffersize(addr, size)
return (size);
}
-int
+paddr_t
ess_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/isa/isadma.c b/sys/dev/isa/isadma.c
index 87fafdc0ccf..80efb570834 100644
--- a/sys/dev/isa/isadma.c
+++ b/sys/dev/isa/isadma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isadma.c,v 1.22 1999/01/11 01:49:00 millert Exp $ */
+/* $OpenBSD: isadma.c,v 1.23 2001/10/31 11:00:24 art Exp $ */
/* $NetBSD: isadma.c,v 1.32 1997/09/05 01:48:33 thorpej Exp $ */
/*-
@@ -726,10 +726,10 @@ isa_free(addr, pool)
free(m, pool);
}
-int
+paddr_t
isa_mappage(mem, off, prot)
void *mem;
- int off;
+ off_t off;
int prot;
{
struct isa_mem *m;
diff --git a/sys/dev/isa/isadmavar.h b/sys/dev/isa/isadmavar.h
index 318d85d14bb..829fd6cbad7 100644
--- a/sys/dev/isa/isadmavar.h
+++ b/sys/dev/isa/isadmavar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: isadmavar.h,v 1.11 1998/01/20 18:40:31 niklas Exp $ */
+/* $OpenBSD: isadmavar.h,v 1.12 2001/10/31 11:00:24 art Exp $ */
/* $NetBSD: isadmavar.h,v 1.10 1997/08/04 22:13:33 augustss Exp $ */
/*-
@@ -109,4 +109,4 @@ int isa_drq_isfree __P((struct device *, int));
void *isa_malloc __P((struct device *, int, size_t, int, int));
void isa_free __P((void *, int));
-int isa_mappage __P((void *, int, int));
+paddr_t isa_mappage __P((void *, off_t, int));
diff --git a/sys/dev/isa/sbdsp.c b/sys/dev/isa/sbdsp.c
index 02b09401981..5cdf4a8ec4e 100644
--- a/sys/dev/isa/sbdsp.c
+++ b/sys/dev/isa/sbdsp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbdsp.c,v 1.16 2001/04/12 07:46:46 csapuntz Exp $ */
+/* $OpenBSD: sbdsp.c,v 1.17 2001/10/31 11:00:24 art Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -2226,11 +2226,11 @@ sb_round(addr, size)
return size;
}
-int
+paddr_t
sb_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/isa/sbdspvar.h b/sys/dev/isa/sbdspvar.h
index 700660a1c5d..ce8ad78b04d 100644
--- a/sys/dev/isa/sbdspvar.h
+++ b/sys/dev/isa/sbdspvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbdspvar.h,v 1.12 2001/02/03 05:22:24 mickey Exp $ */
+/* $OpenBSD: sbdspvar.h,v 1.13 2001/10/31 11:00:24 art Exp $ */
/* $NetBSD: sbdspvar.h,v 1.37 1998/08/10 00:20:39 mycroft Exp $ */
/*
@@ -243,7 +243,7 @@ int sbdsp_mixer_query_devinfo __P((void *, mixer_devinfo_t *));
void *sb_malloc __P((void *, unsigned long, int, int));
void sb_free __P((void *, void *, int));
unsigned long sb_round __P((void *, unsigned long));
-int sb_mappage __P((void *, void *, int, int));
+paddr_t sb_mappage __P((void *, void *, off_t, int));
int sbdsp_get_props __P((void *));