Changeset 556 for cmedia/trunk/Cmpci/cmpci.c

Timestamp:

Jul 27, 2011, 8:07:38 PM (14 years ago)

Author:

rudi

Message:

Update to version 0.2.3, part 2

File:

• cmedia/trunk/Cmpci/cmpci.c (modified) (7 diffs)

cmedia/trunk/Cmpci/cmpci.c

@@ -148 +148 @@
 /* --------------------------------------------------------------------- */
 
+// Rudi: We do not read back mixer values from hardware...
 #undef OSS_DOCUMENTED_MIXER_SEMANTICS
 
@@ -453 +454 @@
 int     prog_dmabuf(struct cm_state *s, unsigned rec);
 void    update_mixer(struct cm_state *s);
+void    set_device_state(struct cm_state *s);
 
 
@@ -1638 +1640 @@
 
 #else
-  #define return_mixval(s, v, a)        put_user((v), (a))
+  #define return_mixval(s, i, a)        put_user(s->mix.vol[i], (a))
 
 #endif /* OSS_DOCUMENTED_MIXER_SEMANTICS */
@@ -1649 +1651 @@
         unsigned char l, r, rl, rr, mix, enable;
 
-        l = (unsigned char)val;
-        r = (unsigned char)(val >> 8);
+        l  = (unsigned char)val;
+        r  = (unsigned char)(val >> 8);
+        rl = 100;
+        rr = 100;
+
+        if( s->chip_version < 68 )
+        {
+          // Rudi: emulate master volume which is always set to max
+          // in multi-channel mode for chip revs < 68
+          if( s->curr_channels > 2 &&
+              i != SOUND_MIXER_VOLUME && i != SOUND_MIXER_PCM )
+          {
+            rl = (unsigned char)s->mix.vol[SOUND_MIXER_VOLUME];
+            rr = (unsigned char)(s->mix.vol[SOUND_MIXER_VOLUME] >> 8);
+          }
+        }
+        else
+        {
+          //Rudi: emulate PCM volume which doesn't work for chip rev 68
+          if( i == SOUND_MIXER_PCM )
+          {
+            // force PCM to max.
+            spin_lock_irqsave(&s->lock, flags);
+            wrmixer(s, mixtable[SOUND_MIXER_PCM].left, 31 << 3);
+            wrmixer(s, mixtable[SOUND_MIXER_PCM].right, 31 << 3);
+            spin_unlock_irqrestore(&s->lock, flags);
+
+            rl = (unsigned char)s->mix.vol[SOUND_MIXER_VOLUME];
+            rr = (unsigned char)(s->mix.vol[SOUND_MIXER_VOLUME] >> 8);
+            i = SOUND_MIXER_VOLUME;
+          }
+          else if( i == SOUND_MIXER_VOLUME )
+          {
+            rl = (unsigned char)s->mix.vol[SOUND_MIXER_PCM];
+            rr = (unsigned char)(s->mix.vol[SOUND_MIXER_PCM] >> 8);
+          }
+        }
+
         if( l > 100 )   l = 100;
         if( r > 100 )   r = 100;
