Source-Changes-HG archive

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

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



details:   https://anonhg.NetBSD.org/src/rev/49caabaae519
branches:  isaki-audio2
changeset: 998511:49caabaae519
user:      isaki <isaki%NetBSD.org@localhost>
date:      Sun Apr 28 07:01:45 2019 +0000

description:
Adapt to audio2.

diffstat:

 sys/dev/pci/gcscaudio.c |  155 +++++++++++++----------------------------------
 1 files changed, 45 insertions(+), 110 deletions(-)

diffs (258 lines):

diff -r 35d98172cb04 -r 49caabaae519 sys/dev/pci/gcscaudio.c
--- a/sys/dev/pci/gcscaudio.c   Sun Apr 28 06:36:50 2019 +0000
+++ b/sys/dev/pci/gcscaudio.c   Sun Apr 28 07:01:45 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gcscaudio.c,v 1.16.2.1 2019/04/21 05:11:22 isaki Exp $ */
+/*     $NetBSD: gcscaudio.c,v 1.16.2.2 2019/04/28 07:01:45 isaki Exp $ */
 
 /*-
  * Copyright (c) 2008 SHIMIZU Ryo <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.16.2.1 2019/04/21 05:11:22 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.16.2.2 2019/04/28 07:01:45 isaki Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -40,8 +40,7 @@
 
 #include <sys/audioio.h>
 #include <dev/audio_if.h>
-#include <dev/mulaw.h>
-#include <dev/auconv.h>
+
 #include <dev/ic/ac97reg.h>
 #include <dev/ic/ac97var.h>
 
@@ -101,7 +100,6 @@
 #define GCSCAUDIO_MAXFORMATS   4
        struct audio_format sc_formats[GCSCAUDIO_MAXFORMATS];
        int sc_nformats;
-       struct audio_encoding_set *sc_encodings;
 
        /* AC97 codec */
        struct ac97_host_if host_if;
@@ -129,10 +127,10 @@
 /* for audio_hw_if */
 static int gcscaudio_open(void *, int);
 static void gcscaudio_close(void *);
-static int gcscaudio_query_encoding(void *, struct audio_encoding *);
-static int gcscaudio_set_params(void *, int, int, audio_params_t *,
-                                audio_params_t *, stream_filter_list_t *,
-                                stream_filter_list_t *);
+static int gcscaudio_query_format(void *, audio_format_query_t *);
+static int gcscaudio_set_format(void *, int,
+                                const audio_params_t *, const audio_params_t *,
+                                audio_filter_reg_t *, audio_filter_reg_t *);
 static int gcscaudio_round_blocksize(void *, int, int, const audio_params_t *);
 static int gcscaudio_halt_output(void *);
 static int gcscaudio_halt_input(void *);
@@ -143,7 +141,6 @@
 static void *gcscaudio_malloc(void *, int, size_t);
 static void gcscaudio_free(void *, void *, size_t);
 static size_t gcscaudio_round_buffersize(void *, int, size_t);
-static paddr_t gcscaudio_mappage(void *, void *, off_t, int);
 static int gcscaudio_get_props(void *);
 static int gcscaudio_trigger_output(void *, void *, void *, int,
                                     void (*)(void *), void *,
@@ -166,9 +163,6 @@
 static int gcscaudio_append_formats(struct gcscaudio_softc *,
                                     const struct audio_format *);
 static int gcscaudio_wait_ready_codec(struct gcscaudio_softc *sc, const char *);
-static int gcscaudio_set_params_ch(struct gcscaudio_softc *,
-                                   struct gcscaudio_softc_ch *, int,
-                                   audio_params_t *, stream_filter_list_t *);
 static int gcscaudio_allocate_dma(struct gcscaudio_softc *, size_t, void **,
                                   bus_dma_segment_t *, int, int *,
                                   bus_dmamap_t *);
@@ -188,8 +182,8 @@
        .open                   = gcscaudio_open,
        .close                  = gcscaudio_close,
        .drain                  = NULL,
-       .query_encoding         = gcscaudio_query_encoding,
-       .set_params             = gcscaudio_set_params,
+       .query_format           = gcscaudio_query_format,
+       .set_format             = gcscaudio_set_format,
        .round_blocksize        = gcscaudio_round_blocksize,
        .commit_settings        = NULL,
        .init_output            = NULL,
@@ -207,7 +201,6 @@
        .allocm                 = gcscaudio_malloc,
        .freem                  = gcscaudio_free,
        .round_buffersize       = gcscaudio_round_buffersize,
-       .mappage                = gcscaudio_mappage,
        .get_props              = gcscaudio_get_props,
        .trigger_output         = gcscaudio_trigger_output,
        .trigger_input          = gcscaudio_trigger_input,
@@ -350,18 +343,9 @@
        }
        mutex_exit(&sc->sc_lock);
 
-       if ((rc = auconv_create_encodings(sc->sc_formats, sc->sc_nformats,
-           &sc->sc_encodings)) != 0) {
-               aprint_error_dev(self,
-                   "auconv_create_encoding: error=%d\n", rc);
-               goto attach_failure_codec;
-       }
-
        audio_attach_mi(&gcscaudio_hw_if, sc, sc->sc_dev);
        return;
 
-attach_failure_codec:
-       sc->codec_if->vtbl->detach(sc->codec_if);
 attach_failure_intr:
        pci_intr_disestablish(sc->sc_pc, sc->sc_ih);
 attach_failure_unmap:
@@ -506,87 +490,58 @@
 }
 
 static int
-gcscaudio_query_encoding(void *arg, struct audio_encoding *fp)
+gcscaudio_query_format(void *arg, audio_format_query_t *afp)
 {
        struct gcscaudio_softc *sc;
 
        sc = (struct gcscaudio_softc *)arg;
-       return auconv_query_encoding(sc->sc_encodings, fp);
+       return audio_query_format(sc->sc_formats, sc->sc_nformats, afp);
 }
 
 static int
