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

Scale the drain timeout for allowing auto-initialize DMA to complete.

Browse Source
This commit is contained in:
kleink 2000-03-22 14:37:43 +00:00
parent 64a063e730
commit c8b75dd368
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
/* $NetBSD: eso.c,v 1.17 2000/01/18 04:48:47 cjs Exp $ */
/* $NetBSD: eso.c,v 1.18 2000/03/22 14:37:43 kleink Exp $ */
/*
* Copyright (c) 1999 Klaus J. Klein
* Copyright (c) 1999, 2000 Klaus J. Klein
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -823,7 +823,7 @@ eso_halt_output(hdl)
ESO_IO_A2DMAM_DMAENB);
sc->sc_pintr = NULL;
error = tsleep(&sc->sc_pintr, PCATCH | PWAIT, "esoho", hz);
error = tsleep(&sc->sc_pintr, PCATCH | PWAIT, "esoho", sc->sc_pdrain);
splx(s);
/* Shut down DMA completely. */
@ -851,7 +851,7 @@ eso_halt_input(hdl)
DMA37MD_WRITE | DMA37MD_DEMAND);
sc->sc_rintr = NULL;
error = tsleep(&sc->sc_rintr, PCATCH | PWAIT, "esohi", hz);
error = tsleep(&sc->sc_rintr, PCATCH | PWAIT, "esohi", sc->sc_rdrain);
splx(s);
/* Shut down DMA completely. */
@ -1662,6 +1662,11 @@ eso_trigger_output(hdl, start, end, blksize, intr, arg, param)
sc->sc_pintr = intr;
sc->sc_parg = arg;
/* Compute drain timeout. */
sc->sc_pdrain = (blksize * NBBY * hz) /
(param->sample_rate * param->channels *
param->precision * param->factor) + 2; /* slop */
/* DMA transfer count (in `words'!) reload using 2's complement. */
blksize = -(blksize >> 1);
eso_write_mixreg(sc, ESO_MIXREG_A2TCRLO, blksize & 0xff);
@ -1744,6 +1749,11 @@ eso_trigger_input(hdl, start, end, blksize, intr, arg, param)
sc->sc_rintr = intr;
sc->sc_rarg = arg;
/* Compute drain timeout. */
sc->sc_rdrain = (blksize * NBBY * hz) /
(param->sample_rate * param->channels *
param->precision * param->factor) + 2; /* slop */
/* Set up ADC DMA converter parameters. */
actl = eso_read_ctlreg(sc, ESO_CTLREG_ACTL);
if (param->channels == 2) {

8
sys/dev/pci/esovar.h
View File

@ -1,7 +1,7 @@
/* $NetBSD: esovar.h,v 1.3 1999/11/02 12:11:43 kleink Exp $ */
/* $NetBSD: esovar.h,v 1.4 2000/03/22 14:37:43 kleink Exp $ */
/*
* Copyright (c) 1999 Klaus J. Klein
* Copyright (c) 1999, 2000 Klaus J. Klein
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -123,6 +123,10 @@ struct eso_softc {
void (*sc_rintr) __P((void *));
void * sc_rarg;
/* Auto-initialize DMA transfer block drain timeouts, in ticks */
int sc_pdrain;
int sc_rdrain;
/* Audio 2 state */
uint8_t sc_a2c2; /* Audio 2 Control 2 */