Changeset 506

Timestamp:

Jul 11, 2010, 8:10:27 AM (15 years ago)

Author:

David Azarewicz

Message:

work on volume problem for capture

Location:

GPL/branches/uniaud32-2.1.x

Files:

• include/printfos2.h (deleted)
• lib32/misc.c (modified) (1 diff)
• lib32/soundmixer.c (modified) (3 diffs)
• uniaud.inc (modified) (1 diff)

GPL/branches/uniaud32-2.1.x/lib32/misc.c

@@ -39 +39 @@
 #include <linux/firmware.h>
 #include <dbgos2.h>
-#include <printfos2.h>
 
 struct new_utsname system_utsname = {0};

GPL/branches/uniaud32-2.1.x/lib32/soundmixer.c

@@ -516 +516 @@
                 GET_VOLUME_L(volume), GET_VOLUME_R(volume), lVol, rVol, pElemInfo->value.integer.max);
 
+#if 1
+        ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_CTL_IOCTL_ELEM_WRITE, (ULONG)pElem);
+#else
     // looking for more, then one opened streams to prevent of muting active stream
     cnt = 0;
@@ -522 +525 @@
             cnt++;
 
+        printk("OSS32_MixSetVolume old cnt=%X line=%x lVol=%x rVol=%x\n", cnt, line, lVol, rVol);
     //    if (((cnt == 1 && (lVol==0 && rVol==0)) || (lVol>0 && rVol>0)) ||
     if (cnt == 1 || line != OSS32_MIX_VOLUME_PCM)
     {
+                printk("OSS32_MixSetVolume Ioctl\n");
         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_CTL_IOCTL_ELEM_WRITE, (ULONG)pElem);
 
@@ -534 +539 @@
             pElem->value.integer.value[0] = FALSE;  //switch, not mute control (inversed)
             pElem->value.integer.value[1] = FALSE;
+                        printk("OSS32_MixSetVolume Ioctl mute\n");
             ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_CTL_IOCTL_ELEM_WRITE, (ULONG)pElem);
         }
     }
+#endif
 
     kfree(pElem);

GPL/branches/uniaud32-2.1.x/uniaud.inc

@@ -13 +13 @@
 # ex RC3  GA  FIXPACK2 beta_47
 # Comment out to avoid a fixpack line in bldlevel
-FIXPACK = BETA SVN r504
+FIXPACK = BETA SVN r506
 
 # ALSA BUILD VERSION