Changeset 320 for GPL

Timestamp:

Mar 25, 2008, 1:46:01 AM (17 years ago)

Author:

Paul Smedley

Message:

Fix for no sound on some HDA machines

Location:

GPL/branches/uniaud-2.0

Files:

• alsa-kernel/core/pcm_lib.c (modified) (1 diff)
• alsa-kernel/include/sound/asound.h (modified) (1 diff)
• lib32/sound.c (modified) (2 diffs)

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

@@ -1341 +1341 @@
 int snd_interval_refine_set(struct snd_interval *i, unsigned int val)
 {
-    struct snd_interval t;
-    t.empty = 0;
-    t.min = t.max = val;
-    t.openmin = t.openmax = 0;
-    t.integer = 1;
-    return snd_interval_refine(i, &t);
+        struct snd_interval t;
+        t.empty = 0;
+        t.min = t.max = val;
+        t.openmin = t.openmax = 0;
+        t.integer = 1;
+        return snd_interval_refine(i, &t);
 }
 
 int _snd_pcm_hw_param_set(struct snd_pcm_hw_params *params,
-                          snd_pcm_hw_param_t var, unsigned int val, int dir)
-{
-    int changed;
-    if (hw_is_mask(var)) {
-        struct snd_mask *m = hw_param_mask(params, var);
-        if (val == 0 && dir < 0) {
-            changed = -EINVAL;
-            snd_mask_none(m);
-        } else {
-            if (dir > 0)
-                val++;
-            else if (dir < 0)
-                val--;
-            changed = snd_mask_refine_set(hw_param_mask(params, var), val);
-        }
-    } else if (hw_is_interval(var)) {
-        struct snd_interval *i = hw_param_interval(params, var);
-        if (val == 0 && dir < 0) {
-            changed = -EINVAL;
-            snd_interval_none(i);
-        } else if (dir == 0)
-            changed = snd_interval_refine_set(i, val);
-        else {
-            struct snd_interval t;
-            t.openmin = 1;
-            t.openmax = 1;
-            t.empty = 0;
-            t.integer = 0;
-            if (dir < 0) {
-                t.min = val - 1;
-                t.max = val;
-            } else {
-                t.min = val;
-                t.max = val+1;
-            }
-            changed = snd_interval_refine(i, &t);
-        }
-    } else {
-        assert(0);
-        return -EINVAL;
-    }
-    if (changed) {
-        params->cmask |= 1 << var;
-        params->rmask |= 1 << var;
-    }
-    return changed;
-}
+                                 snd_pcm_hw_param_t var, unsigned int val,
+                                 int dir)
+{
+        int changed;
+        if (hw_is_mask(var)) {
+                struct snd_mask *m = hw_param_mask(params, var);
+                if (val == 0 && dir < 0) {
+                        changed = -EINVAL;
+                        snd_mask_none(m);
+                } else {
+                        if (dir > 0)
+                                val++;
+                        else if (dir < 0)
+                                val--;
+                        changed = snd_mask_refine_set(hw_param_mask(params, var), val);
+                }
+        } else if (hw_is_interval(var)) {
+                struct snd_interval *i = hw_param_interval(params, var);
+                if (val == 0 && dir < 0) {
+                        changed = -EINVAL;
+                        snd_interval_none(i);
+                } else if (dir == 0)
+                        changed = snd_interval_refine_set(i, val);
+                else {
+                        struct snd_interval t;
+                        t.openmin = 1;
+                        t.openmax = 1;
+                        t.empty = 0;
+                        t.integer = 0;
+                        if (dir < 0) {
+                                t.min = val - 1;
+                                t.max = val;
+                        } else {
+                                t.min = val;
+                                t.max = val+1;
+                        }
+                        changed = snd_interval_refine(i, &t);
+                }
+        } else
+                return -EINVAL;
+        if (changed) {
+                params->cmask |= 1 << var;
+                params->rmask |= 1 << var;
+        }
+        return changed;
+}
+
 #endif
 /**

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

@@ -29 +29 @@
 #include <linux/time.h>
 #include <asm/byteorder.h>
-#ifdef TARGET_OS2x
-#include <sound/config.h>
-#endif
 #ifdef  __LITTLE_ENDIAN
 #define SNDRV_LITTLE_ENDIAN

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;