Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv10104/include
Modified Files:
emu10k1.h pcm_sgbuf.h
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: emu10k1.h
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/include/emu10k1.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- emu10k1.h 7 Jan 2003 10:36:29 -0000 1.20
+++ emu10k1.h 7 Jan 2003 10:46:57 -0000 1.21
@@ -25,12 +25,11 @@
#ifdef __KERNEL__
-#include "pcm.h"
-#include "pcm_sgbuf.h"
-#include "rawmidi.h"
-#include "hwdep.h"
-#include "ac97_codec.h"
-#include "util_mem.h"
+#include <sound/pcm.h>
+#include <sound/rawmidi.h>
+#include <sound/hwdep.h>
+#include <sound/ac97_codec.h>
+#include <sound/util_mem.h>
#include <asm/io.h>
#ifndef PCI_VENDOR_ID_CREATIVE
@@ -1038,7 +1037,7 @@
unsigned char snd_emu10k1_sum_vol_attn(unsigned int value);
/* memory allocation */
-snd_util_memblk_t *snd_emu10k1_alloc_pages(emu10k1_t *emu, struct snd_sg_buf *sgbuf);
+snd_util_memblk_t *snd_emu10k1_alloc_pages(emu10k1_t *emu, snd_pcm_substream_t
+*substream);
int snd_emu10k1_free_pages(emu10k1_t *emu, snd_util_memblk_t *blk);
snd_util_memblk_t *snd_emu10k1_synth_alloc(emu10k1_t *emu, unsigned int size);
int snd_emu10k1_synth_free(emu10k1_t *emu, snd_util_memblk_t *blk);
Index: pcm_sgbuf.h
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/include/pcm_sgbuf.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pcm_sgbuf.h 30 Oct 2002 14:21:16 -0000 1.3
+++ pcm_sgbuf.h 7 Jan 2003 10:46:57 -0000 1.4
@@ -63,5 +63,8 @@
int snd_pcm_sgbuf_ops_silence(snd_pcm_substream_t *substream, int channel,
snd_pcm_uframes_t hwoff, snd_pcm_uframes_t count);
struct page *snd_pcm_sgbuf_ops_page(snd_pcm_substream_t *substream, unsigned long
offset);
+#define _snd_pcm_substream_sgbuf(substream) ((substream)->dma_private)
+#define snd_pcm_substream_sgbuf(substream) snd_magic_cast(snd_pcm_sgbuf_t,
+_snd_pcm_substream_sgbuf(substream), return -ENXIO)
+
#endif /* __SOUND_PCM_SGBUF_H */
-------------------------------------------------------
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
