Module Name: src
Committed By: isaki
Date: Sat Apr 27 05:22:28 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi [isaki-audio2]: sunxi_i2s.c
Log Message:
Adapt to audio2.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/arch/arm/sunxi/sunxi_i2s.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/arm/sunxi/sunxi_i2s.c
diff -u src/sys/arch/arm/sunxi/sunxi_i2s.c:1.3 src/sys/arch/arm/sunxi/sunxi_i2s.c:1.3.2.1
--- src/sys/arch/arm/sunxi/sunxi_i2s.c:1.3 Sat Nov 17 20:36:23 2018
+++ src/sys/arch/arm/sunxi/sunxi_i2s.c Sat Apr 27 05:22:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_i2s.c,v 1.3 2018/11/17 20:36:23 jmcneill Exp $ */
+/* $NetBSD: sunxi_i2s.c,v 1.3.2.1 2019/04/27 05:22:28 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 2018/11/17 20:36:23 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_i2s.c,v 1.3.2.1 2019/04/27 05:22:28 isaki Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_i2s.c,
#include <sys/audioio.h>
#include <dev/audio_if.h>
-#include <dev/auconv.h>
+#include <dev/audio/linear.h>
#include <dev/fdt/fdtvar.h>
@@ -159,7 +159,6 @@ struct sunxi_i2s_softc {
kmutex_t sc_intr_lock;
struct audio_format sc_format;
- struct audio_encoding_set *sc_encodings;
struct sunxi_i2s_chan sc_pchan;
struct sunxi_i2s_chan sc_rchan;
@@ -234,51 +233,24 @@ sunxi_i2s_transfer(struct sunxi_i2s_chan
}
static int
-sunxi_i2s_open(void *priv, int flags)
-{
- return 0;
-}
-
-static void
-sunxi_i2s_close(void *priv)
-{
-}
-
-static int
-sunxi_i2s_query_encoding(void *priv, struct audio_encoding *ae)
+sunxi_i2s_query_format(void *priv, audio_format_query_t *afp)
{
struct sunxi_i2s_softc * const sc = priv;
- return auconv_query_encoding(sc->sc_encodings, ae);
+ return audio_query_format(&sc->sc_format, 1, afp);
}
static int
-sunxi_i2s_set_params(void *priv, int setmode, int usemode,
- audio_params_t *play, audio_params_t *rec,
- stream_filter_list_t *pfil, stream_filter_list_t *rfil)
+sunxi_i2s_set_format(void *priv, int setmode,
+ const audio_params_t *play, const audio_params_t *rec,
+ audio_filter_reg_t *pfil, audio_filter_reg_t *rfil)
{
- struct sunxi_i2s_softc * const sc = priv;
- int index;
- if (play && (setmode & AUMODE_PLAY)) {
- index = auconv_set_converter(&sc->sc_format, 1,
- AUMODE_PLAY, play, true, pfil);
- if (index < 0)
- return EINVAL;
- sc->sc_pchan.ch_params = pfil->req_size > 0 ?
- pfil->filters[0].param : *play;
- pfil->prepend(pfil, linear16_16_to_linear32,
- &sc->sc_pchan.ch_params);
- }
- if (rec && (setmode & AUMODE_RECORD)) {
- index = auconv_set_converter(&sc->sc_format, 1,
- AUMODE_RECORD, rec, true, rfil);
- if (index < 0)
- return EINVAL;
- sc->sc_rchan.ch_params = rfil->req_size > 0 ?
- rfil->filters[0].param : *rec;
- rfil->prepend(rfil, linear32_32_to_linear16,
- &sc->sc_rchan.ch_params);
+ if ((setmode & AUMODE_PLAY)) {
+ pfil->codec = audio_internal_to_linear32;
+ }
+ if ((setmode & AUMODE_RECORD)) {
+ rfil->codec = audio_linear32_to_internal;
}
return 0;
@@ -321,24 +293,6 @@ sunxi_i2s_freem(void *priv, void *addr,
}
}
-static paddr_t
-sunxi_i2s_mappage(void *priv, void *addr, off_t off, int prot)
-{
- struct sunxi_i2s_softc * const sc = priv;
- struct sunxi_i2s_dma *dma;
-
- if (off < 0)
- return -1;
-
- LIST_FOREACH(dma, &sc->sc_dmalist, dma_list)
- if (dma->dma_addr == addr) {
- return bus_dmamem_mmap(sc->sc_dmat, dma->dma_segs,
- dma->dma_nsegs, off, prot, BUS_DMA_WAITOK);
- }
-
- return -1;
-}
-
static int
sunxi_i2s_get_props(void *priv)
{
@@ -356,12 +310,6 @@ sunxi_i2s_round_blocksize(void *priv, in
return bs;
}
-static size_t
-sunxi_i2s_round_buffersize(void *priv, int dir, size_t bufsize)
-{
- return bufsize;
-}
-
static int
sunxi_i2s_trigger_output(void *priv, void *start, void *end, int blksize,
void (*intr)(void *), void *intrarg, const audio_params_t *params)
@@ -533,17 +481,13 @@ sunxi_i2s_get_locks(void *priv, kmutex_t
}
static const struct audio_hw_if sunxi_i2s_hw_if = {
- .open = sunxi_i2s_open,
- .close = sunxi_i2s_close,
.drain = NULL,
- .query_encoding = sunxi_i2s_query_encoding,
- .set_params = sunxi_i2s_set_params,
+ .query_format = sunxi_i2s_query_format,
+ .set_format = sunxi_i2s_set_format,
.allocm = sunxi_i2s_allocm,
.freem = sunxi_i2s_freem,
- .mappage = sunxi_i2s_mappage,
.get_props = sunxi_i2s_get_props,
.round_blocksize = sunxi_i2s_round_blocksize,
- .round_buffersize = sunxi_i2s_round_buffersize,
.trigger_output = sunxi_i2s_trigger_output,
.trigger_input = sunxi_i2s_trigger_input,
.halt_output = sunxi_i2s_halt_output,
@@ -751,7 +695,6 @@ sunxi_i2s_attach(device_t parent, device
bus_addr_t addr;
bus_size_t size;
uint32_t val;
- int error;
if (fdtbus_get_reg(phandle, 0, &addr, &size) != 0) {
aprint_error(": couldn't get registers\n");
@@ -809,18 +752,12 @@ sunxi_i2s_attach(device_t parent, device
sc->sc_format.mode = AUMODE_PLAY|AUMODE_RECORD;
sc->sc_format.encoding = AUDIO_ENCODING_SLINEAR_LE;
- sc->sc_format.validbits = 16;
- sc->sc_format.precision = 16;
+ sc->sc_format.validbits = 32;
+ sc->sc_format.precision = 32;
sc->sc_format.channels = 2;
sc->sc_format.channel_mask = AUFMT_STEREO;
- sc->sc_format.frequency_type = 0;
- sc->sc_format.frequency[0] = sc->sc_format.frequency[1] = 48000;
-
- error = auconv_create_encodings(&sc->sc_format, 1, &sc->sc_encodings);
- if (error) {
- aprint_error_dev(self, "couldn't create encodings\n");
- return;
- }
+ sc->sc_format.frequency_type = 1;
+ sc->sc_format.frequency[0] = 48000;
sc->sc_dai.dai_set_sysclk = sunxi_i2s_dai_set_sysclk;
sc->sc_dai.dai_set_format = sunxi_i2s_dai_set_format;
