Changeset 307

Timestamp:

Mar 24, 2008, 4:30:28 AM (17 years ago)

Author:

Paul Smedley

Message:

Fix for detection of sample rate from Yoda

Location:

GPL/branches/uniaud-2.0

Files:

• alsa-kernel/core/pcm_native.c (modified) (1 diff)
• alsa-kernel/include/sound/asound.h (modified) (1 diff)
• lib32/ioctl.c (modified) (1 diff)
• lib32/sound.c (modified) (5 diffs)

GPL/branches/uniaud-2.0/alsa-kernel/core/pcm_native.c

@@ -1965 +1965 @@
         snd_assert(err >= 0, return -EINVAL);
 
+#ifdef TARGET_OS2
+    err = snd_pcm_hw_constraint_mask(runtime, SNDRV_PCM_HW_PARAM_RATE_MASK, hw->rates);
+    snd_assert(err >= 0, return -EINVAL);
+#endif
+
         err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_CHANNELS,
                                            hw->channels_min, hw->channels_max);

GPL/branches/uniaud-2.0/alsa-kernel/include/sound/asound.h

@@ -349 +349 @@
 typedef int __bitwise snd_pcm_hw_param_t;
 #define SNDRV_PCM_HW_PARAM_ACCESS       ((__force snd_pcm_hw_param_t) 0) /* Access type */
-#define SNDRV_PCM_HW_PARAM_FORMAT       ((__force snd_pcm_hw_param_t) 1) /* Format */
-#define SNDRV_PCM_HW_PARAM_SUBFORMAT    ((__force snd_pcm_hw_param_t) 2) /* Subformat */
+#ifdef TARGET_OS2
+#define SNDRV_PCM_HW_PARAM_RATE_MASK    ((__force snd_pcm_hw_param_t) 1) /* Format */
+#endif
+#define SNDRV_PCM_HW_PARAM_FORMAT       ((__force snd_pcm_hw_param_t) 2) /* Format */
+#define SNDRV_PCM_HW_PARAM_SUBFORMAT    ((__force snd_pcm_hw_param_t) 3) /* Subformat */
 #define SNDRV_PCM_HW_PARAM_FIRST_MASK   SNDRV_PCM_HW_PARAM_ACCESS
 #define SNDRV_PCM_HW_PARAM_LAST_MASK    SNDRV_PCM_HW_PARAM_SUBFORMAT

GPL/branches/uniaud-2.0/lib32/ioctl.c

@@ -383 +383 @@
             pWaveCaps->ulMaxRate     = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->max;
 
-//            mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_RATE_MASK);
-            mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
+            mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_RATE_MASK);
+//            mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
             pWaveCaps->ulRateFlags   = mask->bits[0];
 

GPL/branches/uniaud-2.0/lib32/sound.c

@@ -279 +279 @@
         fuOSSRates |= OSS32_CAPS_PCM_RATE_48000;
     }
-#if 0
+//#if 0
     if(fuRates & SNDRV_PCM_RATE_64000) {
         fuOSSRates |= OSS32_CAPS_PCM_RATE_64000;
@@ -295 +295 @@
         fuOSSRates |= OSS32_CAPS_PCM_RATE_192000;
     }
-#endif
+//#endif
     if(fuRates & SNDRV_PCM_RATE_CONTINUOUS) {
         fuOSSRates |= OSS32_CAPS_PCM_RATE_CONTINUOUS;
@@ -335 +335 @@
     params = (struct snd_pcm_hw_params *)(pcminfo+1);
 
-    printk("Number of cards: %i\n",nrCardsDetected);
-    printk("dev id: %i\n",deviceid);
+    printk("Number of cards: %i",nrCardsDetected);
+    printk("dev id: %i",deviceid);
     pDevCaps->nrDevices  = 1;//nrCardsDetected;
     pDevCaps->ulCaps     = OSS32_CAPS_WAVE_PLAYBACK | OSS32_CAPS_WAVE_CAPTURE;
@@ -373 +373 @@
             else strncpy(pDevCaps->szDeviceName, pcminfo->id, sizeof(pDevCaps->szDeviceName));
         }
-        printk("Device name: %s\n", pDevCaps->szDeviceName);
+        printk("Device name: %s", pDevCaps->szDeviceName);
         pWaveCaps->nrStreams = pcminfo->subdevices_count;
     
@@ -404 +404 @@
         pWaveCaps->ulMaxRate     = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->max;
 
-//        mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_RATE_MASK);
         mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
+        printk("rate flags1: %X", mask);
+
+        mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_RATE_MASK);
+        printk("rate flags2: %X", mask);
+
         pWaveCaps->ulRateFlags   = mask->bits[0];
 
+        printk("rate flags3: %X", pWaveCaps->ulRateFlags);
         pWaveCaps->ulRateFlags   = ALSAToOSSRateFlags(pWaveCaps->ulRateFlags);
 
-        printk("rate flags: %X\n", pWaveCaps->ulRateFlags);
+        printk("rate flags4: %X", pWaveCaps->ulRateFlags);
 
         pWaveCaps->ulDataFormats = 0;