diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2005-05-23 18:49:32 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2005-05-23 18:49:32 +0000 |
| commit | 0cc57afd9f0fb72873642d528cec2016f9a0953e (patch) | |
| tree | 2e698fa39c5a6b2804af28a687b6f5fa1ee0fa9f /sys | |
| parent | 669a743526cfabe7eeef0655721c0534b12c4e9e (diff) | |
pin the sample rate at 44.1k, PB's don't seem to get the 8k or 48k sample
rate notificiations
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/macppc/dev/snapper.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sys/arch/macppc/dev/snapper.c b/sys/arch/macppc/dev/snapper.c index 50ca23524c9..f328dd72916 100644 --- a/sys/arch/macppc/dev/snapper.c +++ b/sys/arch/macppc/dev/snapper.c @@ -1,4 +1,4 @@ -/* $OpenBSD: snapper.c,v 1.13 2005/05/22 21:10:27 jason Exp $ */ +/* $OpenBSD: snapper.c,v 1.14 2005/05/23 18:49:31 jason Exp $ */ /* $NetBSD: snapper.c,v 1.1 2003/12/27 02:19:34 grant Exp $ */ /*- @@ -96,6 +96,7 @@ struct snapper_softc { dbdma_t sc_odbdma, sc_idbdma; struct snapper_dma *sc_dmas; + u_long sc_rate; }; int snapper_match(struct device *, void *, void *); @@ -577,15 +578,8 @@ swap_bytes_mono16_to_stereo16(v, p, cc) void snapper_cs16mts(void *v, u_char *p, int cc) { - u_char *q = p; - - p += cc; - q += cc * 2; - while ((cc -= 2) >= 0) { - q -= 4; - q[1] = q[3] = *--p; - q[0] = q[2] = (*--p) ^ 80; - } + mono16_to_stereo16(v, p, cc); + change_sign16_be(v, p, cc * 2); } struct snapper_mode { @@ -724,10 +718,12 @@ snapper_set_params(h, setmode, usemode, play, rec) } /* Set the speed */ + p->sample_rate = 44100; /*XX wire rate down */ rate = p->sample_rate; if (snapper_set_rate(sc, rate)) return EINVAL; + p->sample_rate = sc->sc_rate; return 0; } @@ -1184,6 +1180,8 @@ snapper_set_rate(sc, rate) in32rb(sc->sc_reg + I2S_FORMAT), reg)); out32rb(sc->sc_reg + I2S_FORMAT, reg); + sc->sc_rate = rate; + return 0; } |