|
@@ -61,6 +61,7 @@ static const struct rc_config {
|
|
|
{ USB_ID(0x041e, 0x3020), 2, 1, 6, 6, 18, 0x0013 }, /* Audigy 2 NX */
|
|
|
{ USB_ID(0x041e, 0x3040), 2, 2, 6, 6, 2, 0x6e91 }, /* Live! 24-bit */
|
|
|
{ USB_ID(0x041e, 0x3042), 0, 1, 1, 1, 1, 0x000d }, /* Usb X-Fi S51 */
|
|
|
+ { USB_ID(0x041e, 0x30df), 0, 1, 1, 1, 1, 0x000d }, /* Usb X-Fi S51 Pro */
|
|
|
{ USB_ID(0x041e, 0x3048), 2, 2, 6, 6, 2, 0x6e91 }, /* Toshiba SB0500 */
|
|
|
};
|
|
|
|
|
@@ -188,6 +189,12 @@ static int snd_audigy2nx_led_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e
|
|
|
usb_sndctrlpipe(mixer->chip->dev, 0), 0x24,
|
|
|
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER,
|
|
|
!value, 0, NULL, 0, 100);
|
|
|
+ /* USB X-Fi S51 Pro */
|
|
|
+ if (mixer->chip->usb_id == USB_ID(0x041e, 0x30df))
|
|
|
+ err = snd_usb_ctl_msg(mixer->chip->dev,
|
|
|
+ usb_sndctrlpipe(mixer->chip->dev, 0), 0x24,
|
|
|
+ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER,
|
|
|
+ !value, 0, NULL, 0, 100);
|
|
|
else
|
|
|
err = snd_usb_ctl_msg(mixer->chip->dev,
|
|
|
usb_sndctrlpipe(mixer->chip->dev, 0), 0x24,
|
|
@@ -234,9 +241,13 @@ static int snd_audigy2nx_controls_create(struct usb_mixer_interface *mixer)
|
|
|
/* USB X-Fi S51 doesn't have a CMSS LED */
|
|
|
if ((mixer->chip->usb_id == USB_ID(0x041e, 0x3042)) && i == 0)
|
|
|
continue;
|
|
|
+ /* USB X-Fi S51 Pro doesn't have one either */
|
|
|
+ if ((mixer->chip->usb_id == USB_ID(0x041e, 0x30df)) && i == 0)
|
|
|
+ continue;
|
|
|
if (i > 1 && /* Live24ext has 2 LEDs only */
|
|
|
(mixer->chip->usb_id == USB_ID(0x041e, 0x3040) ||
|
|
|
mixer->chip->usb_id == USB_ID(0x041e, 0x3042) ||
|
|
|
+ mixer->chip->usb_id == USB_ID(0x041e, 0x30df) ||
|
|
|
mixer->chip->usb_id == USB_ID(0x041e, 0x3048)))
|
|
|
break;
|
|
|
err = snd_ctl_add(mixer->chip->card,
|
|
@@ -512,6 +523,7 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
|
|
|
case USB_ID(0x041e, 0x3020):
|
|
|
case USB_ID(0x041e, 0x3040):
|
|
|
case USB_ID(0x041e, 0x3042):
|
|
|
+ case USB_ID(0x041e, 0x30df):
|
|
|
case USB_ID(0x041e, 0x3048):
|
|
|
err = snd_audigy2nx_controls_create(mixer);
|
|
|
if (err < 0)
|