projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ALSA: usb-audio: extend KEF X300A FU 10 tweak to Arcam rPAC
[deliverable/linux.git]
/
sound
/
usb
/
mixer_maps.c
diff --git
a/sound/usb/mixer_maps.c
b/sound/usb/mixer_maps.c
index d1d72ff50347a3118c2e90d5452457b8948ad0d6..b703cb3cda1993402d60efc03e9e7d840cb68f72 100644
(file)
--- a/
sound/usb/mixer_maps.c
+++ b/
sound/usb/mixer_maps.c
@@
-179,6
+179,11
@@
static struct usbmix_name_map audigy2nx_map[] = {
{ 0 } /* terminator */
};
{ 0 } /* terminator */
};
+static struct usbmix_name_map mbox1_map[] = {
+ { 1, "Clock" },
+ { 0 } /* terminator */
+};
+
static struct usbmix_selector_map c400_selectors[] = {
{
.id = 0x80,
static struct usbmix_selector_map c400_selectors[] = {
{
.id = 0x80,
@@
-328,8
+333,11
@@
static struct usbmix_name_map gamecom780_map[] = {
{}
};
{}
};
-static const struct usbmix_name_map kef_x300a_map[] = {
- { 10, NULL }, /* firmware locks up (?) when we try to access this FU */
+/* some (all?) SCMS USB3318 devices are affected by a firmware lock up
+ * when anything attempts to access FU 10 (control)
+ */
+static const struct usbmix_name_map scms_usb3318_map[] = {
+ { 10, NULL },
{ 0 }
};
{ 0 }
};
@@
-415,6
+423,10
@@
static struct usbmix_ctl_map usbmix_ctl_maps[] = {
.id = USB_ID(0x0ccd, 0x0028),
.map = aureon_51_2_map,
},
.id = USB_ID(0x0ccd, 0x0028),
.map = aureon_51_2_map,
},
+ {
+ .id = USB_ID(0x0dba, 0x1000),
+ .map = mbox1_map,
+ },
{
.id = USB_ID(0x13e5, 0x0001),
.map = scratch_live_map,
{
.id = USB_ID(0x13e5, 0x0001),
.map = scratch_live_map,
@@
-425,8
+437,14
@@
static struct usbmix_ctl_map usbmix_ctl_maps[] = {
.map = ebox44_map,
},
{
.map = ebox44_map,
},
{
+ /* KEF X300A */
.id = USB_ID(0x27ac, 0x1000),
.id = USB_ID(0x27ac, 0x1000),
- .map = kef_x300a_map,
+ .map = scms_usb3318_map,
+ },
+ {
+ /* Arcam rPAC */
+ .id = USB_ID(0x25c4, 0x0003),
+ .map = scms_usb3318_map,
},
{ 0 } /* terminator */
};
},
{ 0 } /* terminator */
};
This page took
0.025003 seconds
and
5
git commands to generate.