Commit 69b1f1e8 authored by Timofei Bondarenko's avatar Timofei Bondarenko Committed by Jaroslav Kysela

[ALSA] usb-audio - SB Live24-External better handling

This patch improves support for 'SB Live 24-bit Extarnal' USB card.
1) This card can go into muted state when a headphones connected or
disconnected. So notify mixer about changes in headphone jack.
2) Add LED controls and procfs support just as in similar Audigy 2 NX card.
3) Rename 'PCM Capture' conrol to 'Mic Capture' to reflect reality:
the card may adjust microphone input level only.
Signed-off-by: default avatarTimofei Bondarenko <tim@ipi.ac.ru>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 04576525
...@@ -1703,6 +1703,11 @@ static void snd_usb_mixer_memory_change(struct usb_mixer_interface *mixer, ...@@ -1703,6 +1703,11 @@ static void snd_usb_mixer_memory_change(struct usb_mixer_interface *mixer,
case 19: /* speaker out jacks */ case 19: /* speaker out jacks */
case 20: /* headphones out jack */ case 20: /* headphones out jack */
break; break;
/* live24ext: 4 = line-in jack */
case 3: /* hp-out jack (may actuate Mute) */
if (mixer->chip->usb_id == USB_ID(0x041e, 0x3040))
snd_usb_mixer_notify_id(mixer, mixer->rc_cfg->mute_mixer_id);
break;
default: default:
snd_printd(KERN_DEBUG "memory change in unknown unit %d\n", unitid); snd_printd(KERN_DEBUG "memory change in unknown unit %d\n", unitid);
break; break;
...@@ -1951,6 +1956,9 @@ static int snd_audigy2nx_controls_create(struct usb_mixer_interface *mixer) ...@@ -1951,6 +1956,9 @@ static int snd_audigy2nx_controls_create(struct usb_mixer_interface *mixer)
int i, err; int i, err;
for (i = 0; i < ARRAY_SIZE(snd_audigy2nx_controls); ++i) { for (i = 0; i < ARRAY_SIZE(snd_audigy2nx_controls); ++i) {
if (i > 1 && /* Live24ext has 2 LEDs only */
mixer->chip->usb_id == USB_ID(0x041e, 0x3040))
break;
err = snd_ctl_add(mixer->chip->card, err = snd_ctl_add(mixer->chip->card,
snd_ctl_new1(&snd_audigy2nx_controls[i], mixer)); snd_ctl_new1(&snd_audigy2nx_controls[i], mixer));
if (err < 0) if (err < 0)
...@@ -1963,28 +1971,42 @@ static int snd_audigy2nx_controls_create(struct usb_mixer_interface *mixer) ...@@ -1963,28 +1971,42 @@ static int snd_audigy2nx_controls_create(struct usb_mixer_interface *mixer)
static void snd_audigy2nx_proc_read(struct snd_info_entry *entry, static void snd_audigy2nx_proc_read(struct snd_info_entry *entry,
struct snd_info_buffer *buffer) struct snd_info_buffer *buffer)
{ {
static const struct { static const struct sb_jack {
int unitid; int unitid;
const char *name; const char *name;
} jacks[] = { } jacks_audigy2nx[] = {
{4, "dig in "}, {4, "dig in "},
{7, "line in"}, {7, "line in"},
{19, "spk out"}, {19, "spk out"},
{20, "hph out"}, {20, "hph out"},
{-1, NULL}
}, jacks_live24ext[] = {
{4, "line in"}, /* &1=Line, &2=Mic*/
{3, "hph out"}, /* headphones */
{0, "RC "}, /* last command, 6 bytes see rc_config above */
{-1, NULL}
}; };
const struct sb_jack *jacks;
struct usb_mixer_interface *mixer = entry->private_data; struct usb_mixer_interface *mixer = entry->private_data;
int i, err; int i, err;
u8 buf[3]; u8 buf[3];
snd_iprintf(buffer, "%s jacks\n\n", mixer->chip->card->shortname); snd_iprintf(buffer, "%s jacks\n\n", mixer->chip->card->shortname);
for (i = 0; i < ARRAY_SIZE(jacks); ++i) { if (mixer->chip->usb_id == USB_ID(0x041e, 0x3020))
jacks = jacks_audigy2nx;
else if (mixer->chip->usb_id == USB_ID(0x041e, 0x3040))
jacks = jacks_live24ext;
else
return;
for (i = 0; jacks[i].name; ++i) {
snd_iprintf(buffer, "%s: ", jacks[i].name); snd_iprintf(buffer, "%s: ", jacks[i].name);
err = snd_usb_ctl_msg(mixer->chip->dev, err = snd_usb_ctl_msg(mixer->chip->dev,
usb_rcvctrlpipe(mixer->chip->dev, 0), usb_rcvctrlpipe(mixer->chip->dev, 0),
GET_MEM, USB_DIR_IN | USB_TYPE_CLASS | GET_MEM, USB_DIR_IN | USB_TYPE_CLASS |
USB_RECIP_INTERFACE, 0, USB_RECIP_INTERFACE, 0,
jacks[i].unitid << 8, buf, 3, 100); jacks[i].unitid << 8, buf, 3, 100);
if (err == 3 && buf[0] == 3) if (err == 3 && (buf[0] == 3 || buf[0] == 6))
snd_iprintf(buffer, "%02x %02x\n", buf[1], buf[2]); snd_iprintf(buffer, "%02x %02x\n", buf[1], buf[2]);
else else
snd_iprintf(buffer, "?\n"); snd_iprintf(buffer, "?\n");
...@@ -2022,7 +2044,8 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif) ...@@ -2022,7 +2044,8 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif)
if ((err = snd_usb_soundblaster_remote_init(mixer)) < 0) if ((err = snd_usb_soundblaster_remote_init(mixer)) < 0)
goto _error; goto _error;
if (mixer->chip->usb_id == USB_ID(0x041e, 0x3020)) { if (mixer->chip->usb_id == USB_ID(0x041e, 0x3020) ||
mixer->chip->usb_id == USB_ID(0x041e, 0x3040)) {
struct snd_info_entry *entry; struct snd_info_entry *entry;
if ((err = snd_audigy2nx_controls_create(mixer)) < 0) if ((err = snd_audigy2nx_controls_create(mixer)) < 0)
......
...@@ -187,6 +187,13 @@ static struct usbmix_selector_map audigy2nx_selectors[] = { ...@@ -187,6 +187,13 @@ static struct usbmix_selector_map audigy2nx_selectors[] = {
{ 0 } /* terminator */ { 0 } /* terminator */
}; };
/* Creative SoundBlaster Live! 24-bit External */
static struct usbmix_name_map live24ext_map[] = {
/* 2: PCM Playback Volume */
{ 5, "Mic Capture" }, /* FU, default PCM Capture Volume */
{ 0 } /* terminator */
};
/* LineX FM Transmitter entry - needed to bypass controls bug */ /* LineX FM Transmitter entry - needed to bypass controls bug */
static struct usbmix_name_map linex_map[] = { static struct usbmix_name_map linex_map[] = {
/* 1: IT pcm */ /* 1: IT pcm */
...@@ -273,6 +280,10 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = { ...@@ -273,6 +280,10 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = {
.map = audigy2nx_map, .map = audigy2nx_map,
.selector_map = audigy2nx_selectors, .selector_map = audigy2nx_selectors,
}, },
{
.id = USB_ID(0x041e, 0x3040),
.map = live24ext_map,
},
{ {
/* Hercules DJ Console (Windows Edition) */ /* Hercules DJ Console (Windows Edition) */
.id = USB_ID(0x06f8, 0xb000), .id = USB_ID(0x06f8, 0xb000),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment