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

Set the FIFO control bits correctly so that stereo recording works.

Browse Source
This commit is contained in:
mycroft 1998-08-09 02:54:50 +00:00
parent 80457a2c65
commit 565adbaffb
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sys/dev/isa/ess.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ess.c,v 1.10 1998/08/09 02:05:52 mycroft Exp $ */
/* $NetBSD: ess.c,v 1.11 1998/08/09 02:54:50 mycroft Exp $ */
/*
* Copyright 1997
@ -1244,17 +1244,19 @@ ess_set_in_channels(addr, channels)
switch(channels) {
case 1:
ess_set_xreg_bits(sc, ESS_XCMD_AUDIO_CTRL,
ESS_AUDIO_CTRL_MONO);
ess_clear_xreg_bits(sc, ESS_XCMD_AUDIO_CTRL,
ESS_AUDIO_CTRL_STEREO);
ess_write_x_reg(sc, ESS_XCMD_AUDIO_CTRL,
(ess_read_x_reg(sc, ESS_XCMD_AUDIO_CTRL) |
ESS_AUDIO_CTRL_MONO) &~ ESS_AUDIO_CTRL_STEREO);
ess_clear_xreg_bits(sc, ESS_XCMD_AUDIO1_CTRL1,
ESS_AUDIO1_CTRL1_FIFO_STEREO);
break;
case 2:
ess_set_xreg_bits(sc, ESS_XCMD_AUDIO_CTRL,
ESS_AUDIO_CTRL_STEREO);
ess_clear_xreg_bits(sc, ESS_XCMD_AUDIO_CTRL,
ESS_AUDIO_CTRL_MONO);
ess_write_x_reg(sc, ESS_XCMD_AUDIO_CTRL,
(ess_read_x_reg(sc, ESS_XCMD_AUDIO_CTRL) |
ESS_AUDIO_CTRL_STEREO) &~ ESS_AUDIO_CTRL_MONO);
ess_set_xreg_bits(sc, ESS_XCMD_AUDIO1_CTRL1,
ESS_AUDIO1_CTRL1_FIFO_STEREO);
break;
default:
@ -1350,15 +1352,6 @@ ess_dma_output(addr, p, cc, intr, arg)
ESS_AUDIO2_CTRL1_FIFO_ENABLE |
ESS_AUDIO2_CTRL1_AUTO_INIT);
#if 0
/* XXX
* seems like the 888 and 1888 have an interlock that
* prevents audio2 channel from working if audio1 channel is not
* connected to the FIFO.
*/
ess_set_xreg_bits(sc, 0xB7, 0x80);
#endif
return (0);
}
@ -1396,9 +1389,6 @@ ess_dma_input(addr, p, cc, intr, arg)
}
#endif
/* REVISIT: Hack to enable Audio1 FIFO connection to CODEC. */
ess_set_xreg_bits(sc, 0xB7, 0x80);
sc->sc_in.intr = intr;
sc->sc_in.arg = arg;
if (sc->sc_in.active)
@ -1408,6 +1398,10 @@ ess_dma_input(addr, p, cc, intr, arg)
sc->sc_in.active = 1;
/* REVISIT: Hack to enable Audio1 FIFO connection to CODEC. */
ess_set_xreg_bits(sc, ESS_XCMD_AUDIO1_CTRL1,
ESS_AUDIO1_CTRL1_FIFO_CONNECT);
if (IS16BITDRQ(sc->sc_out.drq))
cc >>= 1; /* use word count for 16 bit DMA */
/* Program transfer count registers with 2's complement of count. */

4
sys/dev/isa/essreg.h
View File

@ -32,7 +32,7 @@
*/
/*
** @(#) $RCSfile: essreg.h,v $ $Revision: 1.5 $ (SHARK) $Date: 1998/08/09 02:05:53 $
** @(#) $RCSfile: essreg.h,v $ $Revision: 1.6 $ (SHARK) $Date: 1998/08/09 02:54:50 $
**
**++
**
@ -125,7 +125,9 @@
#define ESS_DRQ_CTRL_EXT 0x40
#define ESS_XCMD_VOLIN_CTRL 0xB4 /* stereo input volume control */
#define ESS_XCMD_AUDIO1_CTRL1 0xB7 /* */
#define ESS_AUDIO1_CTRL1_FIFO_CONNECT 0x80 /* 1=connected */
#define ESS_AUDIO1_CTRL1_FIFO_SIGNED 0x20 /* 0=unsigned/1=signed */
#define ESS_AUDIO1_CTRL1_FIFO_STEREO 0x08 /* 0=mono/1=stereo */
#define ESS_AUDIO1_CTRL1_FIFO_SIZE 0x04 /* 0=8-bit/1=16-bit */
#define ESS_XCMD_AUDIO1_CTRL2 0xB8 /* */
#define ESS_AUDIO1_CTRL2_FIFO_ENABLE 0x01 /* 0=disable/1=enable */