Changeset 92 for GPL/branches/alsa-resync1/alsa-kernel/isa/sgalaxy.c

Timestamp:

May 2, 2007, 9:13:43 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged 0.9.0beta6 to 0.9.0beta12. Fixed a few compilation errors.
Left include/sound/driver.h at beta9 until I figure out why it contains
so many modifications to sections that were removed in beta10.
Does not yet build. Needs more fixing.
Added a few new files that were in the copy Paul gave me to work from.

File:

• GPL/branches/alsa-resync1/alsa-kernel/isa/sgalaxy.c (modified) (6 diffs)

GPL/branches/alsa-resync1/alsa-kernel/isa/sgalaxy.c

@@ -18 +18 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/dma.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/time.h>
+#include <sound/core.h>
 #include <sound/sb.h>
 #include <sound/ad1848.h>
@@ -32 +36 @@
 
 EXPORT_NO_SYMBOLS;
+
+MODULE_AUTHOR("Christopher Butler <chrisb@sandy.force9.co.uk>");
 MODULE_DESCRIPTION("Aztech Sound Galaxy");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{Aztech Systems,Sound Galaxy}}");
@@ -117 +124 @@
         if ((tmp = inb(port + 3)) == 0xff)
         {
-                snd_printdd("I/O address dead (0x%lx)\n", tmp);
+                snd_printdd("I/O address dead (0x%lx)\n", port);
                 return 0;
         }
@@ -299 +306 @@
         if (!cards) {
 #ifdef MODULE
-                snd_printk("Sound Galaxy soundcard not found or device busy\n");
+                printk(KERN_ERR "Sound Galaxy soundcard not found or device busy\n");
 #endif
                 return -ENODEV;
@@ -320 +327 @@
 #ifndef MODULE
 
-/* format is: snd-card-sgalaxy=snd_enable,snd_index,snd_id,
+/* format is: snd-sgalaxy=snd_enable,snd_index,snd_id,
                                snd_sbport,snd_wssport,
                                snd_irq,snd_dma1 */
@@ -341 +348 @@
 }
 
-__setup("snd-card-sgalaxy=", alsa_card_sgalaxy_setup);
+__setup("snd-sgalaxy=", alsa_card_sgalaxy_setup);
 
 #endif /* ifndef MODULE */