1 files changed, 119 insertions, 10 deletions

diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 949691a876d..6edc67ced90 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -521,6 +521,8 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_DMA_AREA_KILOBYTES (HDSPM_DMA_AREA_BYTES/1024)
 
 /* revisions >= 230 indicate AES32 card */
+#define HDSPM_MADI_ANCIENT_REV  204
+#define HDSPM_MADI_OLD_REV      207
 #define HDSPM_MADI_REV          210
 #define HDSPM_RAYDAT_REV        211
 #define HDSPM_AIO_REV           212
@@ -895,11 +897,11 @@ struct hdspm {
         unsigned char max_channels_in;
         unsigned char max_channels_out;
 
-        char *channel_map_in;
-        char *channel_map_out;
+        signed char *channel_map_in;
+        signed char *channel_map_out;
 
-        char *channel_map_in_ss, *channel_map_in_ds, *channel_map_in_qs;
-        char *channel_map_out_ss, *channel_map_out_ds, *channel_map_out_qs;
+        signed char *channel_map_in_ss, *channel_map_in_ds, *channel_map_in_qs;
+        signed char *channel_map_out_ss, *channel_map_out_ds, *channel_map_out_qs;
 
         char **port_names_in;
         char **port_names_out;
@@ -1143,7 +1145,7 @@ static int hdspm_external_sample_rate(struct hdspm *hdspm)
 
                 /* if wordclock has synced freq and wordclock is valid */
                 if ((status2 & HDSPM_wcLock) != 0 &&
-                                (status & HDSPM_SelSyncRef0) == 0) {
+                                (status2 & HDSPM_SelSyncRef0) == 0) {
 
                         rate_bits = status2 & HDSPM_wcFreqMask;
 
@@ -1216,6 +1218,22 @@ static int hdspm_external_sample_rate(struct hdspm *hdspm)
                                 rate = 0;
                                 break;
                         }
+
+                        /* QS and DS rates normally can not be detected
+                         * automatically by the card. Only exception is MADI
+                         * in 96k frame mode.
+                         *
+                         * So if we read SS values (32 .. 48k), check for
+                         * user-provided DS/QS bits in the control register
+                         * and multiply the base frequency accordingly.
+                         */
+                        if (rate <= 48000) {
+                                if (hdspm->control_register & HDSPM_QuadSpeed)
+                                        rate *= 4;
+                                else if (hdspm->control_register &
+                                                HDSPM_DoubleSpeed)
+                                        rate *= 2;
+                        }
                 }
                 break;
         }
@@ -1639,12 +1657,14 @@ static int snd_hdspm_midi_input_read (struct hdspm_midi *hmidi)
                 }
         }
         hmidi->pending = 0;
+        spin_unlock_irqrestore(&hmidi->lock, flags);
 
+        spin_lock_irqsave(&hmidi->hdspm->lock, flags);
         hmidi->hdspm->control_register |= hmidi->ie;
         hdspm_write(hmidi->hdspm, HDSPM_controlRegister,
                     hmidi->hdspm->control_register);
+        spin_unlock_irqrestore(&hmidi->hdspm->lock, flags);
 
-        spin_unlock_irqrestore (&hmidi->lock, flags);
         return snd_hdspm_midi_output_write (hmidi);
 }
 
@@ -3412,6 +3432,91 @@ static int snd_hdspm_put_qs_wire(struct snd_kcontrol *kcontrol,
         return change;
 }
 
