From 23bfadec31ea96fe4afc8361fa20bd814597911c Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Thu, 16 Mar 2006 08:25:56 +0100 Subject: [PATCH] --- yaml --- r: 22787 b: refs/heads/master c: c7a93b852bf9ffcf466b304fa3cfac8823f9b932 h: refs/heads/master i: 22785: 2b0ce1ab3d1849c7f93177c8d1d8c566f984e5c2 22783: ff4af8deeadbd91a82ab92f9fcfe9d0d538d6dbb v: v3 --- [refs] | 2 +- trunk/sound/usb/usbmixer_maps.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 10d35d0ec16b..372dc8f66b7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9808dc962f6780ce7eac47c82400fede7f4a08b3 +refs/heads/master: c7a93b852bf9ffcf466b304fa3cfac8823f9b932 diff --git a/trunk/sound/usb/usbmixer_maps.c b/trunk/sound/usb/usbmixer_maps.c index c1264434e50a..37accb68652d 100644 --- a/trunk/sound/usb/usbmixer_maps.c +++ b/trunk/sound/usb/usbmixer_maps.c @@ -195,6 +195,22 @@ static struct usbmix_name_map linex_map[] = { { 0 } /* terminator */ }; +static struct usbmix_name_map maya44_map[] = { + /* 1: IT line */ + { 2, "Line Playback" }, /* FU */ + /* 3: IT line */ + { 4, "Line Playback" }, /* FU */ + /* 5: IT pcm playback */ + /* 6: MU */ + { 7, "Master Playback" }, /* FU */ + /* 8: OT speaker */ + /* 9: IT line */ + { 10, "Line Capture" }, /* FU */ + /* 11: MU */ + /* 12: OT pcm capture */ + { } +}; + /* Section "justlink_map" below added by James Courtier-Dutton * sourced from Maplin Electronics (http://www.maplin.co.uk), part number A56AK * Part has 2 connectors that act as a single output. (TOSLINK Optical for digital out, and 3.5mm Jack for Analogue out.) @@ -252,6 +268,10 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = { .map = linex_map, .ignore_ctl_error = 1, }, + { + .id = USB_ID(0x0a92, 0x0091), + .map = maya44_map, + }, { .id = USB_ID(0x0c45, 0x1158), .map = justlink_map,