patch-1.3.58 linux/drivers/sound/maui.c

• Lines: 47
• Date: Tue Jan 9 00:37:21 1996
• Orig file: v1.3.57/linux/drivers/sound/maui.c
• Orig date: Wed Nov 8 07:11:36 1995

diff -u --recursive --new-file v1.3.57/linux/drivers/sound/maui.c linux/drivers/sound/maui.c
@@ -32,7 +32,7 @@
 
 #include "sound_config.h"
 
-#if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_MAUI)
+#if defined(CONFIG_MAUI)
 
 static int      maui_base = 0x330;
 
@@ -191,13 +191,16 @@
       return 0;
     }
 
-  printk ("WaveFront hardware version %d.%d\n", tmp1, tmp2);
+  if (trace_init)
+    printk ("WaveFront hardware version %d.%d\n", tmp1, tmp2);
 
   if (!maui_write (0x9F))	/* Report firmware version */
     return 0;
   if ((tmp1 = maui_read ()) == -1 || (tmp2 = maui_read ()) == -1)
     return 0;
-  printk ("WaveFront firmware version %d.%d\n", tmp1, tmp2);
+
+  if (trace_init)
+    printk ("WaveFront firmware version %d.%d\n", tmp1, tmp2);
 
   if (!maui_write (0x85))	/* Report free DRAM */
     return 0;
@@ -206,7 +209,8 @@
     {
       tmp1 |= maui_read () << (7 * i);
     }
-  printk ("Available DRAM %dk\n", tmp1 / 1024);
+  if (trace_init)
+    printk ("Available DRAM %dk\n", tmp1 / 1024);
 
   request_region (hw_config->io_base + 2, 6, "Maui");
 
@@ -222,7 +226,7 @@
 {
   int             this_dev = num_midis;
 
-  printk (" <Maui>");
+  conf_printf ("Maui", hw_config);
 
   hw_config->irq *= -1;
   mem_start = attach_mpu401 (mem_start, hw_config);