diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2004-05-10 19:52:23 -0400 |
---|---|---|
committer | David S. Miller <davem@nuts.davemloft.net> | 2004-05-10 19:52:23 -0400 |
commit | f3347c3de3a702cc4fc23595f34031a71677e7e0 (patch) | |
tree | 1d9bcc425a2b4598d84f87a2a507759bf429b723 /sound | |
parent | 168616367afb06b1398b9ef971fb80175ea4c683 (diff) | |
download | history-f3347c3de3a702cc4fc23595f34031a71677e7e0.tar.gz |
[sound/oss] remove bogus CIV_TO_LVI
This patch removes a pair of bogus LVI assignments. The explanation in
the comment is wrong because the value of PCIB tells the hardware that
the DMA buffer can be processed even if LVI == CIV.
Setting LVI to CIV + 1 causes overruns when with short writes
(something that vmware is very fond of).
Diffstat (limited to 'sound')
-rw-r--r-- | sound/oss/i810_audio.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sound/oss/i810_audio.c b/sound/oss/i810_audio.c index 33a0c331731d3f..d96a05d7546477 100644 --- a/sound/oss/i810_audio.c +++ b/sound/oss/i810_audio.c @@ -1079,25 +1079,15 @@ static void __i810_update_lvi(struct i810_state *state, int rec) else port += dmabuf->write_channel->port; - /* if we are currently stopped, then our CIV is actually set to our - * *last* sg segment and we are ready to wrap to the next. However, - * if we set our LVI to the last sg segment, then it won't wrap to - * the next sg segment, it won't even get a start. So, instead, when - * we are stopped, we set both the LVI value and also we increment - * the CIV value to the next sg segment to be played so that when - * we call start_{dac,adc}, things will operate properly - */ if (!dmabuf->enable && dmabuf->ready) { if(rec && dmabuf->count < dmabuf->dmasize && (dmabuf->trigger & PCM_ENABLE_INPUT)) { - CIV_TO_LVI(port, 1); __start_adc(state); while( !(inb(port + OFF_CR) & ((1<<4) | (1<<2))) ) ; } else if (!rec && dmabuf->count && (dmabuf->trigger & PCM_ENABLE_OUTPUT)) { - CIV_TO_LVI(port, 1); __start_dac(state); while( !(inb(port + OFF_CR) & ((1<<4) | (1<<2))) ) ; } |