-gcscaudio_set_params_ch(struct gcscaudio_softc *sc,
-                        struct gcscaudio_softc_ch *ch, int mode,
-                        audio_params_t *p, stream_filter_list_t *fil)
-{
-       int error, idx;
-
-       if ((p->sample_rate < 8000) || (p->sample_rate > 48000))
-               return EINVAL;
-
-       if (p->precision != 8 && p->precision != 16)
-               return EINVAL;
-
-       if ((idx = auconv_set_converter(sc->sc_formats, sc->sc_nformats,
-           mode, p, TRUE, fil)) < 0)
-               return EINVAL;
-
-       if (fil->req_size > 0)
-               p = &fil->filters[0].param;
-
-       if (mode == AUMODE_PLAY) {
-               if (!AC97_IS_FIXED_RATE(sc->codec_if)) {
-                       /* setup rate of DAC */
-                       if ((error = sc->codec_if->vtbl->set_rate(sc->codec_if,
-                           AC97_REG_PCM_FRONT_DAC_RATE, &p->sample_rate)) != 0)
-                               return error;
-
-                       /* additional rate of DAC for Surround */
-                       if ((p->channels >= 4) &&
-                           (error = sc->codec_if->vtbl->set_rate(sc->codec_if,
-                           AC97_REG_PCM_SURR_DAC_RATE, &p->sample_rate)) != 0)
-                               return error;
-
-                       /* additional rate of DAC for LowFrequencyEffect */
-                       if ((p->channels == 6) &&
-                           (error = sc->codec_if->vtbl->set_rate(sc->codec_if,
-                           AC97_REG_PCM_LFE_DAC_RATE, &p->sample_rate)) != 0)
-                               return error;
-               }
-       }
-
-       if (mode == AUMODE_RECORD) {
-               if (!AC97_IS_FIXED_RATE(sc->codec_if)) {
-                       /* setup rate of ADC */
-                       if ((error = sc->codec_if->vtbl->set_rate(sc->codec_if,
-                           AC97_REG_PCM_LR_ADC_RATE, &p->sample_rate)) != 0)
-                               return error;
-               }
-       }
-
-       ch->ch_params = *p;
-       return 0;
-}
-
-static int
-gcscaudio_set_params(void *arg, int setmode, int usemode,
-                     audio_params_t *play, audio_params_t *rec,
-                     stream_filter_list_t *pfil, stream_filter_list_t *rfil)
+gcscaudio_set_format(void *arg, int setmode,
+                     const audio_params_t *play, const audio_params_t *rec,
+                     audio_filter_reg_t *pfil, audio_filter_reg_t *rfil)
 {
        struct gcscaudio_softc *sc;
+       int rate;
        int error;
 
        sc = (struct gcscaudio_softc *)arg;
 
        if (setmode & AUMODE_PLAY) {
-               if ((error = gcscaudio_set_params_ch(sc, &sc->sc_play,
-                   AUMODE_PLAY, play, pfil)) != 0)
-                       return error;
+               if (!AC97_IS_FIXED_RATE(sc->codec_if)) {
+                       /* setup rate of DAC */
+                       rate = play->sample_rate;
+                       if ((error = sc->codec_if->vtbl->set_rate(sc->codec_if,
+                           AC97_REG_PCM_FRONT_DAC_RATE, &rate)) != 0)
+                               return error;
+
+                       /* additional rate of DAC for Surround */
+                       rate = play->sample_rate;
+                       if ((play->channels >= 4) &&
+                           (error = sc->codec_if->vtbl->set_rate(sc->codec_if,
+                           AC97_REG_PCM_SURR_DAC_RATE, &rate)) != 0)
+                               return error;
+
+                       /* additional rate of DAC for LowFrequencyEffect */
+                       rate = play->sample_rate;
+                       if ((play->channels == 6) &&
+                           (error = sc->codec_if->vtbl->set_rate(sc->codec_if,
+                           AC97_REG_PCM_LFE_DAC_RATE, &rate)) != 0)
+                               return error;
+               }
+               sc->sc_play.ch_params = *rec;
        }
        if (setmode & AUMODE_RECORD) {
-               if ((error = gcscaudio_set_params_ch(sc, &sc->sc_rec,
-                   AUMODE_RECORD, rec, rfil)) != 0)
-                       return error;
+               if (!AC97_IS_FIXED_RATE(sc->codec_if)) {
+                       /* setup rate of ADC */
+                       rate = rec->sample_rate;
+                       if ((error = sc->codec_if->vtbl->set_rate(sc->codec_if,
+                           AC97_REG_PCM_LR_ADC_RATE, &rate)) != 0)
+                               return error;
+               }
+               sc->sc_rec.ch_params = *rec;
        }
 
        return 0;
@@ -719,26 +674,6 @@
        }
 }
 
-static paddr_t
-gcscaudio_mappage(void *arg, void *mem, off_t off, int prot)
-{
-       struct gcscaudio_softc *sc;
-       struct gcscaudio_dma *p;
-
-       if (off < 0)
-               return -1;
-
-       sc = (struct gcscaudio_softc *)arg;
-       LIST_FOREACH(p, &sc->sc_dmalist, list) {
-               if (p->addr == mem) {
-                       return bus_dmamem_mmap(sc->sc_dmat, p->segs, p->nseg,
-                           off, prot, BUS_DMA_WAITOK);
-               }
-       }
-
-       return -1;
-}
-
 static size_t
 gcscaudio_round_buffersize(void *addr, int direction, size_t size)
 {



Home | Main Index | Thread Index | Old Index