lkml.org 
[lkml]   [2015]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 10/82] ALSA: usb-audio: add dB range mapping for some devices
    Date
    From: Yao-Wen Mao <yaowen@google.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit 2d1cb7f658fb9c3ba8f9dab8aca297d4dfdec835 upstream.

    Add the correct dB ranges of Bose Companion 5 and Drangonfly DAC 1.2.

    Signed-off-by: Yao-Wen Mao <yaowen@google.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    sound/usb/mixer_maps.c | 24 ++++++++++++++++++++++++
    1 file changed, 24 insertions(+)

    diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c
    index d06fbd9f7cbe..2d17f40fb16d 100644
    --- a/sound/usb/mixer_maps.c
    +++ b/sound/usb/mixer_maps.c
    @@ -330,6 +330,20 @@ static const struct usbmix_name_map scms_usb3318_map[] = {
    { 0 }
    };

    +/* Bose companion 5, the dB conversion factor is 16 instead of 256 */
    +static struct usbmix_dB_map bose_companion5_dB = {-5006, -6};
    +static struct usbmix_name_map bose_companion5_map[] = {
    + { 3, NULL, .dB = &bose_companion5_dB },
    + { 0 } /* terminator */
    +};
    +
    +/* Dragonfly DAC 1.2, the dB conversion factor is 1 instead of 256 */
    +static struct usbmix_dB_map dragonfly_1_2_dB = {0, 5000};
    +static struct usbmix_name_map dragonfly_1_2_map[] = {
    + { 7, NULL, .dB = &dragonfly_1_2_dB },
    + { 0 } /* terminator */
    +};
    +
    /*
    * Control map entries
    */
    @@ -432,6 +446,16 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = {
    .id = USB_ID(0x25c4, 0x0003),
    .map = scms_usb3318_map,
    },
    + {
    + /* Bose Companion 5 */
    + .id = USB_ID(0x05a7, 0x1020),
    + .map = bose_companion5_map,
    + },
    + {
    + /* Dragonfly DAC 1.2 */
    + .id = USB_ID(0x21b4, 0x0081),
    + .map = dragonfly_1_2_map,
    + },
    { 0 } /* terminator */
    };

    --
    2.5.0


    \
     
     \ /
      Last update: 2015-08-24 12:01    [W:4.190 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site