[Alsa-devel] hdsp update

[Thomas Charbonnel]

Hi,

The attach patch fixes problems with speed modes for H9632 cards (many
thanks to Pentti Ala-Vannesluoma for testing the driver and helping
finding bugs), and the AutoSync mode issue (for all cards) reported by
Anders Torger at the end of september.
A new version of hdspmixer is also available here :
http://www.undata.org/~thomas/
It is mostly a bugfix release for H9632 users.
There is also a new version of hdspconf, but it only adds a .desktop
file and a nice icon (to bring it to par with the new hdspmixer), so
Takashi, feel free not to commit this one if you don't have much time :)
Thomas

--- hdsp.c.cvs  2003-11-07 14:49:56.000000000 +0100
+++ hdsp.c      2003-11-21 17:15:18.000000000 +0100
@@ -1109,16 +1109,17 @@
                rate_bits = HDSP_Frequency176_4KHz;
                break;
        case 192000:
-               if (current_rate != 192000) {
+               if (current_rate < 128000) {
                        reject_if_open = 1;
                }
                rate_bits = HDSP_Frequency192KHz;
+               break;
        default:
                return -EINVAL;
        }
 
        if (reject_if_open && (hdsp->capture_pid >= 0 || hdsp->playback_pid >= 0)) {
-               snd_printk ("cannot change between single- and double-speed mode 
(capture PID = %d, playback PID = %d)\n",
+               snd_printk ("cannot change speed mode (capture PID = %d, playback PID 
= %d)\n",
                            hdsp->capture_pid,
                            hdsp->playback_pid);
                return -EBUSY;
@@ -2102,9 +2103,11 @@
        switch (mode) {
        case HDSP_CLOCK_SOURCE_AUTOSYNC:
                if (hdsp_external_sample_rate(hdsp) != 0) {
-                   hdsp->control_register &= ~HDSP_ClockModeMaster;            
-                   hdsp_write(hdsp, HDSP_controlRegister, hdsp->control_register);
-                   return 0;
+                   if (!hdsp_set_rate(hdsp, hdsp_external_sample_rate(hdsp), 1)) {
+                       hdsp->control_register &= ~HDSP_ClockModeMaster;               
 
+                       hdsp_write(hdsp, HDSP_controlRegister, hdsp->control_register);
+                       return 0;
+                   }
                }
                return -1;
        case HDSP_CLOCK_SOURCE_INTERNAL_32KHZ:
@@ -4189,30 +4192,36 @@
 static int snd_hdsp_hw_rule_in_channels(snd_pcm_hw_params_t *params,
                                        snd_pcm_hw_rule_t *rule)
 {
-       unsigned int list[2];
+       unsigned int list[3];
        hdsp_t *hdsp = rule->private;
        snd_interval_t *c = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
        if (hdsp->io_type == H9632) {
                list[0] = hdsp->qs_in_channels;
+               list[1] = hdsp->ds_in_channels;
+               list[2] = hdsp->ss_in_channels;
+               return snd_interval_list(c, 3, list, 0);
        } else {
                list[0] = hdsp->ds_in_channels;
+               list[1] = hdsp->ss_in_channels;
        }
-       list[1] = hdsp->ss_in_channels;
        return snd_interval_list(c, 2, list, 0);
 }
 
 static int snd_hdsp_hw_rule_out_channels(snd_pcm_hw_params_t *params,
                                        snd_pcm_hw_rule_t *rule)
 {
-       unsigned int list[2];
+       unsigned int list[3];
        hdsp_t *hdsp = rule->private;
        snd_interval_t *c = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
        if (hdsp->io_type == H9632) {
                list[0] = hdsp->qs_out_channels;
+               list[1] = hdsp->ds_out_channels;
+               list[2] = hdsp->ss_out_channels;
+               return snd_interval_list(c, 3, list, 0);
        } else {
                list[0] = hdsp->ds_out_channels;
+               list[1] = hdsp->ss_out_channels;
        }
-       list[1] = hdsp->ss_out_channels;
        return snd_interval_list(c, 2, list, 0);
 }
 
@@ -4229,7 +4238,7 @@
                        .integer = 1,
                };
                return snd_interval_refine(c, &t);      
-       } else if (r->min > 48000) {
+       } else if (r->min > 48000 && r->max <= 96000) {
                snd_interval_t t = {
                        .min = hdsp->ds_in_channels,
                        .max = hdsp->ds_in_channels,
@@ -4260,7 +4269,7 @@
                        .integer = 1,
                };
                return snd_interval_refine(c, &t);      
-       } else if (r->min > 48000) {
+       } else if (r->min > 48000 && r->max <= 96000) {
                snd_interval_t t = {
                        .min = hdsp->ds_out_channels,
                        .max = hdsp->ds_out_channels,