Module Name: src
Committed By: isaki
Date: Sat May 4 04:13:25 UTC 2019
Modified Files:
src/sys/arch/amiga/dev [isaki-audio2]: toccata.c
src/sys/arch/arm/imx [isaki-audio2]: imx23_digfilt.c
src/sys/arch/arm/sunxi [isaki-audio2]: sunxi_i2s.c
src/sys/arch/zaurus/dev [isaki-audio2]: wm8731_zaudio.c wm8750_zaudio.c
src/sys/dev [isaki-audio2]: audio_dai.h audio_if.h
src/sys/dev/audio [isaki-audio2]: audio.c
src/sys/dev/bluetooth [isaki-audio2]: btsco.c
src/sys/dev/fdt [isaki-audio2]: ausoc.c
src/sys/dev/ic [isaki-audio2]: ad1848var.h arcofi.c interwave.c
interwavevar.h
src/sys/dev/isa [isaki-audio2]: ad1848_isa.c ad1848var.h ess.c gus.c
wss.c ym.c
src/sys/dev/isapnp [isaki-audio2]: gus_isapnp.c
src/sys/dev/pci [isaki-audio2]: esa.c gcscaudio.c yds.c
Log Message:
Remove obsoleted methods in audio_hw_if.
- drain: is handled in audio upper layer now.
- mappage: is handled in audio upper layer now.
- setfd: no one uses and it's meaningless now.
To generate a diff of this commit:
cvs rdiff -u -r1.18.2.1 -r1.18.2.2 src/sys/arch/amiga/dev/toccata.c
cvs rdiff -u -r1.1.24.1 -r1.1.24.2 src/sys/arch/arm/imx/imx23_digfilt.c
cvs rdiff -u -r1.3.2.1 -r1.3.2.2 src/sys/arch/arm/sunxi/sunxi_i2s.c
cvs rdiff -u -r1.2.4.1 -r1.2.4.2 src/sys/arch/zaurus/dev/wm8731_zaudio.c
cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/sys/arch/zaurus/dev/wm8750_zaudio.c
cvs rdiff -u -r1.4.2.1 -r1.4.2.2 src/sys/dev/audio_dai.h
cvs rdiff -u -r1.70.24.3 -r1.70.24.4 src/sys/dev/audio_if.h
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/dev/audio/audio.c
cvs rdiff -u -r1.38.2.2 -r1.38.2.3 src/sys/dev/bluetooth/btsco.c
cvs rdiff -u -r1.3.8.1 -r1.3.8.2 src/sys/dev/fdt/ausoc.c
cvs rdiff -u -r1.18.54.1 -r1.18.54.2 src/sys/dev/ic/ad1848var.h
cvs rdiff -u -r1.1.28.3 -r1.1.28.4 src/sys/dev/ic/arcofi.c
cvs rdiff -u -r1.40.2.1 -r1.40.2.2 src/sys/dev/ic/interwave.c
cvs rdiff -u -r1.18.42.1 -r1.18.42.2 src/sys/dev/ic/interwavevar.h
cvs rdiff -u -r1.38.54.1 -r1.38.54.2 src/sys/dev/isa/ad1848_isa.c
cvs rdiff -u -r1.44 -r1.44.54.1 src/sys/dev/isa/ad1848var.h
cvs rdiff -u -r1.84.2.2 -r1.84.2.3 src/sys/dev/isa/ess.c
cvs rdiff -u -r1.115.2.1 -r1.115.2.2 src/sys/dev/isa/gus.c
cvs rdiff -u -r1.72.2.1 -r1.72.2.2 src/sys/dev/isa/wss.c
cvs rdiff -u -r1.45.2.1 -r1.45.2.2 src/sys/dev/isa/ym.c
cvs rdiff -u -r1.39.2.3 -r1.39.2.4 src/sys/dev/isapnp/gus_isapnp.c
cvs rdiff -u -r1.63.2.2 -r1.63.2.3 src/sys/dev/pci/esa.c
cvs rdiff -u -r1.16.2.2 -r1.16.2.3 src/sys/dev/pci/gcscaudio.c
cvs rdiff -u -r1.61.2.2 -r1.61.2.3 src/sys/dev/pci/yds.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/dev/toccata.c
diff -u src/sys/arch/amiga/dev/toccata.c:1.18.2.1 src/sys/arch/amiga/dev/toccata.c:1.18.2.2
--- src/sys/arch/amiga/dev/toccata.c:1.18.2.1 Sun Apr 21 05:59:59 2019
+++ src/sys/arch/amiga/dev/toccata.c Sat May 4 04:13:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: toccata.c,v 1.18.2.1 2019/04/21 05:59:59 isaki Exp $ */
+/* $NetBSD: toccata.c,v 1.18.2.2 2019/05/04 04:13:23 isaki Exp $ */
/*-
* Copyright (c) 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: toccata.c,v 1.18.2.1 2019/04/21 05:59:59 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: toccata.c,v 1.18.2.2 2019/05/04 04:13:23 isaki Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -179,12 +179,6 @@ void toccata_get_locks(void *, kmutex_t
const struct audio_hw_if audiocs_hw_if = {
.open = toccata_open,
.close = toccata_close,
- /*
- * XXX toccata_drain could be written:
- * sleep for play interrupt. This loses less than 512 bytes of
- * sample data, otherwise up to 1024.
- */
- .drain = NULL,
.query_format = ad1848_query_format,
.set_format = ad1848_set_format,
.round_blocksize = toccata_round_blocksize,
Index: src/sys/arch/arm/imx/imx23_digfilt.c
diff -u src/sys/arch/arm/imx/imx23_digfilt.c:1.1.24.1 src/sys/arch/arm/imx/imx23_digfilt.c:1.1.24.2
--- src/sys/arch/arm/imx/imx23_digfilt.c:1.1.24.1 Wed Apr 24 12:01:50 2019
+++ src/sys/arch/arm/imx/imx23_digfilt.c Sat May 4 04:13:23 2019
@@ -1,4 +1,4 @@
-/* $Id: imx23_digfilt.c,v 1.1.24.1 2019/04/24 12:01:50 isaki Exp $ */
+/* $Id: imx23_digfilt.c,v 1.1.24.2 2019/05/04 04:13:23 isaki Exp $ */
/*
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -159,14 +159,12 @@ static const struct audio_hw_if digfilt_
.halt_output = digfilt_halt_output,
.speaker_ctl = NULL,
.getdev = digfilt_getdev,
- .setfd = NULL,
.set_port = digfilt_set_port,
.get_port = digfilt_get_port,
.query_devinfo = digfilt_query_devinfo,
.allocm = digfilt_allocm,
.freem = digfilt_freem,
.round_buffersize = digfilt_round_buffersize,
- .mappage = NULL,
.get_props = digfilt_get_props,
.trigger_output = NULL,
.trigger_input = NULL,
Index: src/sys/arch/arm/sunxi/sunxi_i2s.c
diff -u src/sys/arch/arm/sunxi/sunxi_i2s.c:1.3.2.1 src/sys/arch/arm/sunxi/sunxi_i2s.c:1.3.2.2
--- src/sys/arch/arm/sunxi/sunxi_i2s.c:1.3.2.1 Sat Apr 27 05:22:28 2019
+++ src/sys/arch/arm/sunxi/sunxi_i2s.c Sat May 4 04:13:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_i2s.c,v 1.3.2.1 2019/04/27 05:22:28 isaki Exp $ */
+/* $NetBSD: sunxi_i2s.c,v 1.3.2.2 2019/05/04 04:13:23 isaki Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_i2s.c,v 1.3.2.1 2019/04/27 05:22:28 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_i2s.c,v 1.3.2.2 2019/05/04 04:13:23 isaki Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -481,7 +481,6 @@ sunxi_i2s_get_locks(void *priv, kmutex_t
}
static const struct audio_hw_if sunxi_i2s_hw_if = {
- .drain = NULL,
.query_format = sunxi_i2s_query_format,
.set_format = sunxi_i2s_set_format,
.allocm = sunxi_i2s_allocm,
Index: src/sys/arch/zaurus/dev/wm8731_zaudio.c
diff -u src/sys/arch/zaurus/dev/wm8731_zaudio.c:1.2.4.1 src/sys/arch/zaurus/dev/wm8731_zaudio.c:1.2.4.2
--- src/sys/arch/zaurus/dev/wm8731_zaudio.c:1.2.4.1 Wed Apr 24 13:03:06 2019
+++ src/sys/arch/zaurus/dev/wm8731_zaudio.c Sat May 4 04:13:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wm8731_zaudio.c,v 1.2.4.1 2019/04/24 13:03:06 isaki Exp $ */
+/* $NetBSD: wm8731_zaudio.c,v 1.2.4.2 2019/05/04 04:13:23 isaki Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include "opt_zaudio.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wm8731_zaudio.c,v 1.2.4.1 2019/04/24 13:03:06 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wm8731_zaudio.c,v 1.2.4.2 2019/05/04 04:13:23 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -110,7 +110,6 @@ static int wm8731_query_devinfo(void *,
static struct audio_hw_if wm8731_hw_if = {
.open = zaudio_open,
.close = zaudio_close,
- .drain = NULL,
.query_format = zaudio_query_format,
.set_format = zaudio_set_format,
.round_blocksize = zaudio_round_blocksize,
@@ -123,7 +122,6 @@ static struct audio_hw_if wm8731_hw_if =
.halt_input = wm8731_halt_input,
.speaker_ctl = NULL,
.getdev = wm8731_getdev,
- .setfd = NULL,
.set_port = wm8731_set_port,
.get_port = wm8731_get_port,
.query_devinfo = wm8731_query_devinfo,
Index: src/sys/arch/zaurus/dev/wm8750_zaudio.c
diff -u src/sys/arch/zaurus/dev/wm8750_zaudio.c:1.2.4.2 src/sys/arch/zaurus/dev/wm8750_zaudio.c:1.2.4.3
--- src/sys/arch/zaurus/dev/wm8750_zaudio.c:1.2.4.2 Wed Apr 24 13:03:06 2019
+++ src/sys/arch/zaurus/dev/wm8750_zaudio.c Sat May 4 04:13:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wm8750_zaudio.c,v 1.2.4.2 2019/04/24 13:03:06 isaki Exp $ */
+/* $NetBSD: wm8750_zaudio.c,v 1.2.4.3 2019/05/04 04:13:23 isaki Exp $ */
/* $OpenBSD: zaurus_audio.c,v 1.8 2005/08/18 13:23:02 robert Exp $ */
/*
@@ -51,7 +51,7 @@
#include "opt_zaudio.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wm8750_zaudio.c,v 1.2.4.2 2019/04/24 13:03:06 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wm8750_zaudio.c,v 1.2.4.3 2019/05/04 04:13:23 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -130,7 +130,6 @@ static int wm8750_query_devinfo(void *,
static struct audio_hw_if wm8750_hw_if = {
.open = zaudio_open,
.close = zaudio_close,
- .drain = NULL,
.query_format = zaudio_query_format,
.set_format = zaudio_set_format,
.round_blocksize = zaudio_round_blocksize,
@@ -143,7 +142,6 @@ static struct audio_hw_if wm8750_hw_if =
.halt_input = wm8750_halt_input,
.speaker_ctl = NULL,
.getdev = wm8750_getdev,
- .setfd = NULL,
.set_port = wm8750_set_port,
.get_port = wm8750_get_port,
.query_devinfo = wm8750_query_devinfo,
Index: src/sys/dev/audio_dai.h
diff -u src/sys/dev/audio_dai.h:1.4.2.1 src/sys/dev/audio_dai.h:1.4.2.2
--- src/sys/dev/audio_dai.h:1.4.2.1 Sat Apr 27 10:17:59 2019
+++ src/sys/dev/audio_dai.h Sat May 4 04:13:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: audio_dai.h,v 1.4.2.1 2019/04/27 10:17:59 isaki Exp $ */
+/* $NetBSD: audio_dai.h,v 1.4.2.2 2019/05/04 04:13:24 isaki Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -138,14 +138,6 @@ audio_dai_close(audio_dai_tag_t dai)
}
static inline int
-audio_dai_drain(audio_dai_tag_t dai)
-{
- if (!dai->dai_hw_if->drain)
- return 0;
- return dai->dai_hw_if->drain(dai->dai_priv);
-}
-
-static inline int
audio_dai_query_format(audio_dai_tag_t dai, audio_format_query_t *afp)
{
if (!dai->dai_hw_if->query_format)
Index: src/sys/dev/audio_if.h
diff -u src/sys/dev/audio_if.h:1.70.24.3 src/sys/dev/audio_if.h:1.70.24.4
--- src/sys/dev/audio_if.h:1.70.24.3 Fri May 3 05:15:33 2019
+++ src/sys/dev/audio_if.h Sat May 4 04:13:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: audio_if.h,v 1.70.24.3 2019/05/03 05:15:33 isaki Exp $ */
+/* $NetBSD: audio_if.h,v 1.70.24.4 2019/05/04 04:13:24 isaki Exp $ */
/*
* Copyright (c) 1994 Havard Eidnes.
@@ -179,9 +179,6 @@ struct audio_hw_if {
int (*open)(void *, int); /* open hardware */
void (*close)(void *); /* close hardware */
- /* Obsoleted in AUDIO2. */
- int (*drain)(void *); /* Optional: drain buffers */
-
int (*query_format)(void *, audio_format_query_t *);
int (*set_format)(void *, int,
const audio_params_t *, const audio_params_t *,
@@ -216,9 +213,6 @@ struct audio_hw_if {
int (*getdev)(void *, struct audio_device *);
- /* Obsoleted in AUDIO2. */
- int (*setfd)(void *, int);
-
/* Mixer (in/out ports) */
int (*set_port)(void *, mixer_ctrl_t *);
int (*get_port)(void *, mixer_ctrl_t *);
@@ -230,9 +224,6 @@ struct audio_hw_if {
void (*freem)(void *, void *, size_t);
size_t (*round_buffersize)(void *, int, size_t);
- /* Obsoleted in AUDIO2. */
- paddr_t (*mappage)(void *, void *, off_t, int);
-
int (*get_props)(void *); /* device properties */
int (*trigger_output)(void *, void *, void *, int,
Index: src/sys/dev/audio/audio.c
diff -u src/sys/dev/audio/audio.c:1.1.2.5 src/sys/dev/audio/audio.c:1.1.2.6
--- src/sys/dev/audio/audio.c:1.1.2.5 Fri May 3 06:29:05 2019
+++ src/sys/dev/audio/audio.c Sat May 4 04:13:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.1.2.5 2019/05/03 06:29:05 isaki Exp $ */
+/* $NetBSD: audio.c,v 1.1.2.6 2019/05/04 04:13:23 isaki Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -103,7 +103,6 @@
* ----------------------- ------- ------- -------------------------
* open x x +
* close x x +
- * drain x x (Not used in AUDIO2)
* query_format - x
* set_format - x
* round_blocksize - x
@@ -116,14 +115,12 @@
* halt_input x x +
* speaker_ctl x x
* getdev - x
- * setfd - x (Not used in AUDIO2)
* set_port - x +
* get_port - x +
* query_devinfo - x
* allocm - - + (*1)
* freem - - + (*1)
* round_buffersize - x
- * mappage - - (Not used in AUDIO2)
* get_props - x
* trigger_output x x +
* trigger_input x x +
@@ -152,7 +149,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.1.2.5 2019/05/03 06:29:05 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.1.2.6 2019/05/04 04:13:23 isaki Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
Index: src/sys/dev/bluetooth/btsco.c
diff -u src/sys/dev/bluetooth/btsco.c:1.38.2.2 src/sys/dev/bluetooth/btsco.c:1.38.2.3
--- src/sys/dev/bluetooth/btsco.c:1.38.2.2 Wed Apr 24 13:30:34 2019
+++ src/sys/dev/bluetooth/btsco.c Sat May 4 04:13:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: btsco.c,v 1.38.2.2 2019/04/24 13:30:34 isaki Exp $ */
+/* $NetBSD: btsco.c,v 1.38.2.3 2019/05/04 04:13:24 isaki Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.38.2.2 2019/04/24 13:30:34 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.38.2.3 2019/05/04 04:13:24 isaki Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -157,7 +157,6 @@ static int btsco_start_input(void *, voi
static int btsco_halt_output(void *);
static int btsco_halt_input(void *);
static int btsco_getdev(void *, struct audio_device *);
-static int btsco_setfd(void *, int);
static int btsco_set_port(void *, mixer_ctrl_t *);
static int btsco_get_port(void *, mixer_ctrl_t *);
static int btsco_query_devinfo(void *, mixer_devinfo_t *);
@@ -178,7 +177,6 @@ static const struct audio_hw_if btsco_if
.halt_output = btsco_halt_output,
.halt_input = btsco_halt_input,
.getdev = btsco_getdev,
- .setfd = btsco_setfd,
.set_port = btsco_set_port,
.get_port = btsco_get_port,
.query_devinfo = btsco_query_devinfo,
@@ -847,14 +845,6 @@ btsco_getdev(void *hdl, struct audio_dev
}
static int
-btsco_setfd(void *hdl, int fd)
-{
- DPRINTF("set %s duplex\n", fd ? "full" : "half");
-
- return 0;
-}
-
-static int
btsco_set_port(void *hdl, mixer_ctrl_t *mc)
{
struct btsco_softc *sc = hdl;
Index: src/sys/dev/fdt/ausoc.c
diff -u src/sys/dev/fdt/ausoc.c:1.3.8.1 src/sys/dev/fdt/ausoc.c:1.3.8.2
--- src/sys/dev/fdt/ausoc.c:1.3.8.1 Sat Apr 27 10:17:59 2019
+++ src/sys/dev/fdt/ausoc.c Sat May 4 04:13:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ausoc.c,v 1.3.8.1 2019/04/27 10:17:59 isaki Exp $ */
+/* $NetBSD: ausoc.c,v 1.3.8.2 2019/05/04 04:13:24 isaki Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ausoc.c,v 1.3.8.1 2019/04/27 10:17:59 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ausoc.c,v 1.3.8.2 2019/05/04 04:13:24 isaki Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -108,14 +108,6 @@ failed:
}
static int
-ausoc_drain(void *priv)
-{
- struct ausoc_link * const link = priv;
-
- return audio_dai_drain(link->link_cpu);
-}
-
-static int
ausoc_query_format(void *priv, audio_format_query_t *afp)
{
struct ausoc_link * const link = priv;
@@ -338,7 +330,6 @@ ausoc_get_locks(void *priv, kmutex_t **i
static const struct audio_hw_if ausoc_hw_if = {
.open = ausoc_open,
.close = ausoc_close,
- .drain = ausoc_drain,
.query_format = ausoc_query_format,
.set_format = ausoc_set_format,
.allocm = ausoc_allocm,
Index: src/sys/dev/ic/ad1848var.h
diff -u src/sys/dev/ic/ad1848var.h:1.18.54.1 src/sys/dev/ic/ad1848var.h:1.18.54.2
--- src/sys/dev/ic/ad1848var.h:1.18.54.1 Sun Apr 21 06:00:00 2019
+++ src/sys/dev/ic/ad1848var.h Sat May 4 04:13:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ad1848var.h,v 1.18.54.1 2019/04/21 06:00:00 isaki Exp $ */
+/* $NetBSD: ad1848var.h,v 1.18.54.2 2019/05/04 04:13:24 isaki Exp $ */
/*-
* Copyright (c) 1999, 2008 The NetBSD Foundation, Inc.
@@ -197,7 +197,6 @@ void ad1848_destroy_locks(struct ad1848_
int ad1848_halt_output(void *);
int ad1848_halt_input(void *);
-paddr_t ad1848_mappage(void *, void *, off_t, int);
void ad1848_get_locks(void *, kmutex_t **, kmutex_t **);
#ifdef AUDIO_DEBUG
Index: src/sys/dev/ic/arcofi.c
diff -u src/sys/dev/ic/arcofi.c:1.1.28.3 src/sys/dev/ic/arcofi.c:1.1.28.4
--- src/sys/dev/ic/arcofi.c:1.1.28.3 Sun Apr 21 07:09:13 2019
+++ src/sys/dev/ic/arcofi.c Sat May 4 04:13:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: arcofi.c,v 1.1.28.3 2019/04/21 07:09:13 isaki Exp $ */
+/* $NetBSD: arcofi.c,v 1.1.28.4 2019/05/04 04:13:24 isaki Exp $ */
/* $OpenBSD: arcofi.c,v 1.6 2013/05/15 08:29:24 ratchov Exp $ */
/*
@@ -233,14 +233,12 @@ static const struct audio_hw_if arcofi_h
.halt_input = arcofi_halt_input,
.speaker_ctl = NULL,
.getdev = arcofi_getdev,
- .setfd = NULL,
.set_port = arcofi_set_port,
.get_port = arcofi_get_port,
.query_devinfo = arcofi_query_devinfo,
.allocm = NULL,
.freem = NULL,
.round_buffersize = NULL,
- .mappage = NULL,
.get_props = arcofi_get_props,
.trigger_output = NULL,
.trigger_input = NULL,
Index: src/sys/dev/ic/interwave.c
diff -u src/sys/dev/ic/interwave.c:1.40.2.1 src/sys/dev/ic/interwave.c:1.40.2.2
--- src/sys/dev/ic/interwave.c:1.40.2.1 Sun Apr 21 06:00:00 2019
+++ src/sys/dev/ic/interwave.c Sat May 4 04:13:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: interwave.c,v 1.40.2.1 2019/04/21 06:00:00 isaki Exp $ */
+/* $NetBSD: interwave.c,v 1.40.2.2 2019/05/04 04:13:24 isaki Exp $ */
/*
* Copyright (c) 1997, 1999, 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interwave.c,v 1.40.2.1 2019/04/21 06:00:00 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interwave.c,v 1.40.2.2 2019/05/04 04:13:24 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1031,13 +1031,6 @@ iw_getdev(void *addr, struct audio_devic
return 0;
}
-int
-iw_setfd(void *addr, int flag)
-{
-
- return 0;
-}
-
/* Mixer (in/out ports) */
int
iw_set_port(void *addr, mixer_ctrl_t *cp)
@@ -1453,13 +1446,6 @@ iw_round_buffersize(void *addr, int dire
return size;
}
-paddr_t
-iw_mappage(void *addr, void *mem, off_t off, int prot)
-{
-
- return isa_mappage(mem, off, prot);
-}
-
int
iw_get_props(void *addr)
{
Index: src/sys/dev/ic/interwavevar.h
diff -u src/sys/dev/ic/interwavevar.h:1.18.42.1 src/sys/dev/ic/interwavevar.h:1.18.42.2
--- src/sys/dev/ic/interwavevar.h:1.18.42.1 Sun Apr 21 06:00:00 2019
+++ src/sys/dev/ic/interwavevar.h Sat May 4 04:13:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: interwavevar.h,v 1.18.42.1 2019/04/21 06:00:00 isaki Exp $ */
+/* $NetBSD: interwavevar.h,v 1.18.42.2 2019/05/04 04:13:24 isaki Exp $ */
/*
* Copyright (c) 1997, 1999, 2008 The NetBSD Foundation, Inc.
@@ -224,7 +224,6 @@ int iw_halt_input(void *);
int iw_speaker_ctl(void *, int);
int iw_getdev(void *, struct audio_device *);
-int iw_setfd(void *, int);
/* Mixer (in/out ports) */
int iw_set_port(void *, mixer_ctrl_t *);
@@ -236,7 +235,6 @@ struct malloc_type;
void * iw_malloc(void *, int, size_t);
void iw_free(void *, void *, size_t);
size_t iw_round_buffersize(void *, int, size_t);
-paddr_t iw_mappage(void *, void *, off_t, int);
int iw_get_props(void *);
void iw_get_locks(void *, kmutex_t **, kmutex_t **);
Index: src/sys/dev/isa/ad1848_isa.c
diff -u src/sys/dev/isa/ad1848_isa.c:1.38.54.1 src/sys/dev/isa/ad1848_isa.c:1.38.54.2
--- src/sys/dev/isa/ad1848_isa.c:1.38.54.1 Fri May 3 05:43:46 2019
+++ src/sys/dev/isa/ad1848_isa.c Sat May 4 04:13:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ad1848_isa.c,v 1.38.54.1 2019/05/03 05:43:46 isaki Exp $ */
+/* $NetBSD: ad1848_isa.c,v 1.38.54.2 2019/05/04 04:13:24 isaki Exp $ */
/*-
* Copyright (c) 1999, 2008 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ad1848_isa.c,v 1.38.54.1 2019/05/03 05:43:46 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ad1848_isa.c,v 1.38.54.2 2019/05/04 04:13:24 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -777,12 +777,6 @@ ad1848_isa_round_buffersize(void *addr,
return size;
}
-paddr_t
-ad1848_isa_mappage(void *addr, void *mem, off_t off, int prot)
-{
- return isa_mappage(mem, off, prot);
-}
-
int
ad1848_isa_get_props(void *addr)
{
Index: src/sys/dev/isa/ad1848var.h
diff -u src/sys/dev/isa/ad1848var.h:1.44 src/sys/dev/isa/ad1848var.h:1.44.54.1
--- src/sys/dev/isa/ad1848var.h:1.44 Wed Nov 23 23:07:32 2011
+++ src/sys/dev/isa/ad1848var.h Sat May 4 04:13:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ad1848var.h,v 1.44 2011/11/23 23:07:32 jmcneill Exp $ */
+/* $NetBSD: ad1848var.h,v 1.44.54.1 2019/05/04 04:13:24 isaki Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -117,6 +117,5 @@ int ad1848_isa_intr(void *);
void *ad1848_isa_malloc(void *, int, size_t);
void ad1848_isa_free(void *, void *, size_t);
size_t ad1848_isa_round_buffersize(void *, int, size_t);
-paddr_t ad1848_isa_mappage(void *, void *, off_t, int);
int ad1848_isa_get_props(void *);
#endif
Index: src/sys/dev/isa/ess.c
diff -u src/sys/dev/isa/ess.c:1.84.2.2 src/sys/dev/isa/ess.c:1.84.2.3
--- src/sys/dev/isa/ess.c:1.84.2.2 Thu Apr 25 14:00:20 2019
+++ src/sys/dev/isa/ess.c Sat May 4 04:13:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ess.c,v 1.84.2.2 2019/04/25 14:00:20 isaki Exp $ */
+/* $NetBSD: ess.c,v 1.84.2.3 2019/05/04 04:13:24 isaki Exp $ */
/*
* Copyright 1997
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.84.2.2 2019/04/25 14:00:20 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.84.2.3 2019/05/04 04:13:24 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -147,7 +147,6 @@ int ess_get_port(void *, mixer_ctrl_t *)
void *ess_malloc(void *, int, size_t);
void ess_free(void *, void *, size_t);
size_t ess_round_buffersize(void *, int, size_t);
-paddr_t ess_mappage(void *, void *, off_t, int);
int ess_query_devinfo(void *, mixer_devinfo_t *);
Index: src/sys/dev/isa/gus.c
diff -u src/sys/dev/isa/gus.c:1.115.2.1 src/sys/dev/isa/gus.c:1.115.2.2
--- src/sys/dev/isa/gus.c:1.115.2.1 Sun Apr 21 06:00:00 2019
+++ src/sys/dev/isa/gus.c Sat May 4 04:13:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gus.c,v 1.115.2.1 2019/04/21 06:00:00 isaki Exp $ */
+/* $NetBSD: gus.c,v 1.115.2.2 2019/05/04 04:13:24 isaki Exp $ */
/*-
* Copyright (c) 1996, 1999, 2008 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.115.2.1 2019/04/21 06:00:00 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.115.2.2 2019/05/04 04:13:24 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -594,7 +594,6 @@ const struct audio_hw_if gus_hw_if = {
.allocm = ad1848_isa_malloc,
.freem = ad1848_isa_free,
.round_buffersize = ad1848_isa_round_buffersize,
- .mappage = ad1848_isa_mappage,
.get_props = gus_get_props,
.get_locks = ad1848_get_locks,
};
@@ -618,7 +617,6 @@ static const struct audio_hw_if gusmax_h
.allocm = ad1848_isa_malloc,
.freem = ad1848_isa_free,
.round_buffersize = ad1848_isa_round_buffersize,
- .mappage = ad1848_isa_mappage,
.get_props = gusmax_get_props,
.get_locks = ad1848_get_locks,
};
Index: src/sys/dev/isa/wss.c
diff -u src/sys/dev/isa/wss.c:1.72.2.1 src/sys/dev/isa/wss.c:1.72.2.2
--- src/sys/dev/isa/wss.c:1.72.2.1 Sun Apr 21 06:00:00 2019
+++ src/sys/dev/isa/wss.c Sat May 4 04:13:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wss.c,v 1.72.2.1 2019/04/21 06:00:00 isaki Exp $ */
+/* $NetBSD: wss.c,v 1.72.2.2 2019/05/04 04:13:24 isaki Exp $ */
/*
* Copyright (c) 1994 John Brezak
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.72.2.1 2019/04/21 06:00:00 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.72.2.2 2019/05/04 04:13:24 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -100,7 +100,6 @@ const struct audio_hw_if wss_hw_if = {
.allocm = ad1848_isa_malloc,
.freem = ad1848_isa_free,
.round_buffersize = ad1848_isa_round_buffersize,
- .mappage = ad1848_isa_mappage,
.get_props = ad1848_isa_get_props,
.trigger_output = ad1848_isa_trigger_output,
.trigger_input = ad1848_isa_trigger_input,
Index: src/sys/dev/isa/ym.c
diff -u src/sys/dev/isa/ym.c:1.45.2.1 src/sys/dev/isa/ym.c:1.45.2.2
--- src/sys/dev/isa/ym.c:1.45.2.1 Sun Apr 21 06:00:00 2019
+++ src/sys/dev/isa/ym.c Sat May 4 04:13:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ym.c,v 1.45.2.1 2019/04/21 06:00:00 isaki Exp $ */
+/* $NetBSD: ym.c,v 1.45.2.2 2019/05/04 04:13:24 isaki Exp $ */
/*-
* Copyright (c) 1999-2002, 2008 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.45.2.1 2019/04/21 06:00:00 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.45.2.2 2019/05/04 04:13:24 isaki Exp $");
#include "mpu_ym.h"
#include "opt_ym.h"
@@ -183,7 +183,6 @@ const struct audio_hw_if ym_hw_if = {
.allocm = ad1848_isa_malloc,
.freem = ad1848_isa_free,
.round_buffersize = ad1848_isa_round_buffersize,
- .mappage = ad1848_isa_mappage,
.get_props = ad1848_isa_get_props,
.trigger_output = ad1848_isa_trigger_output,
.trigger_input = ad1848_isa_trigger_input,
Index: src/sys/dev/isapnp/gus_isapnp.c
diff -u src/sys/dev/isapnp/gus_isapnp.c:1.39.2.3 src/sys/dev/isapnp/gus_isapnp.c:1.39.2.4
--- src/sys/dev/isapnp/gus_isapnp.c:1.39.2.3 Fri May 3 06:19:42 2019
+++ src/sys/dev/isapnp/gus_isapnp.c Sat May 4 04:13:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gus_isapnp.c,v 1.39.2.3 2019/05/03 06:19:42 isaki Exp $ */
+/* $NetBSD: gus_isapnp.c,v 1.39.2.4 2019/05/04 04:13:24 isaki Exp $ */
/*
* Copyright (c) 1997, 1999, 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.39.2.3 2019/05/03 06:19:42 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.39.2.4 2019/05/04 04:13:24 isaki Exp $");
#include "guspnp.h"
#if NGUSPNP > 0
@@ -76,14 +76,12 @@ static const struct audio_hw_if guspnp_h
.halt_input = iw_halt_input,
.speaker_ctl = iw_speaker_ctl,
.getdev = iw_getdev,
- .setfd = iw_setfd,
.set_port = iw_set_port,
.get_port = iw_get_port,
.query_devinfo = iw_query_devinfo,
.allocm = iw_malloc,
.freem = iw_free,
.round_buffersize = iw_round_buffersize,
- .mappage = iw_mappage,
.get_props = iw_get_props,
.get_locks = iw_get_locks,
};
Index: src/sys/dev/pci/esa.c
diff -u src/sys/dev/pci/esa.c:1.63.2.2 src/sys/dev/pci/esa.c:1.63.2.3
--- src/sys/dev/pci/esa.c:1.63.2.2 Sun Apr 28 03:00:21 2019
+++ src/sys/dev/pci/esa.c Sat May 4 04:13:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: esa.c,v 1.63.2.2 2019/04/28 03:00:21 isaki Exp $ */
+/* $NetBSD: esa.c,v 1.63.2.3 2019/05/04 04:13:24 isaki Exp $ */
/*
* Copyright (c) 2001-2008 Jared D. McNeill <jmcne...@invisible.ca>
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.63.2.2 2019/04/28 03:00:21 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.63.2.3 2019/05/04 04:13:24 isaki Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -132,7 +132,6 @@ static int esa_intr(void *);
static int esa_allocmem(struct esa_softc *, size_t, size_t,
struct esa_dma *);
static int esa_freemem(struct esa_softc *, struct esa_dma *);
-static paddr_t esa_mappage(void *, void *, off_t, int);
/* Supporting subroutines */
static uint16_t esa_read_assp(struct esa_softc *, uint16_t, uint16_t);
@@ -192,7 +191,6 @@ static const struct audio_hw_if esa_hw_i
.query_devinfo = esa_query_devinfo,
.allocm = esa_malloc,
.freem = esa_free,
- .mappage = esa_mappage,
.get_props = esa_get_props,
.trigger_output = esa_trigger_output,
.trigger_input = esa_trigger_input,
@@ -1704,25 +1702,6 @@ esa_get_pointer(struct esa_softc *sc, st
return (addr - ch->start);
}
-static paddr_t
-esa_mappage(void *addr, void *mem, off_t off, int prot)
-{
- struct esa_voice *vc;
- struct esa_softc *sc;
- struct esa_dma *p;
-
- vc = addr;
- sc = device_private(vc->parent);
- if (off < 0)
- return -1;
- for (p = vc->dma; p && KERNADDR(p) != mem; p = p->next)
- continue;
- if (p == NULL)
- return -1;
- return bus_dmamem_mmap(sc->sc_dmat, p->segs, p->nsegs,
- off, prot, BUS_DMA_WAITOK);
-}
-
static void
esa_get_locks(void *addr, kmutex_t **intr, kmutex_t **proc)
{
Index: src/sys/dev/pci/gcscaudio.c
diff -u src/sys/dev/pci/gcscaudio.c:1.16.2.2 src/sys/dev/pci/gcscaudio.c:1.16.2.3
--- src/sys/dev/pci/gcscaudio.c:1.16.2.2 Sun Apr 28 07:01:45 2019
+++ src/sys/dev/pci/gcscaudio.c Sat May 4 04:13:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscaudio.c,v 1.16.2.2 2019/04/28 07:01:45 isaki Exp $ */
+/* $NetBSD: gcscaudio.c,v 1.16.2.3 2019/05/04 04:13:24 isaki Exp $ */
/*-
* Copyright (c) 2008 SHIMIZU Ryo <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.16.2.2 2019/04/28 07:01:45 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.16.2.3 2019/05/04 04:13:24 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -181,7 +181,6 @@ static struct audio_device gcscaudio_dev
static const struct audio_hw_if gcscaudio_hw_if = {
.open = gcscaudio_open,
.close = gcscaudio_close,
- .drain = NULL,
.query_format = gcscaudio_query_format,
.set_format = gcscaudio_set_format,
.round_blocksize = gcscaudio_round_blocksize,
@@ -194,7 +193,6 @@ static const struct audio_hw_if gcscaudi
.halt_input = gcscaudio_halt_input,
.speaker_ctl = NULL,
.getdev = gcscaudio_getdev,
- .setfd = NULL,
.set_port = gcscaudio_set_port,
.get_port = gcscaudio_get_port,
.query_devinfo = gcscaudio_query_devinfo,
Index: src/sys/dev/pci/yds.c
diff -u src/sys/dev/pci/yds.c:1.61.2.2 src/sys/dev/pci/yds.c:1.61.2.3
--- src/sys/dev/pci/yds.c:1.61.2.2 Mon Apr 29 09:32:07 2019
+++ src/sys/dev/pci/yds.c Sat May 4 04:13:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: yds.c,v 1.61.2.2 2019/04/29 09:32:07 isaki Exp $ */
+/* $NetBSD: yds.c,v 1.61.2.3 2019/05/04 04:13:24 isaki Exp $ */
/*
* Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.61.2.2 2019/04/29 09:32:07 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.61.2.3 2019/05/04 04:13:24 isaki Exp $");
#include "mpu.h"
@@ -202,7 +202,6 @@ static void yds_dump_play_slot(struct yd
static const struct audio_hw_if yds_hw_if = {
.open = yds_open,
.close = yds_close,
- .drain = NULL,
.query_format = yds_query_format,
.set_format = yds_set_format,
.round_blocksize = yds_round_blocksize,
@@ -215,7 +214,6 @@ static const struct audio_hw_if yds_hw_i
.halt_input = yds_halt_input,
.speaker_ctl = NULL,
.getdev = yds_getdev,
- .setfd = NULL,
.set_port = yds_mixer_set_port,
.get_port = yds_mixer_get_port,
.query_devinfo = yds_query_devinfo,
