Update of /cvsroot/alsa/alsa-kernel/parisc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29808/parisc
Modified Files:
harmony.c
Log Message:
fixed for the new DMA buffer handler.
Index: harmony.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/parisc/harmony.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- harmony.c 1 Dec 2003 10:30:45 -0000 1.3
+++ harmony.c 6 Mar 2004 17:24:24 -0000 1.4
@@ -205,6 +205,7 @@
unsigned char *silence_addr;
dma_addr_t silence_dma;
int silence_count;
+ struct snd_dma_device dma_dev;
/* alsa stuff */
snd_card_t *card;
@@ -844,22 +845,27 @@
harmony->pcm = pcm;
/* initialize graveyard buffer */
- harmony->graveyard_addr = snd_malloc_pci_pages(harmony->fake_pci_dev,
+ harmony->dma_dev.type = SNDRV_DMA_TYPE_PCI;
+ harmony->dma_dev.dev = snd_dma_pci_data(harmony->fake_pci_dev);
+ harmony->graveyard_addr = snd_dma_alloc_pages(&chip->dma_dev,
HARMONY_BUF_SIZE*GRAVEYARD_BUFS, &harmony->graveyard_dma);
harmony->graveyard_count = 0;
/* initialize silence buffers */
- harmony->silence_addr = snd_malloc_pci_pages(harmony->fake_pci_dev,
+ harmony->silence_addr = snd_dma_alloc_pages(&chip->dma_dev,
HARMONY_BUF_SIZE*SILENCE_BUFS, &harmony->silence_dma);
harmony->silence_count = 0;
-
harmony->ply_stopped = harmony->cap_stopped = 1;
harmony->playback_substream = NULL;
harmony->capture_substream = NULL;
harmony->graveyard_count = 0;
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+ snd_dma_pci_data(harmony->fake_pci_dev),
+ 64 * 1024, 128 * 1024);
+
return 0;
}
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
