Import of Linux/MIPS 2.1.14

1 files changed, 195 insertions, 208 deletions

diff --git a/drivers/sound/pas2_mixer.c b/drivers/sound/pas2_mixer.c
index bf0a20b6c..917d37809 100644
--- a/drivers/sound/pas2_mixer.c
+++ b/drivers/sound/pas2_mixer.c
@@ -4,49 +4,31 @@
  * sound/pas2_mixer.c
  *
  * Mixer routines for the Pro Audio Spectrum cards.
+ */
+
+/*
+ * Copyright (C) by Hannu Savolainen 1993-1996
  *
- * Copyright by Hannu Savolainen 1993
- *
- * 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.
- *
+ * OSS/Free 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>
 
 #include "sound_config.h"
 
-#if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_PAS)
-
-#include "pas.h"
+#if defined(CONFIG_PAS)
 
-#define TRACE(what)		/*
-				   * * * (what)   */
-
-extern int      translat_code;
-
-static int      rec_devices = (SOUND_MASK_MIC);	/*
+#ifndef DEB
+#define DEB(what)		/* (what) */
+#endif
 
+extern int      translate_code;
+extern char     pas_model;
+extern int     *pas_osp;
+extern int      pas_audiodev;
 
-							 * *  * * Default *
-							 * recording * source
-							 *
-							 * *  */
+static int      rec_devices = (SOUND_MASK_MIC);		/* Default recording source */
 static int      mode_control = 0;
 
 #define POSSIBLE_RECORDING_DEVICES	(SOUND_MASK_SYNTH | SOUND_MASK_SPEAKER | SOUND_MASK_LINE | SOUND_MASK_MIC | \
@@ -54,67 +36,55 @@ static int      mode_control = 0;
 
 #define SUPPORTED_MIXER_DEVICES		(SOUND_MASK_SYNTH | SOUND_MASK_PCM | SOUND_MASK_SPEAKER | SOUND_MASK_LINE | SOUND_MASK_MIC | \
 					 SOUND_MASK_CD | SOUND_MASK_ALTPCM | SOUND_MASK_IMIX | \
-					 SOUND_MASK_VOLUME | SOUND_MASK_BASS | SOUND_MASK_TREBLE | SOUND_MASK_RECLEV | \
-					 SOUND_MASK_MUTE | SOUND_MASK_ENHANCE | SOUND_MASK_LOUD)
+					 SOUND_MASK_VOLUME | SOUND_MASK_BASS | SOUND_MASK_TREBLE | SOUND_MASK_RECLEV)
 
-static unsigned short levels[SOUND_MIXER_NRDEVICES] =
+static int     *levels;
+
+static int      default_levels[32] =
 {
-  0x3232,			/*
-				 * Master Volume
-				 */
-  0x3232,			/*
-				 * Bass
-				 */
-  0x3232,			/*
-				 * Treble
-				 */
-  0x5050,			/*
-				 * FM
-				 */
-  0x4b4b,			/*
-				 * PCM
-				 */
-  0x3232,			/*
-				 * PC Speaker
-				 */
-  0x4b4b,			/*
-				 * Ext Line
-				 */
-  0x4b4b,			/*
-				 * Mic
-				 */
-  0x4b4b,			/*
-				 * CD
-				 */
-  0x6464,			/*
-				 * Recording monitor
-				 */
-  0x4b4b,			/*
-				 * SB PCM
-				 */
-  0x6464};			/*
+  0x3232,			/* Master Volume */
+  0x3232,			/* Bass */
+  0x3232,			/* Treble */
+  0x5050,			/* FM */
+  0x4b4b,			/* PCM */
+  0x3232,			/* PC Speaker */
+  0x4b4b,			/* Ext Line */
+  0x4b4b,			/* Mic */
+  0x4b4b,			/* CD */
+  0x6464,			/* Recording monitor */
+  0x4b4b,			/* SB PCM */
+  0x6464			/* Recording level */
+};
 
