Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv13006

Modified Files:
        es1968.c 
Log Message:
removed buggy copy callback.
the standard copy routine works properly.



Index: es1968.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/es1968.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- es1968.c    5 Aug 2003 12:45:12 -0000       1.47
+++ es1968.c    6 Aug 2003 17:44:50 -0000       1.48
@@ -1642,28 +1642,6 @@
        return 0;
 }
 
-static int snd_es1968_capture_copy(snd_pcm_substream_t *substream,
-                                  int channel, snd_pcm_uframes_t pos,
-                                  void *buf, snd_pcm_uframes_t count)
-{
-       //es1968_t *chip = snd_pcm_substream_chip(substream);
-       snd_pcm_runtime_t *runtime = substream->runtime;
-       esschan_t *es = snd_magic_cast(esschan_t, runtime->private_data, return 
-ENXIO);
-       char *src = runtime->dma_area;
-
-       if (runtime->channels == 1)
-               return copy_to_user(buf, src + pos, count) ? -EFAULT : 0;
-       else {
-               count /= 2;
-               pos /= 2;
-               if (copy_to_user(buf, src + pos, count))
-                       return -EFAULT;
-               if (copy_to_user(buf + count, src + pos + es->dma_size/2, count))
-                       return -EFAULT;
-               return 0;
-       }
-}
-
 static int snd_es1968_capture_open(snd_pcm_substream_t *substream)
 {
        snd_pcm_runtime_t *runtime = substream->runtime;
@@ -1778,7 +1756,6 @@
        .prepare =      snd_es1968_pcm_prepare,
        .trigger =      snd_es1968_pcm_trigger,
        .pointer =      snd_es1968_pcm_pointer,
-       .copy =         snd_es1968_capture_copy,
 };
 
 



-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

Reply via email to