Merge with Linux 2.1.67.

1 files changed, 184 insertions, 122 deletions

diff --git a/drivers/sound/gus_card.c b/drivers/sound/gus_card.c
index 1c8881684..eba6072d6 100644
--- a/drivers/sound/gus_card.c
+++ b/drivers/sound/gus_card.c
@@ -11,159 +11,154 @@
  * for more info.
  */
 #include <linux/config.h>
-
+#include <linux/module.h>
 
 #include "sound_config.h"
+#include "soundmodule.h"
 
-#if defined(CONFIG_GUSHW)
+#if defined(CONFIG_GUSHW) || defined(MODULE)
 
 #include "gus_hw.h"
 
-void            gusintr (int irq, void *dev_id, struct pt_regs *dummy);
+void            gusintr(int irq, void *dev_id, struct pt_regs *dummy);
 
-int             gus_base, gus_irq, gus_dma;
+int             gus_base = 0, gus_irq = 0, gus_dma = 0;
 extern int      gus_wave_volume;
 extern int      gus_pcm_volume;
 extern int      have_gus_max;
 int             gus_pnp_flag = 0;
 
 void
-attach_gus_card (struct address_info *hw_config)
+attach_gus_card(struct address_info *hw_config)
 {
-  snd_set_irq_handler (hw_config->irq, gusintr, "Gravis Ultrasound", hw_config->osp);
+	snd_set_irq_handler(hw_config->irq, gusintr, "Gravis Ultrasound", hw_config->osp);
 
-  gus_wave_init (hw_config);
+	gus_wave_init(hw_config);
 
-  request_region (hw_config->io_base, 16, "GUS");
-  request_region (hw_config->io_base + 0x100, 12, "GUS");	/* 0x10c-> is MAX */
+	request_region(hw_config->io_base, 16, "GUS");
+	request_region(hw_config->io_base + 0x100, 12, "GUS");	/* 0x10c-> is MAX */
 
-  if (sound_alloc_dma (hw_config->dma, "GUS"))
-    printk ("gus_card.c: Can't allocate DMA channel\n");
-  if (hw_config->dma2 != -1 && hw_config->dma2 != hw_config->dma)
-    if (sound_alloc_dma (hw_config->dma2, "GUS(2)"))
-      printk ("gus_card.c: Can't allocate DMA channel2\n");
-#ifdef CONFIG_MIDI
-  gus_midi_init ();
+	if (sound_alloc_dma(hw_config->dma, "GUS"))
+		printk("gus_card.c: Can't allocate DMA channel\n");
+	if (hw_config->dma2 != -1 && hw_config->dma2 != hw_config->dma)
+		if (sound_alloc_dma(hw_config->dma2, "GUS(2)"))
+			printk("gus_card.c: Can't allocate DMA channel 2\n");
+#if defined(CONFIG_MIDI)
+	gus_midi_init(hw_config);
 #endif
 }
 
 int
-probe_gus (struct address_info *hw_config)
+probe_gus(struct address_info *hw_config)
 {
-  int             irq;
-  int             io_addr;
-
-  if (hw_config->card_subtype == 1)
-    gus_pnp_flag = 1;
-
-  irq = hw_config->irq;
-
-  if (hw_config->card_subtype == 0)	/* GUS/MAX/ACE */
-    if (irq != 3 && irq != 5 && irq != 7 && irq != 9 &&
-	irq != 11 && irq != 12 && irq != 15)
-      {
-	printk ("GUS: Unsupported IRQ %d\n", irq);
-	return 0;
-      }
-
-  if (check_region (hw_config->io_base, 16))
-    printk ("GUS: I/O range conflict (1)\n");
-  else if (check_region (hw_config->io_base + 0x100, 16))
-    printk ("GUS: I/O range conflict (2)\n");
-  else if (gus_wave_detect (hw_config->io_base))
-    return 1;
+	int             irq;
+	int             io_addr;
+
+	if (hw_config->card_subtype == 1)
+		gus_pnp_flag = 1;
+
+	irq = hw_config->irq;
+
+	if (hw_config->card_subtype == 0)	/* GUS/MAX/ACE */
+		if (irq != 3 && irq != 5 && irq != 7 && irq != 9 &&
+		    irq != 11 && irq != 12 && irq != 15)
+		  {
+			  printk("GUS: Unsupported IRQ %d\n", irq);
+			  return 0;
+		  }
+	if (check_region(hw_config->io_base, 16))
+		printk("GUS: I/O range conflict (1)\n");
+	else if (check_region(hw_config->io_base + 0x100, 16))
+		printk("GUS: I/O range conflict (2)\n");
+	else if (gus_wave_detect(hw_config->io_base))
+		return 1;
 
 #ifndef EXCLUDE_GUS_IODETECT
 
-  /*
-   * Look at the possible base addresses (0x2X0, X=1, 2, 3, 4, 5, 6)
-   */
-
-  for (io_addr = 0x210; io_addr <= 0x260; io_addr += 0x10)
-    if (io_addr != hw_config->io_base)	/*
-					 * Already tested
-					 */
-      if (!check_region (io_addr, 16))
-	if (!check_region (io_addr + 0x100, 16))
-	  if (gus_wave_detect (io_addr))
-	    {
-	      hw_config->io_base = io_addr;
-	      return 1;
-	    }
-
+	/*
+	 * Look at the possible base addresses (0x2X0, X=1, 2, 3, 4, 5, 6)
+	 */
+
+	for (io_addr = 0x210; io_addr <= 0x260; io_addr += 0x10)
+		if (io_addr != hw_config->io_base)	/*
+							 * Already tested
+							 */
+			if (!check_region(io_addr, 16))
+				if (!check_region(io_addr + 0x100, 16))
+					if (gus_wave_detect(io_addr))
+					  {
+						  hw_config->io_base = io_addr;
+						  return 1;
+					  }
 #endif
 
-  return 0;
+	return 0;
 }
 
 void
