patch-2.1.67 linux/drivers/sound/opl3sa.c

• Lines: 425
• Date: Sat Nov 29 10:33:21 1997
• Orig file: v2.1.66/linux/drivers/sound/opl3sa.c
• Orig date: Wed Nov 12 13:34:27 1997

diff -u --recursive --new-file v2.1.66/linux/drivers/sound/opl3sa.c linux/drivers/sound/opl3sa.c
@@ -30,69 +30,66 @@
 static int     *opl3sa_osp = NULL;
 
 static unsigned char
-opl3sa_read (int addr)
+opl3sa_read(int addr)
 {
-  unsigned long   flags;
-  unsigned char   tmp;
+	unsigned long   flags;
+	unsigned char   tmp;
 
-  save_flags (flags);
-  cli ();
-  outb ((0x1d), 0xf86);		/* password */
-  outb (((unsigned char) addr), 0xf86);		/* address */
-  tmp = inb (0xf87);		/* data */
-  restore_flags (flags);
+	save_flags(flags);
+	cli();
+	outb((0x1d), 0xf86);	/* password */
+	outb(((unsigned char) addr), 0xf86);	/* address */
+	tmp = inb(0xf87);	/* data */
+	restore_flags(flags);
 
-  return tmp;
+	return tmp;
 }
 
 static void
-opl3sa_write (int addr, int data)
+opl3sa_write(int addr, int data)
 {
-  unsigned long   flags;
+	unsigned long   flags;
 
-  save_flags (flags);
-  cli ();
-  outb ((0x1d), 0xf86);		/* password */
-  outb (((unsigned char) addr), 0xf86);		/* address */
-  outb (((unsigned char) data), 0xf87);		/* data */
-  restore_flags (flags);
+	save_flags(flags);
+	cli();
+	outb((0x1d), 0xf86);	/* password */
+	outb(((unsigned char) addr), 0xf86);	/* address */
+	outb(((unsigned char) data), 0xf87);	/* data */
+	restore_flags(flags);
 }
 
 static int
-opl3sa_detect (void)
+opl3sa_detect(void)
 {
-  int             tmp;
-
-  if (((tmp = opl3sa_read (0x01)) & 0xc4) != 0x04)
-    {
-      DDB (printk ("OPL3-SA detect error 1 (%x)\n", opl3sa_read (0x01)));
-      /* return 0; */
-    }
+	int             tmp;
 
+	if (((tmp = opl3sa_read(0x01)) & 0xc4) != 0x04)
+	  {
+		  DDB(printk("OPL3-SA detect error 1 (%x)\n", opl3sa_read(0x01)));
+		  /* return 0; */
+	  }
 /*
  * Check that the password feature has any effect
  */
-  if (inb (0xf87) == tmp)
-    {
-      DDB (printk ("OPL3-SA detect failed 2 (%x/%x)\n", tmp, inb (0xf87)));
-      return 0;
-    }
-
-  tmp = (opl3sa_read (0x04) & 0xe0) >> 5;
-
-  if (tmp != 0 && tmp != 1)
-    {
-      DDB (printk ("OPL3-SA detect failed 3 (%d)\n", tmp));
-      return 0;
-    }
-
-  DDB (printk ("OPL3-SA mode %x detected\n", tmp));
-
-  opl3sa_write (0x01, 0x00);	/* Disable MSS */
-  opl3sa_write (0x02, 0x00);	/* Disable SB */
-  opl3sa_write (0x03, 0x00);	/* Disable MPU */
+	if (inb(0xf87) == tmp)
+	  {
+		  DDB(printk("OPL3-SA detect failed 2 (%x/%x)\n", tmp, inb(0xf87)));
+		  return 0;
+	  }
+	tmp = (opl3sa_read(0x04) & 0xe0) >> 5;
+
+	if (tmp != 0 && tmp != 1)
+	  {
+		  DDB(printk("OPL3-SA detect failed 3 (%d)\n", tmp));
+		  return 0;
+	  }
+	DDB(printk("OPL3-SA mode %x detected\n", tmp));
+
+	opl3sa_write(0x01, 0x00);	/* Disable MSS */
+	opl3sa_write(0x02, 0x00);	/* Disable SB */
+	opl3sa_write(0x03, 0x00);	/* Disable MPU */
 
-  return 1;
+	return 1;
 }
 
 /*
@@ -101,184 +98,177 @@
  */
 
 int
