Module Name: src
Committed By: isaki
Date: Thu Apr 25 13:20:11 UTC 2019
Modified Files:
src/sys/arch/amiga/dev [isaki-audio2]: melody.c
src/sys/dev/ic [isaki-audio2]: tms320av110.c tms320av110var.h
Log Message:
Adapt to audio2.
- Starting playback in init_output() no longer works.
Introduce sc_active flag instead and do it in start_output().
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.40.1 src/sys/arch/amiga/dev/melody.c
cvs rdiff -u -r1.25 -r1.25.2.1 src/sys/dev/ic/tms320av110.c
cvs rdiff -u -r1.12 -r1.12.42.1 src/sys/dev/ic/tms320av110var.h
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/melody.c
diff -u src/sys/arch/amiga/dev/melody.c:1.18 src/sys/arch/amiga/dev/melody.c:1.18.40.1
--- src/sys/arch/amiga/dev/melody.c:1.18 Sat Oct 27 17:17:30 2012
+++ src/sys/arch/amiga/dev/melody.c Thu Apr 25 13:20:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: melody.c,v 1.18 2012/10/27 17:17:30 chs Exp $ */
+/* $NetBSD: melody.c,v 1.18.40.1 2019/04/25 13:20:11 isaki Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: melody.c,v 1.18 2012/10/27 17:17:30 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: melody.c,v 1.18.40.1 2019/04/25 13:20:11 isaki Exp $");
/*
* Melody audio driver.
@@ -114,7 +114,6 @@ melody_attach(device_t parent, device_t
mutex_init(&sc->sc_tav.sc_lock, MUTEX_DEFAULT, IPL_NONE);
mutex_init(&sc->sc_tav.sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
- cv_init(&sc->sc_tav.sc_cv, device_xname(self));
/*
* Attach option boards now. They might provide additional
Index: src/sys/dev/ic/tms320av110.c
diff -u src/sys/dev/ic/tms320av110.c:1.25 src/sys/dev/ic/tms320av110.c:1.25.2.1
--- src/sys/dev/ic/tms320av110.c:1.25 Sat Mar 16 12:09:57 2019
+++ src/sys/dev/ic/tms320av110.c Thu Apr 25 13:20:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tms320av110.c,v 1.25 2019/03/16 12:09:57 isaki Exp $ */
+/* $NetBSD: tms320av110.c,v 1.25.2.1 2019/04/25 13:20:11 isaki Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tms320av110.c,v 1.25 2019/03/16 12:09:57 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tms320av110.c,v 1.25.2.1 2019/04/25 13:20:11 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,21 +53,18 @@ __KERNEL_RCSID(0, "$NetBSD: tms320av110.
#include <sys/bus.h>
-int tav_open(void *, int);
void tav_close(void *);
-int tav_drain(void *);
-int tav_query_encoding(void *, struct audio_encoding *);
-int tav_set_params(void *, int, int, audio_params_t *, audio_params_t *,
- stream_filter_list_t *, stream_filter_list_t *);
+int tav_query_format(void *, audio_format_query_t *);
+int tav_set_format(void *, int,
+ const audio_params_t *, const audio_params_t *,
+ audio_filter_reg_t *, audio_filter_reg_t *);
int tav_round_blocksize(void *, int, int, const audio_params_t *);
-int tav_init_output(void *, void *, int);
int tav_start_output(void *, void *, int, void (*)(void *), void *);
int tav_start_input(void *, void *, int, void (*)(void *), void *);
int tav_halt_output(void *);
int tav_halt_input(void *);
int tav_speaker_ctl(void *, int);
int tav_getdev(void *, struct audio_device *);
-int tav_setfd(void *, int);
int tav_set_port(void *, mixer_ctrl_t *);
int tav_get_port(void *, mixer_ctrl_t *);
int tav_query_devinfo(void *, mixer_devinfo_t *);
@@ -75,12 +72,10 @@ int tav_get_props(void *);
void tav_get_locks(void *, kmutex_t **, kmutex_t **);
const struct audio_hw_if tav_audio_if = {
- .open = tav_open,
.close = tav_close,
- .query_encoding = tav_query_encoding,
- .set_params = tav_set_params,
+ .query_format = tav_query_format,
+ .set_format = tav_set_format,
.round_blocksize = tav_round_blocksize,
- .init_output = tav_init_output, /* optional */
.start_output = tav_start_output,
.start_input = tav_start_input,
.halt_output = tav_halt_output,
@@ -94,6 +89,30 @@ const struct audio_hw_if tav_audio_if =
.get_locks = tav_get_locks,
};
+/*
+ * XXX: The frequency might depend on the specific board.
+ * should be handled by the backend.
+ */
+#define TAV_FORMAT(prio, enc, prec) \
+ { \
+ .priority = (prio), \
+ .mode = AUMODE_PLAY, \
+ .encoding = (enc), \
+ .validbits = (prec), \
+ .precision = (prec), \
+ .channels = 2, \
+ .channel_mask = AUFMT_STEREO, \
+ .frequency_type = 1, \
+ .frequency = { 44100 }, \
+ }
+const struct audio_format tav_formats[] = {
+ TAV_FORMAT(-1, AUDIO_ENCODING_MPEG_L2_STREAM, 1),
+ TAV_FORMAT(-1, AUDIO_ENCODING_MPEG_L2_PACKETS, 1),
+ TAV_FORMAT(-1, AUDIO_ENCODING_MPEG_L2_SYSTEM, 1),
+ TAV_FORMAT( 0, AUDIO_ENCODING_SLINEAR_BE, 16),
+};
+#define TAV_NFORMATS __arraycount(tav_formats)
+
void
tms320av110_attach_mi(struct tav_softc *sc)
{
@@ -129,6 +148,8 @@ tms320av110_attach_mi(struct tav_softc *
tav_write_byte(iot, ioh, TAV_SYNC_ECM, TAV_ECM_REPEAT);
tav_write_byte(iot, ioh, TAV_CRC_ECM, TAV_ECM_REPEAT);
+ sc->sc_active = 0;
+
audio_attach_mi(&tav_audio_if, sc, sc->sc_dev);
}
@@ -156,30 +177,11 @@ tms320av110_intr(void *p)
(*sc->sc_intr)(sc->sc_intrarg);
}
- if (intlist & TAV_INTR_PCM_OUTPUT_UNDERFLOW) {
- cv_broadcast(&sc->sc_cv);
- }
-
mutex_spin_exit(&sc->sc_intr_lock);
return 1;
}
-struct audio_encoding tav_encodings[] = {
- {0, AudioEmpeg_l2_stream, AUDIO_ENCODING_MPEG_L2_STREAM, 1, 0,},
- {1, AudioEmpeg_l2_packets, AUDIO_ENCODING_MPEG_L2_PACKETS, 1, 0,},
- {2, AudioEmpeg_l2_system, AUDIO_ENCODING_MPEG_L2_SYSTEM, 1, 0,},
- {3, AudioEslinear_be, AUDIO_ENCODING_SLINEAR_BE, 16, 0,},
-};
-
-int
-tav_open(void *hdl, int flags)
-{
-
- /* dummy */
- return 0;
-}
-
void
tav_close(void *hdl)
{
@@ -198,55 +200,10 @@ tav_close(void *hdl)
}
int
-tav_drain(void *hdl)
+tav_query_format(void *hdl, audio_format_query_t *afp)
{
- struct tav_softc *sc;
- bus_space_tag_t iot;
- bus_space_handle_t ioh;
- u_int16_t mask;
-
- sc = hdl;
- iot = sc->sc_iot;
- ioh = sc->sc_ioh;
-
- mutex_spin_enter(&sc->sc_intr_lock);
-
- /*
- * wait for underflow interrupt.
- */
- if (tav_read_short(iot, ioh, TAV_BUFF)) {
- mask = tav_read_short(iot, ioh, TAV_INTR_EN);
- tav_write_short(iot, ioh, TAV_INTR_EN,
- mask|TAV_INTR_PCM_OUTPUT_UNDERFLOW);
-
- /* still more than zero? */
- if (tav_read_short(iot, ioh, TAV_BUFF)) {
- (void)cv_timedwait_sig(&sc->sc_cv,
- &sc->sc_intr_lock, 32*hz);
- }
-
- /* can be really that long for mpeg */
-
- mask = tav_read_short(iot, ioh, TAV_INTR_EN);
- tav_write_short(iot, ioh, TAV_INTR_EN,
- mask & ~TAV_INTR_PCM_OUTPUT_UNDERFLOW);
- }
-
- mutex_spin_exit(&sc->sc_intr_lock);
- return 0;
-}
-
-int
-tav_query_encoding(void *hdl, struct audio_encoding *ae)
-{
-
- if (ae->index >= sizeof(tav_encodings)/sizeof(*ae))
- return EINVAL;
-
- *ae = tav_encodings[ae->index];
-
- return 0;
+ return audio_query_format(tav_formats, TAV_NFORMATS, afp);
}
int
@@ -283,6 +240,12 @@ tav_start_output(void *hdl, void *block,
sc->sc_intr = intr;
sc->sc_intrarg = intrarg;
+ if (sc->sc_active == 0) {
+ tav_write_byte(iot, ioh, TAV_PLAY, 1);
+ tav_write_byte(iot, ioh, TAV_MUTE, 0);
+ sc->sc_active = 1;
+ }
+
bus_space_write_multi_1(iot, ioh, TAV_DATAIN, ptr, count);
tav_write_short(iot, ioh, TAV_INTR_EN, TAV_INTR_LOWWATER);
@@ -290,23 +253,6 @@ tav_start_output(void *hdl, void *block,
}
int
-tav_init_output(void *hdl, void *buffer, int size)
-{
- struct tav_softc *sc;
- bus_space_tag_t iot;
- bus_space_handle_t ioh;
-
- sc = hdl;
- iot = sc->sc_iot;
- ioh = sc->sc_ioh;
-
- tav_write_byte(iot, ioh, TAV_PLAY, 1);
- tav_write_byte(iot, ioh, TAV_MUTE, 0);
-
- return 0;
-}
-
-int
tav_halt_output(void *hdl)
{
struct tav_softc *sc;
@@ -318,6 +264,7 @@ tav_halt_output(void *hdl)
ioh = sc->sc_ioh;
tav_write_byte(iot, ioh, TAV_PLAY, 0);
+ sc->sc_active = 0;
return 0;
}
@@ -384,8 +331,9 @@ tav_get_locks(void *hdl, kmutex_t **intr
}
int
-tav_set_params(void *hdl, int setmode, int usemode, audio_params_t *p,
- audio_params_t *r, stream_filter_list_t *pfil, stream_filter_list_t *rfil)
+tav_set_format(void *hdl, int setmode,
+ const audio_params_t *p, const audio_params_t *r,
+ audio_filter_reg_t *pfil, audio_filter_reg_t *rfil)
{
struct tav_softc *sc;
bus_space_tag_t iot;
@@ -395,60 +343,11 @@ tav_set_params(void *hdl, int setmode, i
iot = sc->sc_iot;
ioh = sc->sc_ioh;
- if (!(setmode & AUMODE_PLAY))
- return 0;
+ KASSERT((setmode & AUMODE_PLAY));
+ KASSERT(p->encoding == AUDIO_ENCODING_SLINEAR_BE);
- if (p->encoding == AUDIO_ENCODING_ULAW)
- p->encoding = AUDIO_ENCODING_MPEG_L2_STREAM;
+ bus_space_write_1(iot, ioh, TAV_STR_SEL, TAV_STR_SEL_AUDIO_BYPASS);
- switch(p->encoding) {
- default:
- return EINVAL;
-
- case AUDIO_ENCODING_SLINEAR_BE:
-
- /* XXX: todo: add 8bit and mono using software */
- p->precision = 16;
- p->channels = 2;
-
- /* XXX: this might depend on the specific board.
- should be handled by the backend */
-
- p->sample_rate = 44100;
-
- bus_space_write_1(iot, ioh, TAV_STR_SEL,
- TAV_STR_SEL_AUDIO_BYPASS);
- break;
-
- /* XXX: later: add ULINEAR, and LE using software encoding */
-
- case AUDIO_ENCODING_MPEG_L1_STREAM:
- /* FALLTHROUGH */
- case AUDIO_ENCODING_MPEG_L2_STREAM:
- bus_space_write_1(iot, ioh, TAV_STR_SEL,
- TAV_STR_SEL_MPEG_AUDIO_STREAM);
- p->sample_rate = 44100;
- p->precision = 1;
- break;
-
- case AUDIO_ENCODING_MPEG_L1_PACKETS:
- /* FALLTHROUGH */
- case AUDIO_ENCODING_MPEG_L2_PACKETS:
- bus_space_write_1(iot, ioh, TAV_STR_SEL,
- TAV_STR_SEL_MPEG_AUDIO_PACKETS);
- p->sample_rate = 44100;
- p->precision = 1;
- break;
-
- case AUDIO_ENCODING_MPEG_L1_SYSTEM:
- /* FALLTHROUGH */
- case AUDIO_ENCODING_MPEG_L2_SYSTEM:
- bus_space_write_1(iot, ioh, TAV_STR_SEL,
- TAV_STR_SEL_MPEG_SYSTEM_STREAM);
- p->sample_rate = 44100;
- p->precision = 1;
- break;
- }
tav_write_byte(iot, ioh, TAV_RESTART, 1);
do {
delay(10);
Index: src/sys/dev/ic/tms320av110var.h
diff -u src/sys/dev/ic/tms320av110var.h:1.12 src/sys/dev/ic/tms320av110var.h:1.12.42.1
--- src/sys/dev/ic/tms320av110var.h:1.12 Sat Oct 27 17:18:23 2012
+++ src/sys/dev/ic/tms320av110var.h Thu Apr 25 13:20:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tms320av110var.h,v 1.12 2012/10/27 17:18:23 chs Exp $ */
+/* $NetBSD: tms320av110var.h,v 1.12.42.1 2019/04/25 13:20:11 isaki Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -48,11 +48,12 @@ struct tav_softc {
device_t sc_dev;
kmutex_t sc_lock;
kmutex_t sc_intr_lock;
- kcondvar_t sc_cv;
bus_space_tag_t sc_iot;
bus_space_handle_t sc_ioh;
+ int sc_active;
+
/* above audio callback function */
void (*sc_intr)(void *);
void *sc_intrarg;