+void
+mix_write (unsigned char data, int ioaddr)
+{
+  /*
+   * The Revision D cards have a problem with their MVA508 interface. The
+   * kludge-o-rama fix is to make a 16-bit quantity with identical LSB and
+   * MSBs out of the output byte and to do a 16-bit out to the mixer port -
+   * 1. We need to do this because it isn't timing problem but chip access
+   * sequence problem.
+   */
 
-				 * *  * * Recording level   */
+  if (pas_model == 4)
+    {
+      outw (data | (data << 8), (ioaddr ^ translate_code) - 1);
+      outb ((0x80), 0);
+    }
+  else
+    pas_write (data, ioaddr);
+}
 
 static int
 mixer_output (int right_vol, int left_vol, int div, int bits,
-	      int mixer		/*
-				 * Input or output mixer
-     	      	      	      	      	      				 */ )
+	      int mixer)	/* Input or output mixer */
 {
   int             left = left_vol * div / 100;
   int             right = right_vol * div / 100;
 
-  /*
-   * The Revision D cards have a problem with their MVA508 interface. The
-   * kludge-o-rama fix is to make a 16-bit quantity with identical LSB and
-   * MSBs out of the output byte and to do a 16-bit out to the mixer port -
-   * 1. We don't need to do this because the call to pas_write more than
-   * compensates for the timing problems.
-   */
 
-  if (bits & P_M_MV508_MIXER)
+  if (bits & 0x10)
     {				/*
 				 * Select input or output mixer
 				 */
@@ -122,20 +92,20 @@ mixer_output (int right_vol, int left_vol, int div, int bits,
       right |= mixer;
     }
 
-  if (bits == P_M_MV508_BASS || bits == P_M_MV508_TREBLE)
+  if (bits == 0x03 || bits == 0x04)
     {				/*
 				 * Bass and treble are mono devices
 				 */
-      pas_write (P_M_MV508_ADDRESS | bits, PARALLEL_MIXER);
-      pas_write (left, PARALLEL_MIXER);
+      mix_write (0x80 | bits, 0x078B);
+      mix_write (left, 0x078B);
       right_vol = left_vol;
     }
   else
     {
-      pas_write (P_M_MV508_ADDRESS | P_M_MV508_LEFT | bits, PARALLEL_MIXER);
-      pas_write (left, PARALLEL_MIXER);
-      pas_write (P_M_MV508_ADDRESS | P_M_MV508_RIGHT | bits, PARALLEL_MIXER);
-      pas_write (right, PARALLEL_MIXER);
+      mix_write (0x80 | 0x20 | bits, 0x078B);
+      mix_write (left, 0x078B);
+      mix_write (0x80 | 0x40 | bits, 0x078B);
+      mix_write (right, 0x078B);
     }
 
   return (left_vol | (right_vol << 8));
@@ -144,8 +114,8 @@ mixer_output (int right_vol, int left_vol, int div, int bits,
 void
 set_mode (int new_mode)
 {
-  pas_write (P_M_MV508_ADDRESS | P_M_MV508_MODE, PARALLEL_MIXER);
-  pas_write (new_mode, PARALLEL_MIXER);
+  mix_write (0x80 | 0x05, 0x078B);
+  mix_write (new_mode, 0x078B);
 
   mode_control = new_mode;
 }
@@ -155,116 +125,63 @@ pas_mixer_set (int whichDev, unsigned int level)
 {
   int             left, right, devmask, changed, i, mixer = 0;
 
-  TRACE (printk ("static int pas_mixer_set(int whichDev = %d, unsigned int level = %X)\n", whichDev, level));
+  DEB (printk ("static int pas_mixer_set(int whichDev = %d, unsigned int level = %X)\n", whichDev, level));
 
   left = level & 0x7f;
   right = (level & 0x7f00) >> 8;
 
   if (whichDev < SOUND_MIXER_NRDEVICES)
     if ((1 << whichDev) & rec_devices)
-      mixer = P_M_MV508_INPUTMIX;
+      mixer = 0x20;
     else
-      mixer = P_M_MV508_OUTPUTMIX;
+      mixer = 0x00;
 
   switch (whichDev)
     {
-    case SOUND_MIXER_VOLUME:	/*
-				 * Master volume (0-63)
-				 */
-      levels[whichDev] = mixer_output (right, left, 63, P_M_MV508_MASTER_A, 0);
+    case SOUND_MIXER_VOLUME:	/* Master volume (0-63) */
+      levels[whichDev] = mixer_output (right, left, 63, 0x01, 0);
       break;
 
       /*
        * Note! Bass and Treble are mono devices. Will use just the left
        * channel.
        */
-    case SOUND_MIXER_BASS:	/*
-				 * Bass (0-12)
-				 */
-      levels[whichDev] = mixer_output (right, left, 12, P_M_MV508_BASS, 0);
+    case SOUND_MIXER_BASS:	/* Bass (0-12) */
+      levels[whichDev] = mixer_output (right, left, 12, 0x03, 0);
       break;
-    case SOUND_MIXER_TREBLE:	/*
-				 * Treble (0-12)
-				 */
-      levels[whichDev] = mixer_output (right, left, 12, P_M_MV508_TREBLE, 0);
+    case SOUND_MIXER_TREBLE:	/* Treble (0-12) */
+      levels[whichDev] = mixer_output (right, left, 12, 0x04, 0);
       break;
 
-    case SOUND_MIXER_SYNTH:	/*
-				 * Internal synthesizer (0-31)
-				 */
-      levels[whichDev] = mixer_output (right, left, 31, P_M_MV508_MIXER | P_M_MV508_FM, mixer);
+    case SOUND_MIXER_SYNTH:	/* Internal synthesizer (0-31) */
+      levels[whichDev] = mixer_output (right, left, 31, 0x10 | 0x00, mixer);
       break;
-    case SOUND_MIXER_PCM:	/*
-				 * PAS PCM (0-31)
-				 */
-      levels[whichDev] = mixer_output (right, left, 31, P_M_MV508_MIXER | P_M_MV508_PCM, mixer);
-      break;
-    case SOUND_MIXER_ALTPCM:	/*
-				 * SB PCM (0-31)
-				 */
-      levels[whichDev] = mixer_output (right, left, 31, P_M_MV508_MIXER | P_M_MV508_SB, mixer);
+    case SOUND_MIXER_PCM:	/* PAS PCM (0-31) */
+      levels[whichDev] = mixer_output (right, left, 31, 0x10 | 0x05, mixer);
       break;
-    case SOUND_MIXER_SPEAKER:	/*
-				 * PC speaker (0-31)
-				 */
-      levels[whichDev] = mixer_output (right, left, 31, P_M_MV508_MIXER | P_M_MV508_SPEAKER, mixer);
-      break;
-    case SOUND_MIXER_LINE:	/*
-				 * External line (0-31)
-				 */
-      levels[whichDev] = mixer_output (right, left, 31, P_M_MV508_MIXER | P_M_MV508_LINE, mixer);
+    case SOUND_MIXER_ALTPCM:	/* SB PCM (0-31) */
+      levels[whichDev] = mixer_output (right, left, 31, 0x10 | 0x07, mixer);
       break;
-    case SOUND_MIXER_CD:	/*
-				 * CD (0-31)
-				 */
-      levels[whichDev] = mixer_output (right, left, 31, P_M_MV508_MIXER | P_M_MV508_CDROM, mixer);
+    case SOUND_MIXER_SPEAKER:	/* PC speaker (0-31) */
+      levels[whichDev] = mixer_output (right, left, 31, 0x10 | 0x06, mixer);
       break;
-    case SOUND_MIXER_MIC:	/*
-				 * External microphone (0-31)
-				 */
-      levels[whichDev] = mixer_output (right, left, 31, P_M_MV508_MIXER | P_M_MV508_MIC, mixer);
+    case SOUND_MIXER_LINE:	/* External line (0-31) */
+      levels[whichDev] = mixer_output (right, left, 31, 0x10 | 0x02, mixer);
       break;
-    case SOUND_MIXER_IMIX:	/*
-				 * Recording monitor (0-31) (Only available *
-				 * on the Output Mixer)
-				 */
-      levels[whichDev] = mixer_output (right, left, 31, P_M_MV508_MIXER | P_M_MV508_IMIXER,
-				       P_M_MV508_OUTPUTMIX);
+    case SOUND_MIXER_CD:	/* CD (0-31) */
+      levels[whichDev] = mixer_output (right, left, 31, 0x10 | 0x03, mixer);
       break;
-    case SOUND_MIXER_RECLEV:	/*
-				 * Recording level (0-15)
-				 */
-      levels[whichDev] = mixer_output (right, left, 15, P_M_MV508_MASTER_B, 0);
+    case SOUND_MIXER_MIC:	/* External microphone (0-31) */
+      levels[whichDev] = mixer_output (right, left, 31, 0x10 | 0x04, mixer);
       break;
-
-    case SOUND_MIXER_MUTE:
-      return 0;
+    case SOUND_MIXER_IMIX:	/* Recording monitor (0-31) (Output mixer only) */
+      levels[whichDev] = mixer_output (right, left, 31, 0x10 | 0x01,
+				       0x00);
       break;
-
-    case SOUND_MIXER_ENHANCE:
-      i = 0;
-      level &= 0x7f;
-      if (level)
-	i = (level / 20) - 1;
-
-      mode_control &= ~P_M_MV508_ENHANCE_BITS;
-      mode_control |= P_M_MV508_ENHANCE_BITS;
-      set_mode (mode_control);
-
-      if (i)
-	i = (i + 1) * 20;
-      return i;
+    case SOUND_MIXER_RECLEV:	/* Recording level (0-15) */
+      levels[whichDev] = mixer_output (right, left, 15, 0x02, 0);
       break;
 
-    case SOUND_MIXER_LOUD:
-      mode_control &= ~P_M_MV508_LOUDNESS;
-      if (level)
-	mode_control |= P_M_MV508_LOUDNESS;
-      set_mode (mode_control);
-      return !!level;		/*
-				 * 0 or 1
-				 */
-      break;
 
     case SOUND_MIXER_RECSRC:
       devmask = level & POSSIBLE_RECORDING_DEVICES;
@@ -281,7 +198,7 @@ pas_mixer_set (int whichDev, unsigned int level)
       break;
 
     default:
-      return RET_ERROR (EINVAL);
+      return -EINVAL;
     }
 
   return (levels[whichDev]);
@@ -294,23 +211,105 @@ pas_mixer_reset (void)
 {
   int             foo;
 
-  TRACE (printk ("pas2_mixer.c: void pas_mixer_reset(void)\n"));
+  DEB (printk ("pas2_mixer.c: void pas_mixer_reset(void)\n"));
 
   for (foo = 0; foo < SOUND_MIXER_NRDEVICES; foo++)
     pas_mixer_set (foo, levels[foo]);
 
-  set_mode (P_M_MV508_LOUDNESS | P_M_MV508_ENHANCE_40);
+  set_mode (0x04 | 0x01);
 }
 
 int
-pas_mixer_ioctl (int dev, unsigned int cmd, unsigned int arg)
+pas_mixer_ioctl (int dev, unsigned int cmd, caddr_t arg)
 {
-  TRACE (printk ("pas2_mixer.c: int pas_mixer_ioctl(unsigned int cmd = %X, unsigned int arg = %X)\n", cmd, arg));
+  DEB (printk ("pas2_mixer.c: int pas_mixer_ioctl(unsigned int cmd = %X, unsigned int arg = %X)\n", cmd, arg));
+
+  if (cmd == SOUND_MIXER_PRIVATE1)	/* Set loudness bit */
+    {
+      int             level;
+
+      get_user (level, (int *) arg);
+
+      if (level == -1)		/* Return current settings */
+	{
+	  if (mode_control & 0x04)
+	    return ioctl_out (arg, 1);
+	  else
+	    return ioctl_out (arg, 0);
+	}
+      else
+	{
+	  mode_control &= ~0x04;
+	  if (level)
+	    mode_control |= 0x04;
+	  set_mode (mode_control);
+	  return ioctl_out (arg, !!level);	/* 0 or 1 */
+	}
+    }
+
+
+  if (cmd == SOUND_MIXER_PRIVATE2)	/* Set enhance bit */
+    {
+      int             level;
+
+      get_user (level, (int *) arg);
+
+      if (level == -1)		/* Return current settings */
+	{
+	  if (!(mode_control & 0x03))
+	    return ioctl_out (arg, 0);
+	  return ioctl_out (arg, ((mode_control & 0x03) + 1) * 20);
+	}
+      else
+	{
+	  int             i = 0;
+
+	  level &= 0x7f;
+	  if (level)
+	    i = (level / 20) - 1;
+
+	  mode_control &= ~0x03;
+	  mode_control |= i & 0x03;
+	  set_mode (mode_control);
+
+	  if (i)
+	    i = (i + 1) * 20;
+
+	  return i;
+	}
+    }
+
+  if (cmd == SOUND_MIXER_PRIVATE3)	/* Set mute bit */
+    {
+      int             level;
+
+      get_user (level, (int *) arg);
+
+      if (level == -1)		/* Return current settings */
+	{
+	  return ioctl_out (arg, !(pas_read (0x0B8A) & 0x20));
+	}
+      else
+	{
+	  if (level)
+	    pas_write (pas_read (0x0B8A) & (~0x20),
+		       0x0B8A);
+	  else
+	    pas_write (pas_read (0x0B8A) | 0x20,
+		       0x0B8A);
+
+	  return !(pas_read (0x0B8A) & 0x20);
+	}
+    }
 
   if (((cmd >> 8) & 0xff) == 'M')
     {
-      if (cmd & IOC_IN)
-	return IOCTL_OUT (arg, pas_mixer_set (cmd & 0xff, IOCTL_IN (arg)));
+      int             v;
+
+      get_user (v, (int *) arg);
+
+      if (_IOC_DIR (cmd) & _IOC_WRITE)
+	return ioctl_out (arg, pas_mixer_set (cmd & 0xff, v));
       else
 	{			/*
 				 * Read parameters
@@ -320,65 +319,53 @@ pas_mixer_ioctl (int dev, unsigned int cmd, unsigned int arg)
 	    {
 
 	    case SOUND_MIXER_RECSRC:
-	      return IOCTL_OUT (arg, rec_devices);
+	      return ioctl_out (arg, rec_devices);
 	      break;
 
 	    case SOUND_MIXER_STEREODEVS:
-	      return IOCTL_OUT (arg, SUPPORTED_MIXER_DEVICES & ~(SOUND_MASK_BASS | SOUND_MASK_TREBLE));
+	      return ioctl_out (arg, SUPPORTED_MIXER_DEVICES & ~(SOUND_MASK_BASS | SOUND_MASK_TREBLE));
 	      break;
 
 	    case SOUND_MIXER_DEVMASK:
-	      return IOCTL_OUT (arg, SUPPORTED_MIXER_DEVICES);
+	      return ioctl_out (arg, SUPPORTED_MIXER_DEVICES);
 	      break;
 
 	    case SOUND_MIXER_RECMASK:
-	      return IOCTL_OUT (arg, POSSIBLE_RECORDING_DEVICES & SUPPORTED_MIXER_DEVICES);
+	      return ioctl_out (arg, POSSIBLE_RECORDING_DEVICES & SUPPORTED_MIXER_DEVICES);
 	      break;
 
 	    case SOUND_MIXER_CAPS:
-	      return IOCTL_OUT (arg, 0);	/*
-						 * No special capabilities
-						 */
-	      break;
-
-	    case SOUND_MIXER_MUTE:
-	      return IOCTL_OUT (arg, 0);	/*
-						 * No mute yet
-						 */
+	      return ioctl_out (arg, 0);	/* No special capabilities */
 	      break;
 
-	    case SOUND_MIXER_ENHANCE:
-	      if (!(mode_control & P_M_MV508_ENHANCE_BITS))
-		return IOCTL_OUT (arg, 0);
-	      return IOCTL_OUT (arg, ((mode_control & P_M_MV508_ENHANCE_BITS) + 1) * 20);
-	      break;
-
-	    case SOUND_MIXER_LOUD:
-	      if (mode_control & P_M_MV508_LOUDNESS)
-		return IOCTL_OUT (arg, 1);
-	      return IOCTL_OUT (arg, 0);
-	      break;
 
 	    default:
-	      return IOCTL_OUT (arg, levels[cmd & 0xff]);
+	      return ioctl_out (arg, levels[cmd & 0xff]);
 	    }
 	}
     }
-  return RET_ERROR (EINVAL);
+  return -EINVAL;
 }
 
 static struct mixer_operations pas_mixer_operations =
 {
+  "PAS16",
+  "Pro Audio Spectrum 16",
   pas_mixer_ioctl
 };
 
 int
 pas_init_mixer (void)
 {
+  levels = load_mixer_volumes ("PAS16_1", default_levels, 1);
+
   pas_mixer_reset ();
 
   if (num_mixers < MAX_MIXER_DEV)
-    mixer_devs[num_mixers++] = &pas_mixer_operations;
+    {
+      audio_devs[pas_audiodev]->mixer_dev = num_mixers;
+      mixer_devs[num_mixers++] = &pas_mixer_operations;
+    }
   return 1;
 }