-
-// Rudi: master volume always set to max, when running in 4 channel mode
-        if( s->curr_channels > 2 &&
-            i != SOUND_MIXER_VOLUME && i != SOUND_MIXER_PCM ) {
-          rl = (unsigned char)s->mix.vol[SOUND_MIXER_VOLUME];
-          rr = (unsigned char)(s->mix.vol[SOUND_MIXER_VOLUME] >> 8);
-          if( rl > 100 )        rl = 100;
-          if( rr > 100 )        rr = 100;
-          l = (l * rl) / 100;
-          r = (r * rr) / 100;
-        }
+        if( rl > 100 )  rl = 100;
+        if( rr > 100 )  rr = 100;
+        l = ((l * rl) + 50) / 100;
+        r = ((r * rr) + 50) / 100;
 
 
@@ -1757 +1788 @@
 
 
+// Rudi: support  multi-channel mode
 __static__ void update_mixer(struct cm_state *s)
 {
-  int   i;
-
-  if( s->curr_channels > 2 ) {
-    set_mixval(s, SOUND_MIXER_PCM, s->mix.vol[SOUND_MIXER_VOLUME]);
-    set_mixval(s, SOUND_MIXER_VOLUME, 0x6464);
-  } else {
-    set_mixval(s, SOUND_MIXER_PCM, s->mix.vol[SOUND_MIXER_PCM]);
-    set_mixval(s, SOUND_MIXER_VOLUME, s->mix.vol[SOUND_MIXER_VOLUME]);
-  }
-
-  // emulate master volume control: CD, Line, Aux, Mic, Rear
-  for( i = 0; i < SOUND_MIXER_NRDEVICES; i++ )
-    if( mixtable[i].play )      set_mixval(s, i, s->mix.vol[i]);
+        int     i;
+
+        if( s->chip_version < 68 && s->curr_channels > 2 ) {
+                set_mixval(s, SOUND_MIXER_PCM, s->mix.vol[SOUND_MIXER_VOLUME]);
+                set_mixval(s, SOUND_MIXER_VOLUME, 0x6464);      // maximum = 100%
+        } else {
+                set_mixval(s, SOUND_MIXER_PCM, s->mix.vol[SOUND_MIXER_PCM]);
+                set_mixval(s, SOUND_MIXER_VOLUME, s->mix.vol[SOUND_MIXER_VOLUME]);
+        }
+
+        // emulate master volume control: CD, Line, Aux, Mic, Rear
+        for( i = 0; i < SOUND_MIXER_NRDEVICES; i++ )
+                if( mixtable[i].play )  set_mixval(s, i, s->mix.vol[i]);
 }
 
@@ -1945 +1977 @@
 #endif
 
+
+#ifndef OSS_DOCUMENTED_MIXER_SEMANTICS
+                // store internally
+                s->mix.vol[i] = val;
+#endif
+
+                // Rudi: support for 8768
+                if( s->chip_version < 68 && s->curr_channels > 2 ) {
 // Rudi: 4 channels (seems to work only on Rev39+)
 //       In this mode, master volume is always set to max.
 //       Wave volume is controlled via SOUND_MIXER_PCM.
 //       For all other sources, master volume is emulated
-                if( /*s->chip_version >= 39 &&*/ s->curr_channels > 2 ) {
-                  if( i == SOUND_MIXER_PCM )
-                    return put_user(val, (int *)arg);
 
                   if( i == SOUND_MIXER_VOLUME ) {
-                    s->mix.vol[SOUND_MIXER_VOLUME] = val;
                     update_mixer(s);
-                    return put_user(val, (int *)arg);
+                    return return_mixval(s, i, (int *)arg);
                   }
+
+                  if( i == SOUND_MIXER_PCM ) {
+                    return return_mixval(s, i, (int *)arg);
+                  }
                 }
 
                 set_mixval(s, i, val);
-
-#ifndef OSS_DOCUMENTED_MIXER_SEMANTICS
-                s->mix.vol[i] = val;
-                return put_user(val, (int *)arg);
-#else
                 return return_mixval(s, i, (int *)arg);
-#endif
         }
 }
@@ -3907 +3941 @@
                 ChipVersion = 39;       // 4 or 6 channels
                 s->max_channels = ( RegValue & (1 << (24-24)) ) ?  6 : 4;
-            } else {
-                ChipVersion = 55;       // 5 channels
+            } else if (RegValue & (1 << (29-29))) {
+                ChipVersion = 68;       // 8 channels
+                s->max_channels = 8;
+            } else /*if (RegValue & (1 << (27-27)))*/ {
+                ChipVersion = 55;       // 6 channels
                 s->max_channels = 6;
             }
+
 
             s->capability |= CAN_DUAL_DAC |