patch-1.3.78 linux/drivers/sound/dmabuf.c

• Lines: 81
• Date: Sun Mar 24 22:49:59 1996
• Orig file: v1.3.77/linux/drivers/sound/dmabuf.c
• Orig date: Fri Mar 15 16:03:17 1996

diff -u --recursive --new-file v1.3.77/linux/drivers/sound/dmabuf.c linux/drivers/sound/dmabuf.c
@@ -360,6 +360,8 @@
       save_flags (flags);
       cli ();
 
+      audio_devs[dev]->flags |= DMA_SYNCING;
+
       audio_devs[dev]->dmap_out->underrun_count = 0;
       while (!current_got_fatal_signal ()
 	     && audio_devs[dev]->dmap_out->qlen
@@ -384,10 +386,12 @@
 	  };
 	  if ((out_sleep_flag[dev].mode & WK_TIMEOUT))
 	    {
+	      audio_devs[dev]->flags &= ~DMA_SYNCING;
 	      restore_flags (flags);
 	      return audio_devs[dev]->dmap_out->qlen;
 	    }
 	}
+      audio_devs[dev]->flags &= ~DMA_SYNCING;
       restore_flags (flags);
 
       /*
@@ -1023,6 +1027,8 @@
   int             abort, err = EIO;
   struct dma_buffparms *dmap = audio_devs[dev]->dmap_out;
 
+  dmap->flags &= ~DMA_CLEAN;
+
   if (audio_devs[dev]->dmap_out->mapping_flags & DMA_MAP_MAPPED)
     {
       printk ("Sound: Can't write to mmapped device (3)\n");
@@ -1165,6 +1171,7 @@
   struct dma_buffparms *dmap = audio_devs[dev]->dmap_out;
 
   dmap->cfrag = -1;
+
 /*
  * Bypass buffering if using mmaped access
  */
@@ -1401,7 +1408,8 @@
 	{
 	  dmap->underrun_count++;
 
-	  if (dmap->underrun_count > 5 || dmap->flags & DMA_EMPTY)
+	  if (!(dmap->flags & DMA_CLEAN) &&
+	      (audio_devs[dev]->flags & DMA_SYNCING || dmap->underrun_count > 5 || dmap->flags & DMA_EMPTY))
 	    {
 	      dmap->qlen = 0;
 	      force_restart (dev, dmap);
@@ -1624,6 +1632,7 @@
 
 	  save_flags (flags);
 	  cli ();
+
 	  in_sleep_flag[dev].mode = WK_SLEEP;
 	  module_select_wait (&in_sleeper[dev], wait);
 	  restore_flags (flags);
@@ -1650,6 +1659,7 @@
 	{
 	  save_flags (flags);
 	  cli ();
+
 	  in_sleep_flag[dev].mode = WK_SLEEP;
 	  module_select_wait (&in_sleeper[dev], wait);
 	  restore_flags (flags);
@@ -1668,6 +1678,7 @@
 
 	  save_flags (flags);
 	  cli ();
+
 	  out_sleep_flag[dev].mode = WK_SLEEP;
 	  module_select_wait (&out_sleeper[dev], wait);
 	  restore_flags (flags);
@@ -1688,6 +1699,7 @@
 	{
 	  save_flags (flags);
 	  cli ();
+
 	  out_sleep_flag[dev].mode = WK_SLEEP;
 	  module_select_wait (&out_sleeper[dev], wait);
 	  restore_flags (flags);