-probe_opl3sa_wss (struct address_info *hw_config)
+probe_opl3sa_wss(struct address_info *hw_config)
 {
-  int             ret;
-  unsigned char   tmp = 0x24;	/* WSS enable */
+	int             ret;
+	unsigned char   tmp = 0x24;	/* WSS enable */
 
-  if (check_region (0xf86, 2))	/* Control port is busy */
-    return 0;
-  /*
-     * Check if the IO port returns valid signature. The original MS Sound
-     * system returns 0x04 while some cards (OPL3-SA for example)
-     * return 0x00.
-   */
-  if (check_region (hw_config->io_base, 8))
-    {
-      printk ("OPL3-SA: MSS I/O port conflict (%x)\n", hw_config->io_base);
-      return 0;
-    }
-
-  opl3sa_osp = hw_config->osp;
-
-  if (!opl3sa_detect ())
-    {
-      printk ("OSS: OPL3-SA chip not found\n");
-      return 0;
-    }
-
-  switch (hw_config->io_base)
-    {
-    case 0x530:
-      tmp |= 0x00;
-      break;
-    case 0xe80:
-      tmp |= 0x08;
-      break;
-    case 0xf40:
-      tmp |= 0x10;
-      break;
-    case 0x604:
-      tmp |= 0x18;
-      break;
-    default:
-      printk ("OSS: Unsupported OPL3-SA/WSS base %x\n", hw_config->io_base);
-      return 0;
-    }
-
-  opl3sa_write (0x01, tmp);	/* WSS setup register */
-  kilroy_was_here = 1;
-
-  ret = probe_ms_sound (hw_config);
-  if (ret)
-    request_region (0xf86, 2, "OPL3-SA");
+	if (check_region(0xf86, 2))	/* Control port is busy */
+		return 0;
+	/*
+	   * Check if the IO port returns valid signature. The original MS Sound
+	   * system returns 0x04 while some cards (OPL3-SA for example)
+	   * return 0x00.
+	 */
+	if (check_region(hw_config->io_base, 8))
+	  {
+		  printk("OPL3-SA: MSS I/O port conflict (%x)\n", hw_config->io_base);
+		  return 0;
+	  }
+	opl3sa_osp = hw_config->osp;
+
+	if (!opl3sa_detect())
+	  {
+		  printk("OSS: OPL3-SA chip not found\n");
+		  return 0;
+	  }
+	switch (hw_config->io_base)
+	  {
+	  case 0x530:
+		  tmp |= 0x00;
+		  break;
+	  case 0xe80:
+		  tmp |= 0x08;
+		  break;
+	  case 0xf40:
+		  tmp |= 0x10;
+		  break;
+	  case 0x604:
+		  tmp |= 0x18;
+		  break;
+	  default:
+		  printk("OSS: Unsupported OPL3-SA/WSS base %x\n", hw_config->io_base);
+		  return 0;
+	  }
+
+	opl3sa_write(0x01, tmp);	/* WSS setup register */
+	kilroy_was_here = 1;
+
+	ret = probe_ms_sound(hw_config);
+	if (ret)
+		request_region(0xf86, 2, "OPL3-SA");
 
-  return ret;
+	return ret;
 }
 
 void
-attach_opl3sa_wss (struct address_info *hw_config)
+attach_opl3sa_wss(struct address_info *hw_config)
 {
-  int             nm = num_mixers;
+	int             nm = num_mixers;
 
-  attach_ms_sound (hw_config);
-  if (num_mixers > nm)		/* A mixer was installed */
-    {
-      AD1848_REROUTE (SOUND_MIXER_LINE1, SOUND_MIXER_CD);
-      AD1848_REROUTE (SOUND_MIXER_LINE2, SOUND_MIXER_SYNTH);
-      AD1848_REROUTE (SOUND_MIXER_LINE3, SOUND_MIXER_LINE);
-    }
+	attach_ms_sound(hw_config);
+	if (num_mixers > nm)	/* A mixer was installed */
+	  {
+		  AD1848_REROUTE(SOUND_MIXER_LINE1, SOUND_MIXER_CD);
+		  AD1848_REROUTE(SOUND_MIXER_LINE2, SOUND_MIXER_SYNTH);
+		  AD1848_REROUTE(SOUND_MIXER_LINE3, SOUND_MIXER_LINE);
+	  }
 }
 
 
 void
-attach_opl3sa_mpu (struct address_info *hw_config)
+attach_opl3sa_mpu(struct address_info *hw_config)
 {
 #if defined(CONFIG_UART401) && defined(CONFIG_MIDI)
-  hw_config->name = "OPL3-SA (MPU401)";
-  attach_uart401 (hw_config);
+	hw_config->name = "OPL3-SA (MPU401)";
+	attach_uart401(hw_config);
 #endif
 }
 
 int