+#define HDSPM_MADI_SPEEDMODE(xname, xindex) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .index = xindex, \
+        .info = snd_hdspm_info_madi_speedmode, \
+        .get = snd_hdspm_get_madi_speedmode, \
+        .put = snd_hdspm_put_madi_speedmode \
+}
+
+static int hdspm_madi_speedmode(struct hdspm *hdspm)
+{
+        if (hdspm->control_register & HDSPM_QuadSpeed)
+                return 2;
+        if (hdspm->control_register & HDSPM_DoubleSpeed)
+                return 1;
+        return 0;
+}
+
+static int hdspm_set_madi_speedmode(struct hdspm *hdspm, int mode)
+{
+        hdspm->control_register &= ~(HDSPM_DoubleSpeed | HDSPM_QuadSpeed);
+        switch (mode) {
+        case 0:
+                break;
+        case 1:
+                hdspm->control_register |= HDSPM_DoubleSpeed;
+                break;
+        case 2:
+                hdspm->control_register |= HDSPM_QuadSpeed;
+                break;
+        }
+        hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
+
+        return 0;
+}
+
+static int snd_hdspm_info_madi_speedmode(struct snd_kcontrol *kcontrol,
+                                       struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = { "Single", "Double", "Quad" };
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 3;
+
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                    uinfo->value.enumerated.items - 1;
+        strcpy(uinfo->value.enumerated.name,
+               texts[uinfo->value.enumerated.item]);
+
+        return 0;
+}
+
+static int snd_hdspm_get_madi_speedmode(struct snd_kcontrol *kcontrol,
+                                      struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        spin_lock_irq(&hdspm->lock);
+        ucontrol->value.enumerated.item[0] = hdspm_madi_speedmode(hdspm);
+        spin_unlock_irq(&hdspm->lock);
+        return 0;
+}
+
+static int snd_hdspm_put_madi_speedmode(struct snd_kcontrol *kcontrol,
+                                      struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+        int change;
+        int val;
+
+        if (!snd_hdspm_use_is_exclusive(hdspm))
+                return -EBUSY;
+        val = ucontrol->value.integer.value[0];
+        if (val < 0)
+                val = 0;
+        if (val > 2)
+                val = 2;
+        spin_lock_irq(&hdspm->lock);
+        change = val != hdspm_madi_speedmode(hdspm);
+        hdspm_set_madi_speedmode(hdspm, val);
+        spin_unlock_irq(&hdspm->lock);
+        return change;
+}
 
 #define HDSPM_MIXER(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_HWDEP, \
@@ -4286,7 +4391,8 @@ static struct snd_kcontrol_new snd_hdspm_controls_madi[] = {
         HDSPM_TX_64("TX 64 channels mode", 0),
         HDSPM_C_TMS("Clear Track Marker", 0),
         HDSPM_SAFE_MODE("Safe Mode", 0),
-        HDSPM_INPUT_SELECT("Input Select", 0)
+        HDSPM_INPUT_SELECT("Input Select", 0),
+        HDSPM_MADI_SPEEDMODE("MADI Speed Mode", 0)
 };
 
 
@@ -4299,7 +4405,8 @@ static struct snd_kcontrol_new snd_hdspm_controls_madiface[] = {
         HDSPM_SYNC_CHECK("MADI SyncCheck", 0),
         HDSPM_TX_64("TX 64 channels mode", 0),
         HDSPM_C_TMS("Clear Track Marker", 0),
-        HDSPM_SAFE_MODE("Safe Mode", 0)
+        HDSPM_SAFE_MODE("Safe Mode", 0),
+        HDSPM_MADI_SPEEDMODE("MADI Speed Mode", 0)
 };
 
 static struct snd_kcontrol_new snd_hdspm_controls_aio[] = {
@@ -6377,6 +6484,8 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
 
         switch (hdspm->firmware_rev) {
         case HDSPM_MADI_REV:
+        case HDSPM_MADI_OLD_REV:
+        case HDSPM_MADI_ANCIENT_REV:
                 hdspm->io_type = MADI;
                 hdspm->card_name = "RME MADI";
                 hdspm->midiPorts = 3;
@@ -6437,7 +6546,7 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
                         hdspm->port + io_extent - 1);
 
         if (request_irq(pci->irq, snd_hdspm_interrupt,
-                                IRQF_SHARED, "hdspm", hdspm)) {
+                        IRQF_SHARED, KBUILD_MODNAME, hdspm)) {
                 snd_printk(KERN_ERR "HDSPM: unable to use IRQ %d\n", pci->irq);
                 return -EBUSY;
         }
@@ -6775,7 +6884,7 @@ static void __devexit snd_hdspm_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-        .name = "RME Hammerfall DSP MADI",
+        .name = KBUILD_MODNAME,
         .id_table = snd_hdspm_ids,
         .probe = snd_hdspm_probe,
         .remove = __devexit_p(snd_hdspm_remove),