summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/audio.c19
-rw-r--r--sys/dev/audio_if.h4
-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
-rw-r--r--sys/dev/pci/auich.c8
-rw-r--r--sys/dev/pci/auvia.c8
-rw-r--r--sys/dev/pci/cmpci.c8
-rw-r--r--sys/dev/pci/cs4281.c8
-rw-r--r--sys/dev/pci/eap.c8
-rw-r--r--sys/dev/pci/emuxki.c8
-rw-r--r--sys/dev/pci/eso.c8
-rw-r--r--sys/dev/pci/fms.c8
-rw-r--r--sys/dev/pci/maestro.c9
-rw-r--r--sys/dev/pci/sv.c8
-rw-r--r--sys/dev/pci/yds.c8
20 files changed, 76 insertions, 74 deletions
diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index 57273e7a59e..670abebb6a1 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: audio.c,v 1.29 2001/09/20 17:02:31 mpech Exp $ */
+/* $OpenBSD: audio.c,v 1.30 2001/10/31 11:00:24 art Exp $ */
/* $NetBSD: audio.c,v 1.105 1998/09/27 16:43:56 christos Exp $ */
/*
@@ -111,7 +111,7 @@ int audio_read __P((dev_t, struct uio *, int));
int audio_write __P((dev_t, struct uio *, int));
int audio_ioctl __P((dev_t, u_long, caddr_t, int, struct proc *));
int audio_select __P((dev_t, int, struct proc *));
-int audio_mmap __P((dev_t, int, int));
+paddr_t audio_mmap __P((dev_t, off_t, int));
int mixer_open __P((dev_t, struct audio_softc *, int, int, struct proc *));
int mixer_close __P((dev_t, int, int, struct proc *));
@@ -796,7 +796,7 @@ audiommap(dev, off, prot)
{
int unit = AUDIOUNIT(dev);
struct audio_softc *sc;
- int error;
+ int ret;
if (unit >= audio_cd.cd_ndevs ||
(sc = audio_cd.cd_devs[unit]) == NULL)
@@ -809,20 +809,20 @@ audiommap(dev, off, prot)
switch (AUDIODEV(dev)) {
case SOUND_DEVICE:
case AUDIO_DEVICE:
- error = audio_mmap(dev, off, prot);
+ ret = audio_mmap(dev, off, prot);
break;
case AUDIOCTL_DEVICE:
case MIXER_DEVICE:
- error = -1;
+ ret = -1;
break;
default:
- error = -1;
+ ret = -1;
break;
}
if (--sc->sc_refcnt < 0)
wakeup(&sc->sc_refcnt);
- return (error);
+ return (ret);
}
/*
@@ -1820,10 +1820,11 @@ audio_select(dev, rw, p)
return (0);
}
-int
+paddr_t
audio_mmap(dev, off, prot)
dev_t dev;
- int off, prot;
+ off_t off;
+ int prot;
{
int s;
int unit = AUDIOUNIT(dev);
diff --git a/sys/dev/audio_if.h b/sys/dev/audio_if.h
index dca4a427646..0a9ef337802 100644
--- a/sys/dev/audio_if.h
+++ b/sys/dev/audio_if.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: audio_if.h,v 1.12 2001/10/01 06:09:24 jason Exp $ */
+/* $OpenBSD: audio_if.h,v 1.13 2001/10/31 11:00:24 art Exp $ */
/* $NetBSD: audio_if.h,v 1.24 1998/01/10 14:07:25 tv Exp $ */
/*
@@ -117,7 +117,7 @@ struct audio_hw_if {
void *(*allocm_old)__P((void *, unsigned long, int, int));
void (*freem)__P((void *, void *, int));
unsigned long (*round_buffersize_old)__P((void *, unsigned long));
- int (*mappage)__P((void *, void *, int, int));
+ paddr_t (*mappage)__P((void *, void *, off_t, int));
int (*get_props)__P((void *)); /* device properties */
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 *));
diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c
index 704012611a9..9519c828ad9 100644
--- a/sys/dev/pci/auich.c
+++ b/sys/dev/pci/auich.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auich.c,v 1.16 2001/10/24 03:43:48 mickey Exp $ */
+/* $OpenBSD: auich.c,v 1.17 2001/10/31 11:00:24 art Exp $ */
/*
* Copyright (c) 2000,2001 Michael Shalayeff
@@ -220,7 +220,7 @@ int auich_query_devinfo __P((void *, mixer_devinfo_t *));
void *auich_allocm __P((void *, u_long, int, int));
void auich_freem __P((void *, void *, int));
u_long auich_round_buffersize __P((void *, u_long));
-int auich_mappage __P((void *, void *, int, int));
+paddr_t auich_mappage __P((void *, void *, off_t, int));
int auich_get_props __P((void *));
int auich_trigger_output __P((void *, void *, void *, int, void (*)(void *),
void *, struct audio_params *));
@@ -770,11 +770,11 @@ auich_round_buffersize(v, size)
return size;
}
-int
+paddr_t
auich_mappage(v, mem, off, prot)
void *v;
void *mem;
- int off;
+ off_t off;
int prot;
{
struct auich_softc *sc = v;
diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c
index 297638c1260..545f63a4480 100644
--- a/sys/dev/pci/auvia.c
+++ b/sys/dev/pci/auvia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auvia.c,v 1.10 2001/08/25 10:13:29 art Exp $ */
+/* $OpenBSD: auvia.c,v 1.11 2001/10/31 11:00:24 art Exp $ */
/* $NetBSD: auvia.c,v 1.7 2000/11/15 21:06:33 jdolecek Exp $ */
/*-
@@ -103,7 +103,7 @@ int auvia_query_devinfo(void *, mixer_devinfo_t *);
void * auvia_malloc(void *, int, size_t, int, int);
void auvia_free(void *, void *, int);
size_t auvia_round_buffersize(void *, int, size_t);
-int auvia_mappage(void *, void *, int, int);
+paddr_t auvia_mappage(void *, void *, off_t, int);
int auvia_get_props(void *);
int auvia_build_dma_ops(struct auvia_softc *, struct auvia_softc_chan *,
struct auvia_dma *, void *, void *, int);
@@ -767,8 +767,8 @@ auvia_round_buffersize(void *addr, int direction, size_t size)
}
-int
-auvia_mappage(void *addr, void *mem, int off, int prot)
+paddr_t
+auvia_mappage(void *addr, void *mem, off_t off, int prot)
{
struct auvia_softc *sc = addr;
struct auvia_dma *p;
diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c
index 73b37f8fb3d..424685dc0bb 100644
--- a/sys/dev/pci/cmpci.c
+++ b/sys/dev/pci/cmpci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmpci.c,v 1.4 2001/10/03 18:20:12 deraadt Exp $ */
+/* $OpenBSD: cmpci.c,v 1.5 2001/10/31 11:00:24 art Exp $ */
/*
* Copyright (c) 2000 Takuya SHIOZAKI
@@ -140,7 +140,7 @@ int cmpci_query_devinfo __P((void *, mixer_devinfo_t *));
void *cmpci_malloc __P((void *, u_long, int, int));
void cmpci_free __P((void *, void *, int));
u_long cmpci_round_buffersize __P((void *, u_long));
-int cmpci_mappage __P((void *, void *, int, int));
+paddr_t cmpci_mappage __P((void *, void *, off_t, int));
int cmpci_get_props __P((void *));
int cmpci_trigger_output __P((void *, void *, void *, int,
void (*)(void *), void *,
@@ -1464,11 +1464,11 @@ cmpci_round_buffersize(handle, bufsize)
return bufsize;
}
-int
+paddr_t
cmpci_mappage(handle, addr, offset, prot)
void *handle;
void *addr;
- int offset;
+ off_t offset;
int prot;
{
struct cmpci_softc *sc = handle;
diff --git a/sys/dev/pci/cs4281.c b/sys/dev/pci/cs4281.c
index 6e976100fbc..0f6aa1ca3f4 100644
--- a/sys/dev/pci/cs4281.c
+++ b/sys/dev/pci/cs4281.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cs4281.c,v 1.8 2001/10/03 00:59:27 kevlo Exp $ */
+/* $OpenBSD: cs4281.c,v 1.9 2001/10/31 11:00:24 art Exp $ */
/* $Tera: cs4281.c,v 1.18 2000/12/27 14:24:45 tacha Exp $ */
/*
@@ -196,7 +196,7 @@ int cs4281_query_devinfo __P((void *, mixer_devinfo_t *));
void *cs4281_malloc __P((void *, u_long, int, int));
u_long cs4281_round_buffersize __P((void *, u_long));
void cs4281_free __P((void *, void *, int));
-int cs4281_mappage __P((void *, void *, int, int));
+paddr_t cs4281_mappage __P((void *, void *, off_t, int));
int cs4281_allocmem __P((struct cs4281_softc *, size_t, int, int,
struct cs4281_dma *));
@@ -1418,8 +1418,8 @@ cs4281_round_buffersize(void *addr, u_long size)
return (size);
}
-int
-cs4281_mappage(void *addr, void *mem, int off, int prot)
+paddr_t
+cs4281_mappage(void *addr, void *mem, off_t off, int prot)
{
struct cs4281_softc *sc;
struct cs4281_dma *p;
diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c
index 27f32a9611d..e0938a67dca 100644
--- a/sys/dev/pci/eap.c
+++ b/sys/dev/pci/eap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eap.c,v 1.14 2001/09/06 18:33:28 millert Exp $ */
+/* $OpenBSD: eap.c,v 1.15 2001/10/31 11:00:24 art Exp $ */
/* $NetBSD: eap.c,v 1.46 2001/09/03 15:07:37 reinoud Exp $ */
/*
@@ -171,7 +171,7 @@ int eap1370_query_devinfo(void *, mixer_devinfo_t *);
void *eap_malloc(void *, u_long, int, int);
void eap_free(void *, void *, int);
u_long eap_round_buffersize(void *, u_long);
-int eap_mappage(void *, void *, int, int);
+paddr_t eap_mappage(void *, void *, off_t, int);
int eap_get_props(void *);
void eap1370_set_mixer(struct eap_softc *sc, int a, int d);
u_int32_t eap1371_src_wait(struct eap_softc *sc);
@@ -1591,8 +1591,8 @@ eap_round_buffersize(void *addr, u_long size)
return (size);
}
-int
-eap_mappage(void *addr, void *mem, int off, int prot)
+paddr_t
+eap_mappage(void *addr, void *mem, off_t off, int prot)
{
struct eap_softc *sc = addr;
struct eap_dma *p;
diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c
index 9229cf57594..5b1b025c176 100644
--- a/sys/dev/pci/emuxki.c
+++ b/sys/dev/pci/emuxki.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: emuxki.c,v 1.3 2001/10/24 23:23:44 ho Exp $ */
+/* $OpenBSD: emuxki.c,v 1.4 2001/10/31 11:00:24 art Exp $ */
/* $NetBSD: emuxki.c,v 1.1 2001/10/17 18:39:41 jdolecek Exp $ */
/*-
@@ -197,7 +197,7 @@ int emuxki_query_devinfo __P((void *, mixer_devinfo_t *));
void *emuxki_allocm __P((void *, int, size_t, int, int));
void emuxki_freem __P((void *, void *, int));
-int emuxki_mappage __P((void *, void *, int, int));
+paddr_t emuxki_mappage __P((void *, void *, off_t, int));
int emuxki_get_props __P((void *));
/* Interrupt handler */
@@ -1958,8 +1958,8 @@ emuxki_round_buffersize(void *addr, int direction, size_t bsize)
return (bsize);
}
-int
-emuxki_mappage(void *addr, void *ptr, int off, int prot)
+paddr_t
+emuxki_mappage(void *addr, void *ptr, off_t off, int prot)
{
struct emuxki_softc *sc = addr;
struct emuxki_mem *mem;
diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c
index 01ebb5e946d..31d95b7efb1 100644
--- a/sys/dev/pci/eso.c
+++ b/sys/dev/pci/eso.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eso.c,v 1.13 2001/09/21 17:55:43 miod Exp $ */
+/* $OpenBSD: eso.c,v 1.14 2001/10/31 11:00:24 art Exp $ */
/* $NetBSD: eso.c,v 1.3 1999/08/02 17:37:43 augustss Exp $ */
/*
@@ -134,7 +134,7 @@ HIDE int eso_query_devinfo __P((void *, mixer_devinfo_t *));
HIDE void * eso_allocm __P((void *, int, size_t, int, int));
HIDE void eso_freem __P((void *, void *, int));
HIDE size_t eso_round_buffersize __P((void *, int, size_t));
-HIDE int eso_mappage __P((void *, void *, int, int));
+HIDE paddr_t eso_mappage __P((void *, void *, off_t, int));
HIDE int eso_get_props __P((void *));
HIDE int eso_trigger_output __P((void *, void *, void *, int,
void (*)(void *), void *, struct audio_params *));
@@ -1579,11 +1579,11 @@ eso_round_buffersize(hdl, direction, bufsize)
return (bufsize);
}
-HIDE int
+HIDE paddr_t
eso_mappage(hdl, addr, offs, prot)
void *hdl;
void *addr;
- int offs;
+ off_t offs;
int prot;
{
struct eso_softc *sc = hdl;
diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c
index 7cb0679f7a8..1cfd40d79b9 100644
--- a/sys/dev/pci/fms.c
+++ b/sys/dev/pci/fms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fms.c,v 1.4 2001/08/25 10:13:29 art Exp $ */
+/* $OpenBSD: fms.c,v 1.5 2001/10/31 11:00:24 art Exp $ */
/* $NetBSD: fms.c,v 1.5.4.1 2000/06/30 16:27:50 simonb Exp $ */
/*-
@@ -95,7 +95,7 @@ int fms_query_devinfo __P((void *, mixer_devinfo_t *));
void *fms_malloc __P((void *, int, size_t, int, int));
void fms_free __P((void *, void *, int));
size_t fms_round_buffersize __P((void *, int, size_t));
-int fms_mappage __P((void *, void *, int, int));
+paddr_t fms_mappage __P((void *, void *, off_t, int));
int fms_get_props __P((void *));
int fms_trigger_output __P((void *, void *, void *, int, void (*)(void *),
void *, struct audio_params *));
@@ -852,11 +852,11 @@ fms_round_buffersize(addr, direction, size)
return size;
}
-int
+paddr_t
fms_mappage(addr, mem, off, prot)
void *addr;
void *mem;
- int off;
+ off_t off;
int prot;
{
struct fms_softc *sc = addr;
diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c
index f5878e66e39..49b39438794 100644
--- a/sys/dev/pci/maestro.c
+++ b/sys/dev/pci/maestro.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: maestro.c,v 1.11 2001/09/21 17:55:44 miod Exp $ */
+/* $OpenBSD: maestro.c,v 1.12 2001/10/31 11:00:24 art Exp $ */
/* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */
/*
* FreeBSD's ESS Agogo/Maestro driver
@@ -180,7 +180,7 @@ int maestro_query_devinfo __P((void *, mixer_devinfo_t *));
void *maestro_malloc __P((void *, int, size_t, int, int));
void maestro_free __P((void *, void *, int));
size_t maestro_round_buffersize __P((void *, int, size_t));
-int maestro_mappage __P((void *, void *, int, int));
+paddr_t maestro_mappage __P((void *, void *, off_t, int));
int maestro_get_props __P((void *));
int maestro_trigger_output __P((void *, void *, void *, int, void (*)(void *),
void *, struct audio_params *));
@@ -603,10 +603,11 @@ maestro_free(self, ptr, pool)
salloc_free(sc->dmapool, ptr);
}
-int
+paddr_t
maestro_mappage(self, mem, off, prot)
void *self, *mem;
- int off, prot;
+ off_t off;
+ int prot;
{
struct maestro_softc *sc = (struct maestro_softc *)self;
diff --git a/sys/dev/pci/sv.c b/sys/dev/pci/sv.c
index 74d06b9a55b..7defd46f441 100644
--- a/sys/dev/pci/sv.c
+++ b/sys/dev/pci/sv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sv.c,v 1.9 2001/08/25 10:13:30 art Exp $ */
+/* $OpenBSD: sv.c,v 1.10 2001/10/31 11:00:24 art Exp $ */
/*
* Copyright (c) 1998 Constantine Paul Sapuntzakis
@@ -160,7 +160,7 @@ int sv_query_devinfo __P((void *, mixer_devinfo_t *));
void *sv_malloc __P((void *, u_long, int, int));
void sv_free __P((void *, void *, int));
u_long sv_round __P((void *, u_long));
-int sv_mappage __P((void *, void *, int, int));
+paddr_t sv_mappage __P((void *, void *, off_t, int));
int sv_get_props __P((void *));
void sv_dumpregs __P((struct sv_softc *sc));
@@ -1491,11 +1491,11 @@ sv_round(addr, size)
return (size);
}
-int
+paddr_t
sv_mappage(addr, mem, off, prot)
void *addr;
void *mem;
- int off;
+ off_t off;
int prot;
{
struct sv_softc *sc = addr;
diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c
index 467482c9634..7b0663d125d 100644
--- a/sys/dev/pci/yds.c
+++ b/sys/dev/pci/yds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yds.c,v 1.6 2001/08/26 03:32:22 jason Exp $ */
+/* $OpenBSD: yds.c,v 1.7 2001/10/31 11:00:24 art Exp $ */
/* $NetBSD: yds.c,v 1.5 2001/05/21 23:55:04 minoura Exp $ */
/*
@@ -174,7 +174,7 @@ int yds_mixer_get_port __P((void *, mixer_ctrl_t *));
void *yds_malloc __P((void *, u_long, int, int));
void yds_free __P((void *, void *, int));
u_long yds_round_buffersize __P((void *, u_long));
-int yds_mappage __P((void *, void *, int, int));
+paddr_t yds_mappage __P((void *, void *, off_t, int));
int yds_get_props __P((void *));
int yds_query_devinfo __P((void *addr, mixer_devinfo_t *dip));
@@ -1794,11 +1794,11 @@ yds_round_buffersize(addr, size)
return (size);
}
-int
+paddr_t
yds_mappage(addr, mem, off, prot)
void *addr;
void *mem;
- int off;
+ off_t off;
int prot;
{
struct yds_softc *sc = addr;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 22:44:42 +0000