-unload_gus (struct address_info *hw_config)
+unload_gus(struct address_info *hw_config)
 {
-  DDB (printk ("unload_gus(%x)\n", hw_config->io_base));
+	DDB(printk("unload_gus(%x)\n", hw_config->io_base));
 
-  gus_wave_unload ();
+	gus_wave_unload(hw_config);
 
-  release_region (hw_config->io_base, 16);
-  release_region (hw_config->io_base + 0x100, 12);	/* 0x10c-> is MAX */
-  snd_release_irq (hw_config->irq);
+	release_region(hw_config->io_base, 16);
+	release_region(hw_config->io_base + 0x100, 12);		/* 0x10c-> is MAX */
+	snd_release_irq(hw_config->irq);
 
-  sound_free_dma (hw_config->dma);
+	sound_free_dma(hw_config->dma);
 
-  if (hw_config->dma2 != -1 && hw_config->dma2 != hw_config->dma)
-    sound_free_dma (hw_config->dma2);
+	if (hw_config->dma2 != -1 && hw_config->dma2 != hw_config->dma)
+		sound_free_dma(hw_config->dma2);
 }
 
 void
-gusintr (int irq, void *dev_id, struct pt_regs *dummy)
+gusintr(int irq, void *dev_id, struct pt_regs *dummy)
 {
-  unsigned char   src;
-  extern int      gus_timer_enabled;
+	unsigned char   src;
+	extern int      gus_timer_enabled;
 
-  sti ();
+	sti();
 
 #ifdef CONFIG_GUSMAX
-  if (have_gus_max)
-    adintr (irq, NULL, NULL);
+	if (have_gus_max)
+		adintr(irq, NULL, NULL);
 #endif
 
-  while (1)
-    {
-      if (!(src = inb (u_IrqStatus)))
-	return;
-
-      if (src & DMA_TC_IRQ)
-	{
-	  guswave_dma_irq ();
-	}
-
-      if (src & (MIDI_TX_IRQ | MIDI_RX_IRQ))
-	{
-#ifdef CONFIG_MIDI
-	  gus_midi_interrupt (0);
+	while (1)
+	  {
+		  if (!(src = inb(u_IrqStatus)))
+			  return;
+
+		  if (src & DMA_TC_IRQ)
+		    {
+			    guswave_dma_irq();
+		    }
+		  if (src & (MIDI_TX_IRQ | MIDI_RX_IRQ))
+		    {
+#if defined(CONFIG_MIDI)
+			    gus_midi_interrupt(0);
 #endif
-	}
-
-      if (src & (GF1_TIMER1_IRQ | GF1_TIMER2_IRQ))
-	{
-#ifdef CONFIG_SEQUENCER
-	  if (gus_timer_enabled)
-	    {
-	      sound_timer_interrupt ();
-	    }
-
-	  gus_write8 (0x45, 0);	/* Ack IRQ */
-	  gus_timer_command (4, 0x80);	/* Reset IRQ flags */
+		    }
+		  if (src & (GF1_TIMER1_IRQ | GF1_TIMER2_IRQ))
+		    {
+#if defined(CONFIG_SEQUENCER) || defined(CONFIG_SEQUENCER_MODULE)
+			    if (gus_timer_enabled)
+			      {
+				      sound_timer_interrupt();
+			      }
+			    gus_write8(0x45, 0);	/* Ack IRQ */
+			    gus_timer_command(4, 0x80);		/* Reset IRQ flags */
 
 #else
-	  gus_write8 (0x45, 0);	/* Stop timers */
+			    gus_write8(0x45, 0);	/* Stop timers */
 #endif
-	}
-
-      if (src & (WAVETABLE_IRQ | ENVELOPE_IRQ))
-	{
-	  gus_voice_irq ();
-	}
-    }
+		    }
+		  if (src & (WAVETABLE_IRQ | ENVELOPE_IRQ))
+		    {
+			    gus_voice_irq();
+		    }
+	  }
 }
 
 #endif
