system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-24 18:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added isa_dmadone() to fix the errors the sound driver has been complaining

Browse source 
about.

Update driver to use isa_dma_acquire() and isa_dma_release()
This commit is contained in:
Sujal Patel 1996-04-08 19:42:07 +00:00
parent 100f78bbe0
commit c755a8837c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=15149
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sys/i386/isa/sound/dmabuf.c
View file

@ -832,6 +832,10 @@ DMAbuf_outputintr (int dev, int event_type)
dmap->qhead = (dmap->qhead + 1) % dmap->nbufs; dmap->qhead = (dmap->qhead + 1) % dmap->nbufs;
dmap->flags &= ~DMA_ACTIVE; dmap->flags &= ~DMA_ACTIVE;
#ifdef __FreeBSD__
isa_dmadone(0, 0, 0, audio_devs[dev]->dmachan);
#endif
if (dmap->qlen) if (dmap->qlen)
{ {
audio_devs[dev]->output_block (dev, dmap->buf_phys[dmap->qhead], audio_devs[dev]->output_block (dev, dmap->buf_phys[dmap->qhead],
@ -872,6 +876,10 @@ DMAbuf_inputintr (int dev)
#if defined(SVR42) #if defined(SVR42)
snd_dma_intr (audio_devs[dev]->dmachan); snd_dma_intr (audio_devs[dev]->dmachan);
#endif /* SVR42 */ #endif /* SVR42 */
#ifdef __FreeBSD__
isa_dmadone(0, 0, 0, audio_devs[dev]->dmachan);
#endif
if (dmap->qlen == (dmap->nbufs - 1)) if (dmap->qlen == (dmap->nbufs - 1))
{ {
@ -920,7 +928,10 @@ DMAbuf_open_dma (int dev)
if (ALLOC_DMA_CHN (chan, audio_devs[dev]->name)) if (ALLOC_DMA_CHN (chan, audio_devs[dev]->name))
{ {
#if 0
/* Enough already! This error is reported twice elsewhere */
printk ("Unable to grab DMA%d for the audio driver\n", chan); printk ("Unable to grab DMA%d for the audio driver\n", chan);
#endif
return RET_ERROR (EBUSY); return RET_ERROR (EBUSY);
} }
@ -946,14 +957,6 @@ DMAbuf_close_dma (int dev)
void void
DMAbuf_reset_dma (int dev) DMAbuf_reset_dma (int dev)
{ {
int chan = audio_devs[dev]->dmachan;
#if 0
disable_dma (chan);
#endif
#ifdef __FreeBSD__
isa_dmadone_nobounce(chan);
#endif
} }
#ifdef ALLOW_SELECT #ifdef ALLOW_SELECT

4
sys/i386/isa/sound/os.h
View file

@ -307,8 +307,8 @@ extern unsigned long get_time(void);
* The rest of this file is not complete yet. The functions using these * The rest of this file is not complete yet. The functions using these
* macros will not work * macros will not work
*/ */
#define ALLOC_DMA_CHN(chn,deviceID) ({0; } ) #define ALLOC_DMA_CHN(chn,deviceID) (isa_dma_acquire(chn))
#define RELEASE_DMA_CHN(chn) ({ 0; }) #define RELEASE_DMA_CHN(chn) (isa_dma_release(chn))
#define DMA_MODE_READ 0 #define DMA_MODE_READ 0
#define DMA_MODE_WRITE 1 #define DMA_MODE_WRITE 1
#define RELEASE_IRQ(irq_no) #define RELEASE_IRQ(irq_no)