Update of /cvsroot/linux-mips/linux/drivers/sound
In directory usw-pr-cvs1:/tmp/cvs-serv24086/drivers/sound
Modified Files:
au1000.c
Log Message:
Renamed the Au1000 dma functions to not collide with kernel/dma.c.
Also, /proc/dma will show the output from kernel/dma.c:get_dma_list(),
not the Au1000 dma list. To fix requires a change to fs/proc/proc_misc.c.
Index: au1000.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/sound/au1000.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** au1000.c 2001/08/17 22:53:26 1.1
--- au1000.c 2001/08/23 17:10:44 1.2
***************
*** 500,504 ****
#ifdef AU1000_VERBOSE_DEBUG
! dump_dma_channel(db->dmanr);
#endif
--- 500,504 ----
#ifdef AU1000_VERBOSE_DEBUG
! dump_au1000_dma_channel(db->dmanr);
#endif
***************
*** 537,541 ****
#ifdef AU1000_VERBOSE_DEBUG
! dump_dma_channel(db->dmanr);
#endif
--- 537,541 ----
#ifdef AU1000_VERBOSE_DEBUG
! dump_au1000_dma_channel(db->dmanr);
#endif
***************
*** 1889,1897 ****
// Allocate the DMA Channels
! if ((s->dma_dac.dmanr = request_dma(DMA_ID_AC97C_TX, "audio DAC")) < 0) {
err("Can't get DAC DMA");
goto err_dma1;
}
! if ((s->dma_adc.dmanr = request_dma(DMA_ID_AC97C_RX, "audio ADC")) < 0) {
err("Can't get ADC DMA");
goto err_dma2;
--- 1889,1899 ----
// Allocate the DMA Channels
! if ((s->dma_dac.dmanr = request_au1000_dma(DMA_ID_AC97C_TX,
! "audio DAC")) < 0) {
err("Can't get DAC DMA");
goto err_dma1;
}
! if ((s->dma_adc.dmanr = request_au1000_dma(DMA_ID_AC97C_RX,
! "audio ADC")) < 0) {
err("Can't get ADC DMA");
goto err_dma2;
***************
*** 1991,1997 ****
unregister_sound_dsp(s->dev_audio);
err_dev1:
! free_dma(s->dma_adc.dmanr);
err_dma2:
! free_dma(s->dma_dac.dmanr);
err_dma1:
free_irq(s->dma_adc.irq, s);
--- 1993,1999 ----
unregister_sound_dsp(s->dev_audio);
err_dev1:
! free_au1000_dma(s->dma_adc.dmanr);
err_dma2:
! free_au1000_dma(s->dma_dac.dmanr);
err_dma1:
free_irq(s->dma_adc.irq, s);
***************
*** 2016,2021 ****
free_irq(s->dma_adc.irq, s);
free_irq(s->dma_dac.irq, s);
! free_dma(s->dma_adc.dmanr);
! free_dma(s->dma_dac.dmanr);
release_region(virt_to_phys((void*)AC97C_CONFIG), 0x14);
unregister_sound_dsp(s->dev_audio);
--- 2018,2023 ----
free_irq(s->dma_adc.irq, s);
free_irq(s->dma_dac.irq, s);
! free_au1000_dma(s->dma_adc.dmanr);
! free_au1000_dma(s->dma_dac.dmanr);
release_region(virt_to_phys((void*)AC97C_CONFIG), 0x14);
unregister_sound_dsp(s->dev_audio);
|
