Update of /cvsroot/alsa/alsa-kernel/pci/emu10k1
In directory sc8-pr-cvs1:/tmp/cvs-serv10104/pci/emu10k1
Modified Files:
emupcm.c memory.c
Log Message:
[PATCH: sgbuf-cast-fix.dif]
- added the cast macros for sgbuf.
- use the macro in emu10k1.
- use the standard inclusion of header files in emu10k1.h.
Index: emupcm.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emupcm.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- emupcm.c 15 Aug 2002 12:13:09 -0000 1.15
+++ emupcm.c 7 Jan 2003 10:46:57 -0000 1.16
@@ -365,7 +365,7 @@
snd_util_memblk_t *memblk;
if (epcm->memblk != NULL)
snd_emu10k1_free_pages(emu, epcm->memblk);
- memblk = snd_emu10k1_alloc_pages(emu, (struct snd_sg_buf
*)substream->dma_private);
+ memblk = snd_emu10k1_alloc_pages(emu, substream);
if ((epcm->memblk = memblk) == NULL || ((emu10k1_memblk_t
*)memblk)->mapped_page < 0) {
epcm->start_addr = 0;
return -ENOMEM;
Index: memory.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/memory.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- memory.c 12 Aug 2002 08:43:47 -0000 1.7
+++ memory.c 7 Jan 2003 10:46:57 -0000 1.8
@@ -25,6 +25,7 @@
#include <linux/time.h>
#include <sound/core.h>
#include <sound/emu10k1.h>
+#include <sound/pcm_sgbuf.h>
/* page arguments of these two macros are Emu page (4096 bytes), not like
* aligned pages in others
@@ -288,8 +289,9 @@
* page allocation for DMA
*/
snd_util_memblk_t *
-snd_emu10k1_alloc_pages(emu10k1_t *emu, struct snd_sg_buf *sgbuf)
+snd_emu10k1_alloc_pages(emu10k1_t *emu, snd_pcm_substream_t *substream)
{
+ struct snd_sg_buf *sgbuf = snd_magic_cast(snd_pcm_sgbuf_t,
+_snd_pcm_substream_sgbuf(substream), return NULL);
snd_util_memhdr_t *hdr;
emu10k1_memblk_t *blk;
int page, err, idx;
-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
