Changeset 231

Timestamp:

Aug 5, 2007, 7:09:24 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to Alsa 0.9.2

Location:

GPL/branches/alsa-resync1/alsa-kernel

Files:

• core/isadma.c (modified) (1 diff)
• core/pcm_native.c (modified) (1 diff)
• isa/opti9xx/opti92x-ad1848.c (modified) (2 diffs)
• pci/ice1712/ice1712.c (modified) (5 diffs)
• pci/ice1712/ice1724.c (modified) (3 diffs)

GPL/branches/alsa-resync1/alsa-kernel/core/isadma.c

@@ -98 +98 @@
                 snd_printk(KERN_ERR "pointer (0x%x) for DMA #%ld is greater than transfer size (0x%x)\n", result, dma, size);
 #endif
-        return result >= size ? 0 : size - result;
+        if (result >= size || result == 0)
+                return 0;
+        else
+                return size - result;
 }

GPL/branches/alsa-resync1/alsa-kernel/core/pcm_native.c

@@ -2035 +2035 @@
             substream->ops->hw_free(substream);
         substream->ops->close(substream);
+                substream->open_flag = 0;
+        }
         substream->ffile = NULL;
     }

GPL/branches/alsa-resync1/alsa-kernel/isa/opti9xx/opti92x-ad1848.c

@@ -988 +988 @@
                 } while (s != substream);
                 spin_lock(&chip->lock);
-                if (cmd == SNDRV_PCM_TRIGGER_START)
+                if (cmd == SNDRV_PCM_TRIGGER_START) {
                         snd_opti93x_out_mask(chip, OPTi93X_IFACE_CONF, what, what);
-                else
+                        if (what & OPTi93X_CAPTURE_ENABLE)
+                                udelay(50);
+                } else
                         snd_opti93x_out_mask(chip, OPTi93X_IFACE_CONF, what, 0x00);
                 spin_unlock(&chip->lock);
@@ -1208 +1210 @@
         runtime->hw = snd_opti93x_capture;
         snd_pcm_set_sync(substream);
+        chip->capture_substream = substream;
         snd_pcm_limit_isa_dma_size(chip->dma2, &runtime->hw.buffer_bytes_max);
         snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &hw_constraints_rates);

GPL/branches/alsa-resync1/alsa-kernel/pci/ice1712/ice1712.c

@@ -1814 +1814 @@
 }
 
-static snd_kcontrol_new_t snd_ice1712_pro_internal_clock = __devinitdata {
+static snd_kcontrol_new_t snd_ice1712_pro_internal_clock __devinitdata = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name = "Multi Track Internal Clock",
@@ -1833 +1833 @@
 static int snd_ice1712_pro_rate_locking_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
-        ucontrol->value.integer.value[0] = PRO_RATE_LOCKED ? 1 : 0;
+        ucontrol->value.integer.value[0] = PRO_RATE_LOCKED;
         return 0;
 }
@@ -1839 +1839 @@
 static int snd_ice1712_pro_rate_locking_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
-        int change = 0;
-
-        change = PRO_RATE_LOCKED ? 1 : 0 != ucontrol->value.integer.value[0] ? 1 : 0;
-        PRO_RATE_LOCKED = ucontrol->value.integer.value[0] ? 1 : 0;
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        int change = 0, nval;
+
+        nval = ucontrol->value.integer.value[0] ? 1 : 0;
+        spin_lock_irq(&ice->reg_lock);
+        change = PRO_RATE_LOCKED != nval;
+        PRO_RATE_LOCKED = nval;
+        spin_unlock_irq(&ice->reg_lock);
         return change;
 }
@@ -1865 +1869 @@
 static int snd_ice1712_pro_rate_reset_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
-        ucontrol->value.integer.value[0] = PRO_RATE_RESET ? 1 : 0;
+        ucontrol->value.integer.value[0] = PRO_RATE_RESET;
         return 0;
 }
@@ -1871 +1875 @@
 static int snd_ice1712_pro_rate_reset_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
-        int change = 0;
-
-        change = PRO_RATE_LOCKED ? 1 : 0 != ucontrol->value.integer.value[0] ? 1 : 0;
-        PRO_RATE_RESET = ucontrol->value.integer.value[0] ? 1 : 0;
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        int change = 0, nval;
+
+        nval = ucontrol->value.integer.value[0] ? 1 : 0;
+        spin_lock_irq(&ice->reg_lock);
+        change = PRO_RATE_RESET != nval;
+        PRO_RATE_RESET = nval;
+        spin_unlock_irq(&ice->reg_lock);
         return change;
 }

GPL/branches/alsa-resync1/alsa-kernel/pci/ice1712/ice1724.c

@@ -1314 +1314 @@
 static int snd_vt1724_pro_rate_locking_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
-        ucontrol->value.integer.value[0] = PRO_RATE_LOCKED ? 1 : 0;
+        ucontrol->value.integer.value[0] = PRO_RATE_LOCKED;
         return 0;
 }
@@ -1320 +1320 @@
 static int snd_vt1724_pro_rate_locking_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
-        int change = 0;
-
-        change = PRO_RATE_LOCKED ? 1 : 0 != ucontrol->value.integer.value[0] ? 1 : 0;
-        PRO_RATE_LOCKED = ucontrol->value.integer.value[0] ? 1 : 0;
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        int change = 0, nval;
+
+        nval = ucontrol->value.integer.value[0] ? 1 : 0;
+        spin_lock_irq(&ice->reg_lock);
+        change = PRO_RATE_LOCKED != nval;
+        PRO_RATE_LOCKED = nval;
+        spin_unlock_irq(&ice->reg_lock);
         return change;
 }
@@ -1352 +1356 @@
 static int snd_vt1724_pro_rate_reset_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
-        int change = 0;
-
-        change = PRO_RATE_LOCKED ? 1 : 0 != ucontrol->value.integer.value[0] ? 1 : 0;
-        PRO_RATE_RESET = ucontrol->value.integer.value[0] ? 1 : 0;
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        int change = 0, nval;
+
+        nval = ucontrol->value.integer.value[0] ? 1 : 0;
+        spin_lock_irq(&ice->reg_lock);
+        change = PRO_RATE_RESET != nval;
+        PRO_RATE_RESET = nval;
+        spin_unlock_irq(&ice->reg_lock);
         return change;
 }