Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/isaki-audio2]: src/sys/dev/ic Adapt to audio2.



details:   https://anonhg.NetBSD.org/src/rev/578c8a30f509
branches:  isaki-audio2
changeset: 998489:578c8a30f509
user:      isaki <isaki%NetBSD.org@localhost>
date:      Thu Apr 25 13:20:11 2019 +0000

description:
Adapt to audio2.
- Starting playback in init_output() no longer works.
  Introduce sc_active flag instead and do it in start_output().

diffstat:

 sys/arch/amiga/dev/melody.c |    5 +-
 sys/dev/ic/tms320av110.c    |  199 ++++++++++---------------------------------
 sys/dev/ic/tms320av110var.h |    5 +-
 3 files changed, 54 insertions(+), 155 deletions(-)

diffs (truncated from 358 to 300 lines):

diff -r f797e39d5886 -r 578c8a30f509 sys/arch/amiga/dev/melody.c
--- a/sys/arch/amiga/dev/melody.c       Wed Apr 24 13:30:34 2019 +0000
+++ b/sys/arch/amiga/dev/melody.c       Thu Apr 25 13:20:11 2019 +0000
@@ -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 @@
 
        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
diff -r f797e39d5886 -r 578c8a30f509 sys/dev/ic/tms320av110.c
--- a/sys/dev/ic/tms320av110.c  Wed Apr 24 13:30:34 2019 +0000
+++ b/sys/dev/ic/tms320av110.c  Thu Apr 25 13:20:11 2019 +0000
@@ -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 @@
 
 #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 @@
 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 @@
        .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 @@
        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 @@
                (*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 @@
 }
 
 int
-tav_drain(void *hdl)
-{
-       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)
+tav_query_format(void *hdl, audio_format_query_t *afp)
 {
 
-       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 @@
        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 @@
 }
 
 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 @@
        ioh = sc->sc_ioh;
 
        tav_write_byte(iot, ioh, TAV_PLAY, 0);
+       sc->sc_active = 0;
 
        return 0;
 }
@@ -384,8 +331,9 @@
 }
 
 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 @@
        iot = sc->sc_iot;
        ioh = sc->sc_ioh;
 
-       if (!(setmode & AUMODE_PLAY))
-               return 0;
-
-       if (p->encoding == AUDIO_ENCODING_ULAW)
-               p->encoding = AUDIO_ENCODING_MPEG_L2_STREAM;
-
-       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;
-



Home | Main Index | Thread Index | Old Index