Gitweb: http://git.kernel.org/linus/3195954da9cdb1cadb2059921c62e69d376c624f
Commit: 3195954da9cdb1cadb2059921c62e69d376c624f
Parent: 913ae5a24efd27deef4fc154953871b62d0d99cd
Author: Andrea Borgia <andrea@borgia.bo.it>
AuthorDate: Wed Jan 7 22:58:50 2009 +0100
Committer: Takashi Iwai <tiwai@suse.de>
CommitDate: Wed Jan 7 23:32:04 2009 +0100
ALSA: preliminary support for Toshiba SB-0500
The Toshiba Multimedia Center SB-0500 is a rebranded version of the
Creative Technology SB Live! 24-bit External: it shares the same chipset
and only has minor cosmetic differences. Remote controller works with
alsa_usb module, basic audio is there and mixer controls are mostly
untested.
Signed-off-by: Andrea Borgia <andrea@borgia.bo.it>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/usb/usbmixer.c | 15 ++++++++++-----
sound/usb/usbmixer_maps.c | 5 +++++
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
index 00397c8..bc8bd00 100644
--- a/sound/usb/usbmixer.c
+++ b/sound/usb/usbmixer.c
@@ -66,6 +66,7 @@ static const struct rc_config {
{ USB_ID(0x041e, 0x3000), 0, 1, 2, 1, 18, 0x0013 }, /* Extigy */
{ 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, 0x3048), 2, 2, 6, 6, 2, 0x6e91 }, /* Toshiba SB0500 */
};
struct usb_mixer_interface {
@@ -1706,7 +1707,8 @@ static void snd_usb_mixer_memory_change(struct usb_mixer_interface *mixer,
break;
/* live24ext: 4 = line-in jack */
case 3: /* hp-out jack (may actuate Mute) */
- if (mixer->chip->usb_id == USB_ID(0x041e, 0x3040))
+ if (mixer->chip->usb_id == USB_ID(0x041e, 0x3040) ||
+ mixer->chip->usb_id == USB_ID(0x041e, 0x3048))
snd_usb_mixer_notify_id(mixer, mixer->rc_cfg->mute_mixer_id);
break;
default:
@@ -1956,8 +1958,9 @@ static int ...