@@ -171,36 +166,103 @@ gusintr (int irq, void *dev_id, struct pt_regs *dummy)
 /*
  * Some extra code for the 16 bit sampling option
  */
-#if defined(CONFIG_GUS16)
+#ifdef CONFIG_GUS16
 
 int
-probe_gus_db16 (struct address_info *hw_config)
+probe_gus_db16(struct address_info *hw_config)
 {
-  return ad1848_detect (hw_config->io_base, NULL, hw_config->osp);
+	return ad1848_detect(hw_config->io_base, NULL, hw_config->osp);
 }
 
 void
-attach_gus_db16 (struct address_info *hw_config)
+attach_gus_db16(struct address_info *hw_config)
 {
-#ifdef CONFIG_GUSHW
-  gus_pcm_volume = 100;
-  gus_wave_volume = 90;
+#if defined(CONFIG_GUSHW) || defined(MODULE)
+	gus_pcm_volume = 100;
+	gus_wave_volume = 90;
 #endif
 
-  ad1848_init ("GUS 16 bit sampling", hw_config->io_base,
-	       hw_config->irq,
-	       hw_config->dma,
-	       hw_config->dma, 0,
-	       hw_config->osp);
+	hw_config->slots[3] = ad1848_init("GUS 16 bit sampling", hw_config->io_base,
+					  hw_config->irq,
+					  hw_config->dma,
+					  hw_config->dma, 0,
+					  hw_config->osp);
 }
 
 void
-unload_gus_db16 (struct address_info *hw_config)
+unload_gus_db16(struct address_info *hw_config)
+{
+
+	ad1848_unload(hw_config->io_base,
+		      hw_config->irq,
+		      hw_config->dma,
+		      hw_config->dma, 0);
+	sound_unload_audiodev(hw_config->slots[3]);
+}
+#endif
+
+#ifdef MODULE
+
+static struct address_info config;
+
+/*
+ *    Note DMA2 of -1 has the right meaning in the GUS driver as well
+ *      as here. 
+ */
+
+int             io = -1;
+int             irq = -1;
+int             dma = -1;
+int             dma16 = -1;	/* Set this for modules that need it */
+int             type = 0;	/* 1 for PnP */
+int             gus16 = 0;
+static int      db16 = 0;	/* Has a Gus16 AD1848 on it */
+
+MODULE_PARM(io, "i");
+MODULE_PARM(irq, "i");
+MODULE_PARM(dma, "i");
+MODULE_PARM(dma16, "i");
+MODULE_PARM(type, "i");
+MODULE_PARM(gus16, "i");
+MODULE_PARM(db16, "i");
+
+int
+init_module(void)
 {
+	printk("Gravis Ultrasound audio driver Copyright (C) by Hannu Savolainen 1993-1996\n");
+
+	if (io == -1 || dma == -1 || irq == -1)
+	  {
+		  printk("I/O, IRQ, and DMA are mandatory\n");
+		  return -EINVAL;
+	  }
+	config.io_base = io;
+	config.irq = irq;
+	config.dma = dma;
+	config.dma2 = dma16;
+	config.card_subtype = type;
 
-  ad1848_unload (hw_config->io_base,
-		 hw_config->irq,
-		 hw_config->dma,
-		 hw_config->dma, 0);
+#if defined(CONFIG_GUS16)
+	if (probe_gus_db16(&config) && gus16)
+	  {
+		  attach_gus_db16(&config);
+		  db16 = 1;
+	  }
+#endif
+	if (probe_gus(&config) == 0)
+		return -ENODEV;
+	attach_gus_card(&config);
+	SOUND_LOCK;
+	return 0;
+}
+
+void
+cleanup_module(void)
+{
+	if (db16)
+		unload_gus_db16(&config);
+	unload_gus(&config);
+	SOUND_LOCK_END;
 }
+
 #endif