patch-2.1.28 linux/drivers/sound/dev_table.c

• Lines: 92
• Date: Wed Feb 26 02:35:09 1997
• Orig file: v2.1.27/linux/drivers/sound/dev_table.c
• Orig date: Fri Nov 15 00:15:14 1996

diff -u --recursive --new-file v2.1.27/linux/drivers/sound/dev_table.c linux/drivers/sound/dev_table.c
@@ -4,7 +4,7 @@
  * Device call tables.
  */
 /*
- * Copyright (C) by Hannu Savolainen 1993-1996
+ * Copyright (C) by Hannu Savolainen 1993-1997
  *
  * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)
  * Version 2 (June 1991). See the "COPYING" file distributed with this software
@@ -131,6 +131,7 @@
   start_cards ();
 }
 
+
 void
 sound_unload_drivers (void)
 {
@@ -143,14 +144,19 @@
   if (trace_init)
     printk ("Sound unload started\n");
 
+
   for (i = 0; i < n && snd_installed_cards[i].card_type; i++)
     if (snd_installed_cards[i].enabled)
-      if ((drv = snd_find_driver (snd_installed_cards[i].card_type)) != -1)
-	if (sound_drivers[drv].unload)
+      {
+	if ((drv = snd_find_driver (snd_installed_cards[i].card_type)) != -1)
 	  {
-	    sound_drivers[drv].unload (&snd_installed_cards[i].config);
-	    snd_installed_cards[i].enabled = 0;
+	    if (sound_drivers[drv].unload)
+	      {
+		sound_drivers[drv].unload (&snd_installed_cards[i].config);
+		snd_installed_cards[i].enabled = 0;
+	      }
 	  }
+      }
 
   if (trace_init)
     printk ("Sound unload complete\n");
@@ -163,6 +169,7 @@
 
   unsigned long   flags;
 
+
   DEB (printk ("unload driver %d: ", type));
 
   for (i = 0; i < n && snd_installed_cards[i].card_type; i++)
@@ -450,11 +457,13 @@
 
 
   d = (struct audio_driver *) (sound_mem_blocks[sound_nblocks] = vmalloc (sizeof (struct audio_driver)));
+  sound_mem_sizes[sound_nblocks] = sizeof (struct audio_driver);
 
   if (sound_nblocks < 1024)
     sound_nblocks++;;
 
   op = (struct audio_operations *) (sound_mem_blocks[sound_nblocks] = vmalloc (sizeof (struct audio_operations)));
+  sound_mem_sizes[sound_nblocks] = sizeof (struct audio_operations);
 
   if (sound_nblocks < 1024)
     sound_nblocks++;;
@@ -480,8 +489,6 @@
   op->flags = flags;
   op->format_mask = format_mask;
   op->devc = devc;
-  op->dmachan1 = dma1;
-  op->dmachan2 = dma2;
 
 /*
  *    Hardcoded defaults
@@ -492,6 +499,11 @@
   num = num_audiodevs++;
 
   DMAbuf_init ();
+
+  op->dmap_out->dma = dma1;
+  op->dmap_in->dma = dma2;
+
+  DMAbuf_init ();
   audio_init_devices ();
   return num;
 #else
@@ -524,6 +536,7 @@
 
 
   op = (struct mixer_operations *) (sound_mem_blocks[sound_nblocks] = vmalloc (sizeof (struct mixer_operations)));
+  sound_mem_sizes[sound_nblocks] = sizeof (struct mixer_operations);
 
   if (sound_nblocks < 1024)
     sound_nblocks++;;