Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 22787
b: refs/heads/master
c: c7a93b8
h: refs/heads/master
i:
  22785: 2b0ce1a
  22783: ff4af8d
v: v3
  • Loading branch information
Clemens Ladisch authored and Jaroslav Kysela committed Mar 22, 2006
1 parent 29b50c0 commit 23bfade
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9808dc962f6780ce7eac47c82400fede7f4a08b3
refs/heads/master: c7a93b852bf9ffcf466b304fa3cfac8823f9b932
20 changes: 20 additions & 0 deletions trunk/sound/usb/usbmixer_maps.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <James@superbug.demon.co.uk>
* 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.)
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 23bfade

Please sign in to comment.