-probe_opl3sa_mpu (struct address_info *hw_config)
+probe_opl3sa_mpu(struct address_info *hw_config)
 {
 #if defined(CONFIG_UART401) && defined(CONFIG_MIDI)
-  unsigned char   conf;
-  static char     irq_bits[] =
-  {-1, -1, -1, -1, -1, 1, -1, 2, -1, 3, 4};
-
-  if (!kilroy_was_here)
-    {
-      return 0;			/* OPL3-SA has not been detected earlier */
-    }
-
-  if (mpu_initialized)
-    {
-      DDB (printk ("OPL3-SA: MPU mode already initialized\n"));
-      return 0;
-    }
-
-  if (check_region (hw_config->io_base, 4))
-    {
-      printk ("OPL3-SA: MPU I/O port conflict (%x)\n", hw_config->io_base);
-      return 0;
-    }
-
-  if (hw_config->irq > 10)
-    {
-      printk ("OPL3-SA: Bad MPU IRQ %d\n", hw_config->irq);
-      return 0;
-    }
-
-  if (irq_bits[hw_config->irq] == -1)
-    {
-      printk ("OPL3-SA: Bad MPU IRQ %d\n", hw_config->irq);
-      return 0;
-    }
-
-  switch (hw_config->io_base)
-    {
-    case 0x330:
-      conf = 0x00;
-      break;
-    case 0x332:
-      conf = 0x20;
-      break;
-    case 0x334:
-      conf = 0x40;
-      break;
-    case 0x300:
-      conf = 0x60;
-      break;
-    default:
-      return 0;			/* Invalid port */
-    }
+	unsigned char   conf;
+	static char     irq_bits[] =
+	{-1, -1, -1, -1, -1, 1, -1, 2, -1, 3, 4};
+
+	if (!kilroy_was_here)
+	  {
+		  return 0;	/* OPL3-SA has not been detected earlier */
+	  }
+	if (mpu_initialized)
+	  {
+		  DDB(printk("OPL3-SA: MPU mode already initialized\n"));
+		  return 0;
+	  }
+	if (check_region(hw_config->io_base, 4))
+	  {
+		  printk("OPL3-SA: MPU I/O port conflict (%x)\n", hw_config->io_base);
+		  return 0;
+	  }
+	if (hw_config->irq > 10)
+	  {
+		  printk("OPL3-SA: Bad MPU IRQ %d\n", hw_config->irq);
+		  return 0;
+	  }
+	if (irq_bits[hw_config->irq] == -1)
+	  {
+		  printk("OPL3-SA: Bad MPU IRQ %d\n", hw_config->irq);
+		  return 0;
+	  }
+	switch (hw_config->io_base)
+	  {
+	  case 0x330:
+		  conf = 0x00;
+		  break;
+	  case 0x332:
+		  conf = 0x20;
+		  break;
+	  case 0x334:
+		  conf = 0x40;
+		  break;
+	  case 0x300:
+		  conf = 0x60;
+		  break;
+	  default:
+		  return 0;	/* Invalid port */
+	  }
 
-  conf |= 0x83;			/* MPU & OPL3 (synth) & game port enable */
-  conf |= irq_bits[hw_config->irq] << 2;
+	conf |= 0x83;		/* MPU & OPL3 (synth) & game port enable */
+	conf |= irq_bits[hw_config->irq] << 2;
 
-  opl3sa_write (0x03, conf);
+	opl3sa_write(0x03, conf);
 
-  mpu_initialized = 1;
+	mpu_initialized = 1;
 
-  return probe_uart401 (hw_config);
+	return probe_uart401(hw_config);
 #else
-  return 0;
+	return 0;
 #endif
 }
 
 void
-unload_opl3sa_wss (struct address_info *hw_config)
+unload_opl3sa_wss(struct address_info *hw_config)
 {
-  int             dma2 = hw_config->dma2;
+	int             dma2 = hw_config->dma2;
 
-  if (dma2 == -1)
-    dma2 = hw_config->dma;
+	if (dma2 == -1)
+		dma2 = hw_config->dma;
 
-  release_region (0xf86, 2);
-  release_region (hw_config->io_base, 4);
+	release_region(0xf86, 2);
+	release_region(hw_config->io_base, 4);
 
-  ad1848_unload (hw_config->io_base + 4,
-		 hw_config->irq,
-		 hw_config->dma,
-		 dma2,
-		 0);
+	ad1848_unload(hw_config->io_base + 4,
+		      hw_config->irq,
+		      hw_config->dma,
+		      dma2,
+		      0);
 }
 
 void
-unload_opl3sa_mpu (struct address_info *hw_config)
+unload_opl3sa_mpu(struct address_info *hw_config)
 {
 #if defined(CONFIG_UART401) && defined(CONFIG_MIDI)
-  unload_uart401 (hw_config);
+	unload_uart401(hw_config);
 #endif
 }
 #ifdef SB_OK
 void
-unload_opl3sa_sb (struct address_info *hw_config)
+unload_opl3sa_sb(struct address_info *hw_config)
 {
 #ifdef CONFIG_SBDSP
-  sb_dsp_unload (hw_config);
+	sb_dsp_unload(hw_config);
 #endif
 }
 #endif