ALSA: usb-audio: UAC3. Add support for mixer unit.

This adds support for the MIXER UNIT in UAC3. All the information
is obtained from the (HIGH CAPABILITY) Cluster's header. We don't
read the rest of the logical cluster to obtain the channel config
as that wont make any difference in the current mixer behaviour.

The name of the mixer unit is not yet requested as there is not
support for the UAC3 Class Specific String requests.

Tested in an UAC3 device working as a HEADSET with a basic mixer
unit (same as the one in the BADD spec) with no controls.

Signed-off-by: Jorge Sanjuan <jorge.sanjuan@codethink.co.uk>
Reviewed-by: Ruslan Bilovol <ruslan.bilovol@gmail.com>
Tested-by: Ruslan Bilovol <ruslan.bilovol@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/uapi/linux/usb/audio.h b/include/uapi/linux/usb/audio.h
index 3a78e71456897d2cddf08272bbed4844d72c1e7f..13d98e6e0db1a86f46cc7d77b5652bef0c8682d2 100644 (file)
--- a/include/uapi/linux/usb/audio.h
+++ b/include/uapi/linux/usb/audio.h
@@ -285,9 +285,22 @@ static inline __u8 uac_mixer_unit_iChannelNames(struct uac_mixer_unit_descriptor
 static inline __u8 *uac_mixer_unit_bmControls(struct uac_mixer_unit_descriptor *desc,
                                              int protocol)
 {
-       return (protocol == UAC_VERSION_1) ?
-               &desc->baSourceID[desc->bNrInPins + 4] :
-               &desc->baSourceID[desc->bNrInPins + 6];
+       switch (protocol) {
+       case UAC_VERSION_1:
+               return &desc->baSourceID[desc->bNrInPins + 4];
+       case UAC_VERSION_2:
+               return &desc->baSourceID[desc->bNrInPins + 6];
+       case UAC_VERSION_3:
+               return &desc->baSourceID[desc->bNrInPins + 2];
+       default:
+               return NULL;
+       }
+}
+
+static inline __u16 uac3_mixer_unit_wClusterDescrID(struct uac_mixer_unit_descriptor *desc)
+{
+       return (desc->baSourceID[desc->bNrInPins + 1] << 8) |
+               desc->baSourceID[desc->bNrInPins];
 }
 
 static inline __u8 uac_mixer_unit_iMixer(struct uac_mixer_unit_descriptor *desc)

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 173979e05e6352b42a711ea1a8ffdceafc10c663..c4abb3bca2ad0ebec83ee319da708b5cf6a75f87 100644 (file)
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -716,6 +716,66 @@ static int get_term_name(struct snd_usb_audio *chip, struct usb_audio_term *iter
        return 0;
 }
 
+/*
+ * Get logical cluster information for UAC3 devices.
+ */
+static int get_cluster_channels_v3(struct mixer_build *state, unsigned int cluster_id)
+{
+       struct uac3_cluster_header_descriptor c_header;
+       int err;
+
+       err = snd_usb_ctl_msg(state->chip->dev,
+                       usb_rcvctrlpipe(state->chip->dev, 0),
+                       UAC3_CS_REQ_HIGH_CAPABILITY_DESCRIPTOR,
+                       USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,
+                       cluster_id,
+                       snd_usb_ctrl_intf(state->chip),
+                       &c_header, sizeof(c_header));
+       if (err < 0)
+               goto error;
+       if (err != sizeof(c_header)) {
+               err = -EIO;
+               goto error;
+       }
+
+       return c_header.bNrChannels;
+
+error:
+       usb_audio_err(state->chip, "cannot request logical cluster ID: %d (err: %d)\n", cluster_id, err);
+       return err;
+}
+
+/*
+ * Get number of channels for a Mixer Unit.
+ */
+static int uac_mixer_unit_get_channels(struct mixer_build *state,
+                                      struct uac_mixer_unit_descriptor *desc)
+{
+       int mu_channels;
+
+       if (desc->bLength < 11)
+               return -EINVAL;
+       if (!desc->bNrInPins)
+               return -EINVAL;
+
+       switch (state->mixer->protocol) {
+       case UAC_VERSION_1:
+       case UAC_VERSION_2:
+       default:
+               mu_channels = uac_mixer_unit_bNrChannels(desc);
+               break;
+       case UAC_VERSION_3:
+               mu_channels = get_cluster_channels_v3(state,
+                               uac3_mixer_unit_wClusterDescrID(desc));
+               break;
+       }
+
+       if (!mu_channels)
+               return -EINVAL;
+
+       return mu_channels;
+}
+
 /*
  * parse the source unit recursively until it reaches to a terminal
  * or a branched unit.
@@ -863,6 +923,18 @@ static int check_input_term(struct mixer_build *state, int id,
                                term->name = le16_to_cpu(d->wClockSourceStr);
                                return 0;
                        }
+                       case UAC3_MIXER_UNIT: {
+                               struct uac_mixer_unit_descriptor *d = p1;
+
+                               err = uac_mixer_unit_get_channels(state, d);
+                               if (err < 0)
+                                       return err;
+
+                               term->channels = err;
+                               term->type = d->bDescriptorSubtype << 16; /* virtual type */
+
+                               return 0;
+                       }
                        default:
                                return -ENODEV;
                        }
@@ -1826,11 +1898,10 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid,
  */
 static void build_mixer_unit_ctl(struct mixer_build *state,
                                 struct uac_mixer_unit_descriptor *desc,
-                                int in_pin, int in_ch, int unitid,
-                                struct usb_audio_term *iterm)
+                                int in_pin, int in_ch, int num_outs,
+                                int unitid, struct usb_audio_term *iterm)
 {
        struct usb_mixer_elem_info *cval;
-       unsigned int num_outs = uac_mixer_unit_bNrChannels(desc);
        unsigned int i, len;
        struct snd_kcontrol *kctl;
        const struct usbmix_name_map *map;
@@ -1907,14 +1978,17 @@ static int parse_audio_mixer_unit(struct mixer_build *state, int unitid,
        int input_pins, num_ins, num_outs;
        int pin, ich, err;
 
-       if (desc->bLength < 11 || !(input_pins = desc->bNrInPins) ||
-           !(num_outs = uac_mixer_unit_bNrChannels(desc))) {
+       err = uac_mixer_unit_get_channels(state, desc);
+       if (err < 0) {
                usb_audio_err(state->chip,
                              "invalid MIXER UNIT descriptor %d\n",
                              unitid);
-               return -EINVAL;
+               return err;
        }
 
+       num_outs = err;
+       input_pins = desc->bNrInPins;
+
        num_ins = 0;
        ich = 0;
        for (pin = 0; pin < input_pins; pin++) {
@@ -1941,7 +2015,7 @@ static int parse_audio_mixer_unit(struct mixer_build *state, int unitid,
                                }
                        }
                        if (ich_has_controls)
-                               build_mixer_unit_ctl(state, desc, pin, ich,
+                               build_mixer_unit_ctl(state, desc, pin, ich, num_outs,
                                                     unitid, &iterm);
                }
        }