patch-1.3.69 linux/drivers/sound/soundcard.c

• Lines: 99
• Date: Fri Feb 23 15:16:56 1996
• Orig file: v1.3.68/linux/drivers/sound/soundcard.c
• Orig date: Wed Feb 14 14:37:16 1996

diff -u --recursive --new-file v1.3.68/linux/drivers/sound/soundcard.c linux/drivers/sound/soundcard.c
@@ -34,6 +34,7 @@
 #include <linux/major.h>
 
 static int      chrdev_registered = 0;
+static int      sound_major = SOUND_MAJOR;
 
 static int      is_unloading = 0;
 
@@ -143,6 +144,7 @@
 
   dev = inode_get_rdev (inode);
   dev = MINOR (dev);
+
   files[dev].flags = file_get_flags (file);
 
   sound_release_sw (dev, &files[dev]);
@@ -336,7 +338,7 @@
 soundcard_init (void)
 {
 #ifndef MODULE
-  module_register_chrdev (SOUND_MAJOR, "sound", &sound_fops);
+  module_register_chrdev (sound_major, "sound", &sound_fops);
   chrdev_registered = 1;
 #endif
 
@@ -345,7 +347,6 @@
   sndtable_init (0);		/* Initialize call tables and
 				   * detect cards */
 
-
   if (sndtable_get_cardcount () == 0)
     return;			/* No cards detected */
 
@@ -380,7 +381,7 @@
   for (i = 0; i < 31; i++)
     if (irqs & (1ul << i))
       {
-	printk ("Sound warning: IRQ%d was left allocated. Fixed.\n", i);
+	printk ("Sound warning: IRQ%d was left allocated - fixed.\n", i);
 	snd_release_irq (i);
       }
   irqs = 0;
@@ -419,7 +420,7 @@
   if (i)
     sound_setup ("sound=", ints);
 
-  err = module_register_chrdev (SOUND_MAJOR, "sound", &sound_fops);
+  err = module_register_chrdev (sound_major, "sound", &sound_fops);
   if (err)
     {
       printk ("sound: driver already loaded/included in kernel\n");
@@ -448,7 +449,7 @@
       int             i;
 
       if (chrdev_registered)
-	module_unregister_chrdev (SOUND_MAJOR, "sound");
+	module_unregister_chrdev (sound_major, "sound");
 
 #ifdef CONFIG_SEQUENCER
       sound_stop_timer ();
@@ -463,10 +464,9 @@
       for (i = 0; i < 8; i++)
 	if (dma_alloc_map[i] != DMA_MAP_UNAVAIL)
 	  {
-	    printk ("Sound: Hmm, DMA%d was left allocated\n", i);
+	    printk ("Sound: Hmm, DMA%d was left allocated - fixed\n", i);
 	    sound_free_dma (i);
 	  }
-
     }
 }
 #endif
@@ -627,7 +627,7 @@
   dmap->raw_buf = NULL;
 
   if (debugmem)
-    printk ("sound: buffsize%d %lu\n", dev, audio_devs[dev]->buffsize);
+    printk ("sound: buffsize[%d] = %lu\n", dev, audio_devs[dev]->buffsize);
 
   audio_devs[dev]->buffsize = dma_buffsize;
 
@@ -742,7 +742,7 @@
   printk ("<%s> at 0x%03x", name, hw_config->io_base);
 
   if (hw_config->irq)
-    printk (" irq %d", hw_config->irq);
+    printk (" irq %d", (hw_config->irq > 0) ? hw_config->irq : -hw_config->irq);
 
   if (hw_config->dma != -1 || hw_config->dma2 != -1)
     {
@@ -763,7 +763,7 @@
   printk ("<%s> at 0x%03x", name, base);
 
   if (irq)
-    printk (" irq %d", irq);
+    printk (" irq %d", (irq > 0) ? irq : -irq);
 
   if (dma != -1 || dma2 != -1)
     {