patch-2.0.1 linux/drivers/sound/sb_card.c

• Lines: 64
• Date: Sun Jun 30 11:44:12 1996
• Orig file: v2.0.0/linux/drivers/sound/sb_card.c
• Orig date: Sun Mar 24 22:50:18 1996

diff -u --recursive --new-file v2.0.0/linux/drivers/sound/sb_card.c linux/drivers/sound/sb_card.c
@@ -4,27 +4,11 @@
  * Detection routine for the SoundBlaster cards.
  */
 /*
- * Copyright by Hannu Savolainen 1993-1996
+ * Copyright (C) by Hannu Savolainen 1993-1996
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer. 2.
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * USS/Lite for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)
+ * Version 2 (June 1991). See the "COPYING" file distributed with this software
+ * for more info.
  */
 #include <linux/config.h>
 
@@ -33,19 +17,15 @@
 
 #if defined(CONFIG_SB)
 
+#include "sb_mixer.h"
 #include "sb.h"
 
-long
-attach_sb_card (long mem_start, struct address_info *hw_config)
+void
+attach_sb_card (struct address_info *hw_config)
 {
 #if defined(CONFIG_AUDIO) || defined(CONFIG_MIDI)
-  if (!sb_dsp_detect (hw_config))
-    return mem_start;
-  mem_start = sb_dsp_init (mem_start, hw_config);
-  request_region (hw_config->io_base, 16, "SoundBlaster");
+  sb_dsp_init (hw_config);
 #endif
-
-  return mem_start;
 }
 
 int
@@ -64,7 +44,6 @@
 void
 unload_sb (struct address_info *hw_config)
 {
-  release_region (hw_config->io_base, 16);
   sb_dsp_unload (hw_config);
 }