We don't have DMA automode, so correct all places to work without

it too.
This commit is contained in:
ache 1994-04-23 22:54:31 +00:00
parent 7745e6da4c
commit 8f71b3e562
4 changed files with 10 additions and 4 deletions

View File

@ -3316,7 +3316,7 @@ gus_wave_init (long mem_start, int irq, int dma)
{
dsp_devs[gus_devnum = num_dspdevs++] = &gus_sampling_operations;
sound_dsp_dmachan[gus_devnum] = dma;
sound_buffcounts[gus_devnum] = 1;
sound_buffcounts[gus_devnum] = DSP_BUFFCOUNT;
sound_buffsizes[gus_devnum] = DSP_BUFFSIZE;
sound_dma_automode[gus_devnum] = 0;
}

View File

@ -6,6 +6,7 @@
#endif
#define DSP_BUFFSIZE 65536
#define NO_AUTODMA /* still */
#define SELECTED_SOUND_OPTIONS 0xffffffff
#define SOUND_VERSION_STRING "2.5"
#define SOUND_CONFIG_DATE "Sat Apr 23 07:45:17 MSD 1994"

View File

@ -366,7 +366,7 @@ pas_pcm_init (long mem_start, struct address_info *hw_config)
{
dsp_devs[my_devnum = num_dspdevs++] = &pas_pcm_operations;
sound_dsp_dmachan[my_devnum] = hw_config->dma;
#ifndef PAS_NO_AUTODMA
#ifndef NO_AUTODMA
if (hw_config->dma > 3)
{
sound_buffcounts[my_devnum] = 1;
@ -380,7 +380,7 @@ pas_pcm_init (long mem_start, struct address_info *hw_config)
sound_dma_automode[my_devnum] = 1;
}
#else
sound_buffcounts[my_devnum] = 2;
sound_buffcounts[my_devnum] = DSP_BUFFCOUNT;
sound_buffsizes[my_devnum] = DSP_BUFFSIZE;
sound_dma_automode[my_devnum] = 0;
#endif

View File

@ -541,9 +541,14 @@ sb16_dsp_init (long mem_start, struct address_info *hw_config)
{
dsp_devs[my_dev = num_dspdevs++] = &sb16_dsp_operations;
sound_dsp_dmachan[my_dev] = hw_config->dma;
#ifndef NO_AUTODMA
sound_buffcounts[my_dev] = 1;
sound_buffsizes[my_dev] = DSP_BUFFSIZE;
sound_dma_automode[my_dev] = 1;
#else
sound_buffcounts[my_dev] = DSP_BUFFCOUNT;
sound_dma_automode[my_dev] = 0;
#endif
sound_buffsizes[my_dev] = DSP_BUFFSIZE;
}
else
printk ("SB: Too many DSP devices available\n");