Module Name: src
Committed By: isaki
Date: Sat Feb 29 05:51:11 UTC 2020
Modified Files:
src/sys/arch/amiga/dev: toccata.c
src/sys/arch/arm/rockchip: rk_i2s.c
src/sys/arch/arm/sunxi: sunxi_codec.c sunxi_i2s.c
src/sys/arch/evbarm/mini2440: audio_mini2440.c
src/sys/arch/prep/isa: paud_isa.c
src/sys/dev/ic: ad1848.c ad1848var.h interwave.c interwavevar.h pl041.c
src/sys/dev/isa: gus.c wss.c ym.c
src/sys/dev/isapnp: gus_isapnp.c
src/sys/dev/pci: autri.c cmpci.c yds.c
Log Message:
Remove rounding by 4 bytes on round_blocksize().
For drivers which supports only 16bit * 2channels sampling,
rounding by 4 bytes no longer meaningful.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/amiga/dev/toccata.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/rockchip/rk_i2s.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/sunxi/sunxi_codec.c \
src/sys/arch/arm/sunxi/sunxi_i2s.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/mini2440/audio_mini2440.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/prep/isa/paud_isa.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/ic/ad1848.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/ic/ad1848var.h \
src/sys/dev/ic/interwavevar.h
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/ic/interwave.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/pl041.c
cvs rdiff -u -r1.117 -r1.118 src/sys/dev/isa/gus.c
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/isa/wss.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/isa/ym.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/isapnp/gus_isapnp.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/autri.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/cmpci.c
cvs rdiff -u -r1.64 -r1.65 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.20 src/sys/arch/amiga/dev/toccata.c:1.21
--- src/sys/arch/amiga/dev/toccata.c:1.20 Sat Jun 8 08:02:36 2019
+++ src/sys/arch/amiga/dev/toccata.c Sat Feb 29 05:51:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: toccata.c,v 1.20 2019/06/08 08:02:36 isaki Exp $ */
+/* $NetBSD: toccata.c,v 1.21 2020/02/29 05:51:10 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.20 2019/06/08 08:02:36 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: toccata.c,v 1.21 2020/02/29 05:51:10 isaki Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -415,11 +415,10 @@ int
toccata_round_blocksize(void *addr, int blk,
int mode, const audio_params_t *param)
{
- int ret;
- ret = blk > 512 ? 512 : (blk & -4);
-
- return ret;
+ if (blk > 512)
+ blk = 512;
+ return blk;
}
size_t
Index: src/sys/arch/arm/rockchip/rk_i2s.c
diff -u src/sys/arch/arm/rockchip/rk_i2s.c:1.2 src/sys/arch/arm/rockchip/rk_i2s.c:1.3
--- src/sys/arch/arm/rockchip/rk_i2s.c:1.2 Sat Jan 4 13:54:04 2020
+++ src/sys/arch/arm/rockchip/rk_i2s.c Sat Feb 29 05:51:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_i2s.c,v 1.2 2020/01/04 13:54:04 jmcneill Exp $ */
+/* $NetBSD: rk_i2s.c,v 1.3 2020/02/29 05:51:10 isaki Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_i2s.c,v 1.2 2020/01/04 13:54:04 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_i2s.c,v 1.3 2020/02/29 05:51:10 isaki Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -231,16 +231,6 @@ rk_i2s_get_props(void *priv)
AUDIO_PROP_FULLDUPLEX;
}
-static int
-rk_i2s_round_blocksize(void *priv, int bs, int mode,
- const audio_params_t *params)
-{
- bs &= ~3;
- if (bs == 0)
- bs = 4;
- return bs;
-}
-
static void *
rk_i2s_allocm(void *priv, int dir, size_t size)
{
@@ -360,7 +350,6 @@ static const struct audio_hw_if rk_i2s_h
.query_format = rk_i2s_query_format,
.set_format = rk_i2s_set_format,
.get_props = rk_i2s_get_props,
- .round_blocksize = rk_i2s_round_blocksize,
.allocm = rk_i2s_allocm,
.freem = rk_i2s_freem,
.trigger_output = rk_i2s_trigger_output,
Index: src/sys/arch/arm/sunxi/sunxi_codec.c
diff -u src/sys/arch/arm/sunxi/sunxi_codec.c:1.7 src/sys/arch/arm/sunxi/sunxi_codec.c:1.8
--- src/sys/arch/arm/sunxi/sunxi_codec.c:1.7 Sat Jun 8 08:02:37 2019
+++ src/sys/arch/arm/sunxi/sunxi_codec.c Sat Feb 29 05:51:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_codec.c,v 1.7 2019/06/08 08:02:37 isaki Exp $ */
+/* $NetBSD: sunxi_codec.c,v 1.8 2020/02/29 05:51:10 isaki Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_codec.c,v 1.7 2019/06/08 08:02:37 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_codec.c,v 1.8 2020/02/29 05:51:10 isaki Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -261,16 +261,6 @@ sunxi_codec_get_props(void *priv)
}
static int
-sunxi_codec_round_blocksize(void *priv, int bs, int mode,
- const audio_params_t *params)
-{
- bs &= ~3;
- if (bs == 0)
- bs = 4;
- return bs;
-}
-
-static int
sunxi_codec_trigger_output(void *priv, void *start, void *end, int blksize,
void (*intr)(void *), void *intrarg, const audio_params_t *params)
{
@@ -475,7 +465,6 @@ static const struct audio_hw_if sunxi_co
.get_port = sunxi_codec_get_port,
.query_devinfo = sunxi_codec_query_devinfo,
.get_props = sunxi_codec_get_props,
- .round_blocksize = sunxi_codec_round_blocksize,
.trigger_output = sunxi_codec_trigger_output,
.trigger_input = sunxi_codec_trigger_input,
.halt_output = sunxi_codec_halt_output,
Index: src/sys/arch/arm/sunxi/sunxi_i2s.c
diff -u src/sys/arch/arm/sunxi/sunxi_i2s.c:1.7 src/sys/arch/arm/sunxi/sunxi_i2s.c:1.8
--- src/sys/arch/arm/sunxi/sunxi_i2s.c:1.7 Sun Nov 17 17:33:34 2019
+++ src/sys/arch/arm/sunxi/sunxi_i2s.c Sat Feb 29 05:51:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_i2s.c,v 1.7 2019/11/17 17:33:34 jmcneill Exp $ */
+/* $NetBSD: sunxi_i2s.c,v 1.8 2020/02/29 05:51:10 isaki Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_i2s.c,v 1.7 2019/11/17 17:33:34 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_i2s.c,v 1.8 2020/02/29 05:51:10 isaki Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -390,16 +390,6 @@ sunxi_i2s_get_props(void *priv)
}
static int
-sunxi_i2s_round_blocksize(void *priv, int bs, int mode,
- const audio_params_t *params)
-{
- bs &= ~3;
- if (bs == 0)
- bs = 4;
- return bs;
-}
-
-static int
sunxi_i2s_trigger_output(void *priv, void *start, void *end, int blksize,
void (*intr)(void *), void *intrarg, const audio_params_t *params)
{
@@ -587,7 +577,6 @@ static const struct audio_hw_if sunxi_i2
.allocm = sunxi_i2s_allocm,
.freem = sunxi_i2s_freem,
.get_props = sunxi_i2s_get_props,
- .round_blocksize = sunxi_i2s_round_blocksize,
.trigger_output = sunxi_i2s_trigger_output,
.trigger_input = sunxi_i2s_trigger_input,
.halt_output = sunxi_i2s_halt_output,
Index: src/sys/arch/evbarm/mini2440/audio_mini2440.c
diff -u src/sys/arch/evbarm/mini2440/audio_mini2440.c:1.4 src/sys/arch/evbarm/mini2440/audio_mini2440.c:1.5
--- src/sys/arch/evbarm/mini2440/audio_mini2440.c:1.4 Fri Jun 7 13:49:23 2019
+++ src/sys/arch/evbarm/mini2440/audio_mini2440.c Sat Feb 29 05:51:11 2020
@@ -74,7 +74,6 @@ int uda_ssio_query_format(void *, audio_
int uda_ssio_set_format(void *, int,
const audio_params_t *, const audio_params_t *,
audio_filter_reg_t *, audio_filter_reg_t *);
-int uda_ssio_round_blocksize(void *, int, int, const audio_params_t *);
int uda_ssio_start_output(void *, void *, int, void (*)(void *),
void *);
int uda_ssio_start_input(void *, void *, int, void (*)(void *),
@@ -93,7 +92,6 @@ struct audio_hw_if uda1341_hw_if = {
.close = uda_ssio_close,
.query_format = uda_ssio_query_format,
.set_format = uda_ssio_set_format,
- .round_blocksize = uda_ssio_round_blocksize,
.start_output = uda_ssio_start_output,
.start_input = uda_ssio_start_input,
.halt_output = uda_ssio_halt_output,
@@ -301,18 +299,6 @@ uda_ssio_set_format(void *handle, int se
}
int
-uda_ssio_round_blocksize(void *handle, int bs, int mode,
- const audio_params_t *param)
-{
- int out_bs;
- DPRINTF(("%s: %d\n", __func__, bs));
-
- out_bs = (bs + 0x03) & ~0x03;
- DPRINTF(("%s: out_bs: %d\n", __func__, out_bs));
- return out_bs;
-}
-
-int
uda_ssio_start_output(void *handle, void *block, int bsize,
void (*intr)(void *), void *intrarg)
{
Index: src/sys/arch/prep/isa/paud_isa.c
diff -u src/sys/arch/prep/isa/paud_isa.c:1.18 src/sys/arch/prep/isa/paud_isa.c:1.19
--- src/sys/arch/prep/isa/paud_isa.c:1.18 Wed May 8 13:40:16 2019
+++ src/sys/arch/prep/isa/paud_isa.c Sat Feb 29 05:51:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: paud_isa.c,v 1.18 2019/05/08 13:40:16 isaki Exp $ */
+/* $NetBSD: paud_isa.c,v 1.19 2020/02/29 05:51:11 isaki Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: paud_isa.c,v 1.18 2019/05/08 13:40:16 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: paud_isa.c,v 1.19 2020/02/29 05:51:11 isaki Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -98,7 +98,6 @@ static const struct audio_hw_if paud_hw_
.close = ad1848_isa_close,
.query_format = ad1848_query_format,
.set_format = ad1848_set_format,
- .round_blocksize = ad1848_round_blocksize,
.commit_settings = ad1848_commit_settings,
.halt_output = ad1848_isa_halt_output,
.halt_input = ad1848_isa_halt_input,
Index: src/sys/dev/ic/ad1848.c
diff -u src/sys/dev/ic/ad1848.c:1.32 src/sys/dev/ic/ad1848.c:1.33
--- src/sys/dev/ic/ad1848.c:1.32 Wed May 8 13:40:18 2019
+++ src/sys/dev/ic/ad1848.c Sat Feb 29 05:51:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ad1848.c,v 1.32 2019/05/08 13:40:18 isaki Exp $ */
+/* $NetBSD: ad1848.c,v 1.33 2020/02/29 05:51:11 isaki Exp $ */
/*-
* Copyright (c) 1999, 2008 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ad1848.c,v 1.32 2019/05/08 13:40:18 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ad1848.c,v 1.33 2020/02/29 05:51:11 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -863,15 +863,6 @@ ad1848_get_rec_port(struct ad1848_softc
}
int
-ad1848_round_blocksize(void *addr, int blk,
- int mode, const audio_params_t *param)
-{
-
- /* Round to a multiple of the biggest sample size. */
- return blk &= -4;
-}
-
-int
ad1848_open(void *addr, int flags)
{
struct ad1848_softc *sc;
Index: src/sys/dev/ic/ad1848var.h
diff -u src/sys/dev/ic/ad1848var.h:1.19 src/sys/dev/ic/ad1848var.h:1.20
--- src/sys/dev/ic/ad1848var.h:1.19 Wed May 8 13:40:18 2019
+++ src/sys/dev/ic/ad1848var.h Sat Feb 29 05:51:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ad1848var.h,v 1.19 2019/05/08 13:40:18 isaki Exp $ */
+/* $NetBSD: ad1848var.h,v 1.20 2020/02/29 05:51:11 isaki Exp $ */
/*-
* Copyright (c) 1999, 2008 The NetBSD Foundation, Inc.
@@ -176,7 +176,6 @@ int ad1848_query_format(void *, audio_fo
int ad1848_set_format(void *, int,
const audio_params_t *, const audio_params_t *,
audio_filter_reg_t *, audio_filter_reg_t *);
-int ad1848_round_blocksize(void *, int, int, const audio_params_t *);
int ad1848_commit_settings(void *);
int ad1848_set_rec_port(struct ad1848_softc *, int);
int ad1848_get_rec_port(struct ad1848_softc *);
Index: src/sys/dev/ic/interwavevar.h
diff -u src/sys/dev/ic/interwavevar.h:1.19 src/sys/dev/ic/interwavevar.h:1.20
--- src/sys/dev/ic/interwavevar.h:1.19 Wed May 8 13:40:18 2019
+++ src/sys/dev/ic/interwavevar.h Sat Feb 29 05:51:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: interwavevar.h,v 1.19 2019/05/08 13:40:18 isaki Exp $ */
+/* $NetBSD: interwavevar.h,v 1.20 2020/02/29 05:51:11 isaki Exp $ */
/*
* Copyright (c) 1997, 1999, 2008 The NetBSD Foundation, Inc.
@@ -204,9 +204,6 @@ int iw_audio_set_format(void *, int,
const audio_params_t *, const audio_params_t *,
audio_filter_reg_t *, audio_filter_reg_t *);
- /* Hardware may have some say in the blocksize to choose */
-int iw_round_blocksize(void *, int, int, const audio_params_t *);
-
int iw_commit_settings(void *);
/* Software en/decode functions, set if SW coding required by HW */
Index: src/sys/dev/ic/interwave.c
diff -u src/sys/dev/ic/interwave.c:1.42 src/sys/dev/ic/interwave.c:1.43
--- src/sys/dev/ic/interwave.c:1.42 Sat Jun 8 08:02:38 2019
+++ src/sys/dev/ic/interwave.c Sat Feb 29 05:51:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: interwave.c,v 1.42 2019/06/08 08:02:38 isaki Exp $ */
+/* $NetBSD: interwave.c,v 1.43 2020/02/29 05:51:11 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.42 2019/06/08 08:02:38 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interwave.c,v 1.43 2020/02/29 05:51:11 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -698,15 +698,6 @@ iw_audio_set_format(void *addr, int setm
return 0;
}
-int
-iw_round_blocksize(void *addr, int blk, int mode,
- const audio_params_t *param)
-{
-
- /* Round to a multiple of the biggest sample size. */
- return blk & -4;
-}
-
void
iw_mixer_line_level(struct iw_softc *sc, int line, int levl, int levr)
{
Index: src/sys/dev/ic/pl041.c
diff -u src/sys/dev/ic/pl041.c:1.7 src/sys/dev/ic/pl041.c:1.8
--- src/sys/dev/ic/pl041.c:1.7 Sun Feb 23 04:02:46 2020
+++ src/sys/dev/ic/pl041.c Sat Feb 29 05:51:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pl041.c,v 1.7 2020/02/23 04:02:46 isaki Exp $ */
+/* $NetBSD: pl041.c,v 1.8 2020/02/29 05:51:11 isaki Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pl041.c,v 1.7 2020/02/23 04:02:46 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pl041.c,v 1.8 2020/02/29 05:51:11 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,7 +76,6 @@ __KERNEL_RCSID(0, "$NetBSD: pl041.c,v 1.
#define AACIDR 0x90
#define AACI_FIFO_DEPTH 512
-#define AACI_BLOCK_ALIGN 4
#define AACI_READ(sc, reg) \
bus_space_read_4((sc)->sc_bst, (sc)->sc_bsh, (reg))
@@ -212,12 +211,6 @@ aaci_halt_output(void *priv)
return 0;
}
-static int
-aaci_round_blocksize(void *priv, int bs, int mode, const audio_params_t *params)
-{
- return roundup(bs, AACI_BLOCK_ALIGN);
-}
-
static void
aaci_get_locks(void *priv, kmutex_t **intr, kmutex_t **thread)
{
@@ -237,7 +230,6 @@ static const struct audio_hw_if aaci_hw_
.get_props = aaci_get_props,
.trigger_output = aaci_trigger_output,
.halt_output = aaci_halt_output,
- .round_blocksize = aaci_round_blocksize,
.get_locks = aaci_get_locks,
};
Index: src/sys/dev/isa/gus.c
diff -u src/sys/dev/isa/gus.c:1.117 src/sys/dev/isa/gus.c:1.118
--- src/sys/dev/isa/gus.c:1.117 Sat Jun 8 08:02:38 2019
+++ src/sys/dev/isa/gus.c Sat Feb 29 05:51:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gus.c,v 1.117 2019/06/08 08:02:38 isaki Exp $ */
+/* $NetBSD: gus.c,v 1.118 2020/02/29 05:51:11 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.117 2019/06/08 08:02:38 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.118 2020/02/29 05:51:11 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2332,7 +2332,6 @@ gusmax_round_blocksize(void *addr, int b
ac = addr;
sc = ac->sc_ad1848.parent;
-/* blocksize = ad1848_round_blocksize(ac, blocksize, mode, param);*/
return gus_round_blocksize(sc, blocksize, mode, param);
}
Index: src/sys/dev/isa/wss.c
diff -u src/sys/dev/isa/wss.c:1.73 src/sys/dev/isa/wss.c:1.74
--- src/sys/dev/isa/wss.c:1.73 Wed May 8 13:40:18 2019
+++ src/sys/dev/isa/wss.c Sat Feb 29 05:51:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: wss.c,v 1.73 2019/05/08 13:40:18 isaki Exp $ */
+/* $NetBSD: wss.c,v 1.74 2020/02/29 05:51:11 isaki Exp $ */
/*
* Copyright (c) 1994 John Brezak
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.73 2019/05/08 13:40:18 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.74 2020/02/29 05:51:11 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,7 +89,6 @@ const struct audio_hw_if wss_hw_if = {
.close = ad1848_isa_close,
.query_format = ad1848_query_format,
.set_format = ad1848_set_format,
- .round_blocksize = ad1848_round_blocksize,
.commit_settings = ad1848_commit_settings,
.halt_output = ad1848_isa_halt_output,
.halt_input = ad1848_isa_halt_input,
Index: src/sys/dev/isa/ym.c
diff -u src/sys/dev/isa/ym.c:1.46 src/sys/dev/isa/ym.c:1.47
--- src/sys/dev/isa/ym.c:1.46 Wed May 8 13:40:18 2019
+++ src/sys/dev/isa/ym.c Sat Feb 29 05:51:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ym.c,v 1.46 2019/05/08 13:40:18 isaki Exp $ */
+/* $NetBSD: ym.c,v 1.47 2020/02/29 05:51:11 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.46 2019/05/08 13:40:18 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.47 2020/02/29 05:51:11 isaki Exp $");
#include "mpu_ym.h"
#include "opt_ym.h"
@@ -172,7 +172,6 @@ const struct audio_hw_if ym_hw_if = {
.close = ad1848_isa_close,
.query_format = ad1848_query_format,
.set_format = ad1848_set_format,
- .round_blocksize = ad1848_round_blocksize,
.commit_settings = ad1848_commit_settings,
.halt_output = ad1848_isa_halt_output,
.halt_input = ad1848_isa_halt_input,
Index: src/sys/dev/isapnp/gus_isapnp.c
diff -u src/sys/dev/isapnp/gus_isapnp.c:1.40 src/sys/dev/isapnp/gus_isapnp.c:1.41
--- src/sys/dev/isapnp/gus_isapnp.c:1.40 Wed May 8 13:40:18 2019
+++ src/sys/dev/isapnp/gus_isapnp.c Sat Feb 29 05:51:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gus_isapnp.c,v 1.40 2019/05/08 13:40:18 isaki Exp $ */
+/* $NetBSD: gus_isapnp.c,v 1.41 2020/02/29 05:51:11 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.40 2019/05/08 13:40:18 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.41 2020/02/29 05:51:11 isaki Exp $");
#include "guspnp.h"
#if NGUSPNP > 0
@@ -66,7 +66,6 @@ static const struct audio_hw_if guspnp_h
.close = iwclose,
.query_format = iw_query_format,
.set_format = iw_audio_set_format,
- .round_blocksize = iw_round_blocksize,
.commit_settings = iw_commit_settings,
.init_output = iw_init_output,
.init_input = iw_init_input,
Index: src/sys/dev/pci/autri.c
diff -u src/sys/dev/pci/autri.c:1.58 src/sys/dev/pci/autri.c:1.59
--- src/sys/dev/pci/autri.c:1.58 Sat Jun 8 08:02:38 2019
+++ src/sys/dev/pci/autri.c Sat Feb 29 05:51:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: autri.c,v 1.58 2019/06/08 08:02:38 isaki Exp $ */
+/* $NetBSD: autri.c,v 1.59 2020/02/29 05:51:11 isaki Exp $ */
/*
* Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.58 2019/06/08 08:02:38 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.59 2020/02/29 05:51:11 isaki Exp $");
#include "midi.h"
@@ -113,7 +113,6 @@ static int autri_query_format(void *, au
static int autri_set_format(void *, int,
const audio_params_t *, const audio_params_t *,
audio_filter_reg_t *, audio_filter_reg_t *);
-static int autri_round_blocksize(void *, int, int, const audio_params_t *);
static int autri_trigger_output(void *, void *, void *, int,
void (*)(void *), void *,
const audio_params_t *);
@@ -135,7 +134,6 @@ static const struct audio_hw_if autri_hw
.open = autri_open,
.query_format = autri_query_format,
.set_format = autri_set_format,
- .round_blocksize = autri_round_blocksize,
.halt_output = autri_halt_output,
.halt_input = autri_halt_input,
.getdev = autri_getdev,
@@ -912,13 +910,6 @@ autri_set_format(void *addr, int setmode
}
static int
-autri_round_blocksize(void *addr, int block,
- int mode, const audio_params_t *param)
-{
- return block & -4;
-}
-
-static int
autri_halt_output(void *addr)
{
struct autri_softc *sc;
Index: src/sys/dev/pci/cmpci.c
diff -u src/sys/dev/pci/cmpci.c:1.56 src/sys/dev/pci/cmpci.c:1.57
--- src/sys/dev/pci/cmpci.c:1.56 Sat Jun 8 08:02:38 2019
+++ src/sys/dev/pci/cmpci.c Sat Feb 29 05:51:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cmpci.c,v 1.56 2019/06/08 08:02:38 isaki Exp $ */
+/* $NetBSD: cmpci.c,v 1.57 2020/02/29 05:51:11 isaki Exp $ */
/*
* Copyright (c) 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.56 2019/06/08 08:02:38 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.57 2020/02/29 05:51:11 isaki Exp $");
#if defined(AUDIO_DEBUG) || defined(DEBUG)
#define DPRINTF(x) if (cmpcidebug) printf x
@@ -129,7 +129,6 @@ static int cmpci_query_format(void *, au
static int cmpci_set_format(void *, int,
const audio_params_t *, const audio_params_t *,
audio_filter_reg_t *, audio_filter_reg_t *);
-static int cmpci_round_blocksize(void *, int, int, const audio_params_t *);
static int cmpci_halt_output(void *);
static int cmpci_halt_input(void *);
static int cmpci_getdev(void *, struct audio_device *);
@@ -149,7 +148,6 @@ static void cmpci_get_locks(void *, kmut
static const struct audio_hw_if cmpci_hw_if = {
.query_format = cmpci_query_format,
.set_format = cmpci_set_format,
- .round_blocksize = cmpci_round_blocksize,
.halt_output = cmpci_halt_output,
.halt_input = cmpci_halt_input,
.getdev = cmpci_getdev,
@@ -629,15 +627,6 @@ cmpci_set_format(void *handle, int setmo
return 0;
}
-/* ARGSUSED */
-static int
-cmpci_round_blocksize(void *handle, int block,
- int mode, const audio_params_t *param)
-{
-
- return block & -4;
-}
-
static int
cmpci_halt_output(void *handle)
{
Index: src/sys/dev/pci/yds.c
diff -u src/sys/dev/pci/yds.c:1.64 src/sys/dev/pci/yds.c:1.65
--- src/sys/dev/pci/yds.c:1.64 Sat Jun 8 08:02:38 2019
+++ src/sys/dev/pci/yds.c Sat Feb 29 05:51:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: yds.c,v 1.64 2019/06/08 08:02:38 isaki Exp $ */
+/* $NetBSD: yds.c,v 1.65 2020/02/29 05:51:11 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.64 2019/06/08 08:02:38 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.65 2020/02/29 05:51:11 isaki Exp $");
#include "mpu.h"
@@ -1280,7 +1280,7 @@ yds_round_blocksize(void *addr, int blk,
if (blk < 1024)
blk = 1024;
- return blk & ~3;
+ return blk;
}
static uint32_t
