Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not try to get/set sample rate on codecs which don't support variable

Browse Source 
rate audio - always report/use fixed rate of 44100 for them, so that the
other audio code DTRT
This commit is contained in:
jdolecek 2000-12-10 15:43:02 +00:00
parent 4f1ee09e5f
commit 48f421c3fa
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/dev/pci/auvia.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: auvia.c,v 1.7 2000/11/15 21:06:33 jdolecek Exp $ */ /* $NetBSD: auvia.c,v 1.8 2000/12/10 15:43:02 jdolecek Exp $ */
/*- /*-
* Copyright (c) 2000 The NetBSD Foundation, Inc. * Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -82,6 +82,9 @@ struct auvia_dma_op {
#define AUVIA_DMAOP_COUNT(x) ((x)&0x00FFFFFF) #define AUVIA_DMAOP_COUNT(x) ((x)&0x00FFFFFF)
}; };
/* rev. H and later seem to support only fixed rate 44.1 kHz */
#define AUVIA_FIXED_RATE 44100
int auvia_match(struct device *, struct cfdata *, void *); int auvia_match(struct device *, struct cfdata *, void *);
void auvia_attach(struct device *, struct device *, void *); void auvia_attach(struct device *, struct device *, void *);
int auvia_open(void *, int); int auvia_open(void *, int);
@ -294,14 +297,14 @@ auvia_attach(struct device *parent, struct device *self, void *aux)
*/ */
if (auvia_read_codec(sc, AC97_REG_EXT_AUDIO_ID, &v) if (auvia_read_codec(sc, AC97_REG_EXT_AUDIO_ID, &v)
|| !(v & AC97_CODEC_DOES_VRA)) { || !(v & AC97_CODEC_DOES_VRA)) {
/* XXX */
printf("%s: warning: codec doesn't support hardware AC'97 2.0 Variable Rate Audio\n", printf("%s: warning: codec doesn't support hardware AC'97 2.0 Variable Rate Audio\n",
sc->sc_dev.dv_xname); sc->sc_dev.dv_xname);
sc->sc_fixed_rate = AUVIA_FIXED_RATE;
} else { } else {
/* enable VRA */ /* enable VRA */
auvia_write_codec(sc, AC97_REG_EXT_AUDIO_STAT, auvia_write_codec(sc, AC97_REG_EXT_AUDIO_STAT,
AC97_ENAB_VRA | AC97_ENAB_MICVRA); AC97_ENAB_VRA | AC97_ENAB_MICVRA);
sc->sc_fixed_rate = 0;
} }
/* disable mutes */ /* disable mutes */
@ -550,9 +553,12 @@ auvia_set_params(void *addr, int setmode, int usemode,
reg = mode == AUMODE_PLAY ? reg = mode == AUMODE_PLAY ?
AC97_REG_EXT_DAC_RATE : AC97_REG_EXT_ADC_RATE; AC97_REG_EXT_DAC_RATE : AC97_REG_EXT_ADC_RATE;
auvia_write_codec(sc, reg, (u_int16_t) p->sample_rate); if (!sc->sc_fixed_rate) {
auvia_read_codec(sc, reg, &regval); auvia_write_codec(sc, reg, (u_int16_t) p->sample_rate);
p->sample_rate = regval; auvia_read_codec(sc, reg, &regval);
p->sample_rate = regval;
} else
p->sample_rate = sc->sc_fixed_rate;
p->factor = 1; p->factor = 1;
p->sw_code = 0; p->sw_code = 0;

5
sys/dev/pci/auviavar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: auviavar.h,v 1.1 2000/03/31 04:45:29 tsarna Exp $ */ /* $NetBSD: auviavar.h,v 1.2 2000/12/10 15:43:02 jdolecek Exp $ */
/*- /*-
* Copyright (c) 2000 The NetBSD Foundation, Inc. * Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -54,6 +54,9 @@ struct auvia_softc {
struct device sc_dev; struct device sc_dev;
char sc_revision[8]; char sc_revision[8];
u_long sc_fixed_rate; /* if codec doesn't support variable
* rate audio, set to the fixed rate
* it uses */
void *sc_ih; /* interrupt handle */ void *sc_ih; /* interrupt handle */