Commit 9b0c474f authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Use own workqueue
  ALSA: hda - add support for Intel DX58SO board
  ASoC: TWL4030: Module unloading fix
  ALSA: hda - create hda_codec.control_mutex for kcontrol->private_value
  ALSA: caiaq - Version 1.3.10
  ALSA: hda - Add quirk for Dell Inspiron Mini9
  ALSA: caiaq - Fix Oops with MIDI
  ASoC: TWL4030: Change the soc_value_enum back to soc_enum
  ASoC: Merge the soc_value_enum to soc_enum struct
  ALSA: hda - Add quirks for Acer Aspire 5930G and 6930G
  ALSA: hda - Add codec ID for MCP73 HDMI
  ALSA: hda - Fix typos for AD1882 codecs
  ALSA: hda - Add quirk for HP 2230s
parents ae04d140 05f93414
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
.private_value = (unsigned long)&xenum } .private_value = (unsigned long)&xenum }
#define SOC_DAPM_VALUE_ENUM(xname, xenum) \ #define SOC_DAPM_VALUE_ENUM(xname, xenum) \
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
.info = snd_soc_info_value_enum_double, \ .info = snd_soc_info_enum_double, \
.get = snd_soc_dapm_get_value_enum_double, \ .get = snd_soc_dapm_get_value_enum_double, \
.put = snd_soc_dapm_put_value_enum_double, \ .put = snd_soc_dapm_put_value_enum_double, \
.private_value = (unsigned long)&xenum } .private_value = (unsigned long)&xenum }
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
.private_value = (unsigned long)&xenum } .private_value = (unsigned long)&xenum }
#define SOC_VALUE_ENUM(xname, xenum) \ #define SOC_VALUE_ENUM(xname, xenum) \
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,\ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,\
.info = snd_soc_info_value_enum_double, \ .info = snd_soc_info_enum_double, \
.get = snd_soc_get_value_enum_double, \ .get = snd_soc_get_value_enum_double, \
.put = snd_soc_put_value_enum_double, \ .put = snd_soc_put_value_enum_double, \
.private_value = (unsigned long)&xenum } .private_value = (unsigned long)&xenum }
...@@ -211,8 +211,6 @@ int snd_soc_get_enum_double(struct snd_kcontrol *kcontrol, ...@@ -211,8 +211,6 @@ int snd_soc_get_enum_double(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol); struct snd_ctl_elem_value *ucontrol);
int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol, int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol); struct snd_ctl_elem_value *ucontrol);
int snd_soc_info_value_enum_double(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo);
int snd_soc_get_value_enum_double(struct snd_kcontrol *kcontrol, int snd_soc_get_value_enum_double(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol); struct snd_ctl_elem_value *ucontrol);
int snd_soc_put_value_enum_double(struct snd_kcontrol *kcontrol, int snd_soc_put_value_enum_double(struct snd_kcontrol *kcontrol,
...@@ -414,17 +412,6 @@ struct soc_mixer_control { ...@@ -414,17 +412,6 @@ struct soc_mixer_control {
/* enumerated kcontrol */ /* enumerated kcontrol */
struct soc_enum { struct soc_enum {
unsigned short reg;
unsigned short reg2;
unsigned char shift_l;
unsigned char shift_r;
unsigned int max;
const char **texts;
void *dapm;
};
/* semi enumerated kcontrol */
struct soc_value_enum {
unsigned short reg; unsigned short reg;
unsigned short reg2; unsigned short reg2;
unsigned char shift_l; unsigned char shift_l;
......
...@@ -135,7 +135,6 @@ void snd_hda_detach_beep_device(struct hda_codec *codec) ...@@ -135,7 +135,6 @@ void snd_hda_detach_beep_device(struct hda_codec *codec)
struct hda_beep *beep = codec->beep; struct hda_beep *beep = codec->beep;
if (beep) { if (beep) {
cancel_work_sync(&beep->beep_work); cancel_work_sync(&beep->beep_work);
flush_scheduled_work();
input_unregister_device(beep->dev); input_unregister_device(beep->dev);
kfree(beep); kfree(beep);
......
...@@ -373,7 +373,7 @@ int snd_hda_queue_unsol_event(struct hda_bus *bus, u32 res, u32 res_ex) ...@@ -373,7 +373,7 @@ int snd_hda_queue_unsol_event(struct hda_bus *bus, u32 res, u32 res_ex)
unsol->queue[wp] = res; unsol->queue[wp] = res;
unsol->queue[wp + 1] = res_ex; unsol->queue[wp + 1] = res_ex;
schedule_work(&unsol->work); queue_work(bus->workq, &unsol->work);
return 0; return 0;
} }
...@@ -437,15 +437,17 @@ static int snd_hda_bus_free(struct hda_bus *bus) ...@@ -437,15 +437,17 @@ static int snd_hda_bus_free(struct hda_bus *bus)
if (!bus) if (!bus)
return 0; return 0;
if (bus->unsol) { if (bus->workq)
flush_scheduled_work(); flush_workqueue(bus->workq);
if (bus->unsol)
kfree(bus->unsol); kfree(bus->unsol);
}
list_for_each_entry_safe(codec, n, &bus->codec_list, list) { list_for_each_entry_safe(codec, n, &bus->codec_list, list) {
snd_hda_codec_free(codec); snd_hda_codec_free(codec);
} }
if (bus->ops.private_free) if (bus->ops.private_free)
bus->ops.private_free(bus); bus->ops.private_free(bus);
if (bus->workq)
destroy_workqueue(bus->workq);
kfree(bus); kfree(bus);
return 0; return 0;
} }
...@@ -485,6 +487,7 @@ int /*__devinit*/ snd_hda_bus_new(struct snd_card *card, ...@@ -485,6 +487,7 @@ int /*__devinit*/ snd_hda_bus_new(struct snd_card *card,
{ {
struct hda_bus *bus; struct hda_bus *bus;
int err; int err;
char qname[8];
static struct snd_device_ops dev_ops = { static struct snd_device_ops dev_ops = {
.dev_register = snd_hda_bus_dev_register, .dev_register = snd_hda_bus_dev_register,
.dev_free = snd_hda_bus_dev_free, .dev_free = snd_hda_bus_dev_free,
...@@ -514,6 +517,14 @@ int /*__devinit*/ snd_hda_bus_new(struct snd_card *card, ...@@ -514,6 +517,14 @@ int /*__devinit*/ snd_hda_bus_new(struct snd_card *card,
mutex_init(&bus->cmd_mutex); mutex_init(&bus->cmd_mutex);
INIT_LIST_HEAD(&bus->codec_list); INIT_LIST_HEAD(&bus->codec_list);
snprintf(qname, sizeof(qname), "hda%d", card->number);
bus->workq = create_workqueue(qname);
if (!bus->workq) {
snd_printk(KERN_ERR "cannot create workqueue %s\n", qname);
kfree(bus);
return -ENOMEM;
}
err = snd_device_new(card, SNDRV_DEV_BUS, bus, &dev_ops); err = snd_device_new(card, SNDRV_DEV_BUS, bus, &dev_ops);
if (err < 0) { if (err < 0) {
snd_hda_bus_free(bus); snd_hda_bus_free(bus);
...@@ -684,7 +695,7 @@ static void snd_hda_codec_free(struct hda_codec *codec) ...@@ -684,7 +695,7 @@ static void snd_hda_codec_free(struct hda_codec *codec)
return; return;
#ifdef CONFIG_SND_HDA_POWER_SAVE #ifdef CONFIG_SND_HDA_POWER_SAVE
cancel_delayed_work(&codec->power_work); cancel_delayed_work(&codec->power_work);
flush_scheduled_work(); flush_workqueue(codec->bus->workq);
#endif #endif
list_del(&codec->list); list_del(&codec->list);
snd_array_free(&codec->mixers); snd_array_free(&codec->mixers);
...@@ -735,6 +746,7 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr ...@@ -735,6 +746,7 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr
codec->bus = bus; codec->bus = bus;
codec->addr = codec_addr; codec->addr = codec_addr;
mutex_init(&codec->spdif_mutex); mutex_init(&codec->spdif_mutex);
mutex_init(&codec->control_mutex);
init_hda_cache(&codec->amp_cache, sizeof(struct hda_amp_info)); init_hda_cache(&codec->amp_cache, sizeof(struct hda_amp_info));
init_hda_cache(&codec->cmd_cache, sizeof(struct hda_cache_head)); init_hda_cache(&codec->cmd_cache, sizeof(struct hda_cache_head));
snd_array_init(&codec->mixers, sizeof(struct snd_kcontrol *), 32); snd_array_init(&codec->mixers, sizeof(struct snd_kcontrol *), 32);
...@@ -1272,7 +1284,7 @@ void snd_hda_codec_reset(struct hda_codec *codec) ...@@ -1272,7 +1284,7 @@ void snd_hda_codec_reset(struct hda_codec *codec)
#ifdef CONFIG_SND_HDA_POWER_SAVE #ifdef CONFIG_SND_HDA_POWER_SAVE
cancel_delayed_work(&codec->power_work); cancel_delayed_work(&codec->power_work);
flush_scheduled_work(); flush_workqueue(codec->bus->workq);
#endif #endif
snd_hda_ctls_clear(codec); snd_hda_ctls_clear(codec);
/* relase PCMs */ /* relase PCMs */
...@@ -1418,12 +1430,12 @@ int snd_hda_mixer_bind_switch_get(struct snd_kcontrol *kcontrol, ...@@ -1418,12 +1430,12 @@ int snd_hda_mixer_bind_switch_get(struct snd_kcontrol *kcontrol,
unsigned long pval; unsigned long pval;
int err; int err;
mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */ mutex_lock(&codec->control_mutex);
pval = kcontrol->private_value; pval = kcontrol->private_value;
kcontrol->private_value = pval & ~AMP_VAL_IDX_MASK; /* index 0 */ kcontrol->private_value = pval & ~AMP_VAL_IDX_MASK; /* index 0 */
err = snd_hda_mixer_amp_switch_get(kcontrol, ucontrol); err = snd_hda_mixer_amp_switch_get(kcontrol, ucontrol);
kcontrol->private_value = pval; kcontrol->private_value = pval;
mutex_unlock(&codec->spdif_mutex); mutex_unlock(&codec->control_mutex);
return err; return err;
} }
EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_switch_get); EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_switch_get);
...@@ -1435,7 +1447,7 @@ int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol, ...@@ -1435,7 +1447,7 @@ int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol,
unsigned long pval; unsigned long pval;
int i, indices, err = 0, change = 0; int i, indices, err = 0, change = 0;
mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */ mutex_lock(&codec->control_mutex);
pval = kcontrol->private_value; pval = kcontrol->private_value;
indices = (pval & AMP_VAL_IDX_MASK) >> AMP_VAL_IDX_SHIFT; indices = (pval & AMP_VAL_IDX_MASK) >> AMP_VAL_IDX_SHIFT;
for (i = 0; i < indices; i++) { for (i = 0; i < indices; i++) {
...@@ -1447,7 +1459,7 @@ int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol, ...@@ -1447,7 +1459,7 @@ int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol,
change |= err; change |= err;
} }
kcontrol->private_value = pval; kcontrol->private_value = pval;
mutex_unlock(&codec->spdif_mutex); mutex_unlock(&codec->control_mutex);
return err < 0 ? err : change; return err < 0 ? err : change;
} }
EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_switch_put); EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_switch_put);
...@@ -1462,12 +1474,12 @@ int snd_hda_mixer_bind_ctls_info(struct snd_kcontrol *kcontrol, ...@@ -1462,12 +1474,12 @@ int snd_hda_mixer_bind_ctls_info(struct snd_kcontrol *kcontrol,
struct hda_bind_ctls *c; struct hda_bind_ctls *c;
int err; int err;
mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */ mutex_lock(&codec->control_mutex);
c = (struct hda_bind_ctls *)kcontrol->private_value; c = (struct hda_bind_ctls *)kcontrol->private_value;
kcontrol->private_value = *c->values; kcontrol->private_value = *c->values;
err = c->ops->info(kcontrol, uinfo); err = c->ops->info(kcontrol, uinfo);
kcontrol->private_value = (long)c; kcontrol->private_value = (long)c;
mutex_unlock(&codec->spdif_mutex); mutex_unlock(&codec->control_mutex);
return err; return err;
} }
EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_info); EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_info);
...@@ -1479,12 +1491,12 @@ int snd_hda_mixer_bind_ctls_get(struct snd_kcontrol *kcontrol, ...@@ -1479,12 +1491,12 @@ int snd_hda_mixer_bind_ctls_get(struct snd_kcontrol *kcontrol,
struct hda_bind_ctls *c; struct hda_bind_ctls *c;
int err; int err;
mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */ mutex_lock(&codec->control_mutex);
c = (struct hda_bind_ctls *)kcontrol->private_value; c = (struct hda_bind_ctls *)kcontrol->private_value;
kcontrol->private_value = *c->values; kcontrol->private_value = *c->values;
err = c->ops->get(kcontrol, ucontrol); err = c->ops->get(kcontrol, ucontrol);
kcontrol->private_value = (long)c; kcontrol->private_value = (long)c;
mutex_unlock(&codec->spdif_mutex); mutex_unlock(&codec->control_mutex);
return err; return err;
} }
EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_get); EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_get);
...@@ -1497,7 +1509,7 @@ int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol, ...@@ -1497,7 +1509,7 @@ int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol,
unsigned long *vals; unsigned long *vals;
int err = 0, change = 0; int err = 0, change = 0;
mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */ mutex_lock(&codec->control_mutex);
c = (struct hda_bind_ctls *)kcontrol->private_value; c = (struct hda_bind_ctls *)kcontrol->private_value;
for (vals = c->values; *vals; vals++) { for (vals = c->values; *vals; vals++) {
kcontrol->private_value = *vals; kcontrol->private_value = *vals;
...@@ -1507,7 +1519,7 @@ int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol, ...@@ -1507,7 +1519,7 @@ int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol,
change |= err; change |= err;
} }
kcontrol->private_value = (long)c; kcontrol->private_value = (long)c;
mutex_unlock(&codec->spdif_mutex); mutex_unlock(&codec->control_mutex);
return err < 0 ? err : change; return err < 0 ? err : change;
} }
EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_put); EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_put);
...@@ -1519,12 +1531,12 @@ int snd_hda_mixer_bind_tlv(struct snd_kcontrol *kcontrol, int op_flag, ...@@ -1519,12 +1531,12 @@ int snd_hda_mixer_bind_tlv(struct snd_kcontrol *kcontrol, int op_flag,
struct hda_bind_ctls *c; struct hda_bind_ctls *c;
int err; int err;
mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */ mutex_lock(&codec->control_mutex);
c = (struct hda_bind_ctls *)kcontrol->private_value; c = (struct hda_bind_ctls *)kcontrol->private_value;
kcontrol->private_value = *c->values; kcontrol->private_value = *c->values;
err = c->ops->tlv(kcontrol, op_flag, size, tlv); err = c->ops->tlv(kcontrol, op_flag, size, tlv);
kcontrol->private_value = (long)c; kcontrol->private_value = (long)c;
mutex_unlock(&codec->spdif_mutex); mutex_unlock(&codec->control_mutex);
return err; return err;
} }
EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_tlv); EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_tlv);
......
...@@ -614,6 +614,7 @@ struct hda_bus { ...@@ -614,6 +614,7 @@ struct hda_bus {
/* unsolicited event queue */ /* unsolicited event queue */
struct hda_bus_unsolicited *unsol; struct hda_bus_unsolicited *unsol;
struct workqueue_struct *workq; /* common workqueue for codecs */
/* assigned PCMs */ /* assigned PCMs */
DECLARE_BITMAP(pcm_dev_bits, SNDRV_PCM_DEVICES); DECLARE_BITMAP(pcm_dev_bits, SNDRV_PCM_DEVICES);
...@@ -771,6 +772,7 @@ struct hda_codec { ...@@ -771,6 +772,7 @@ struct hda_codec {
struct hda_cache_rec cmd_cache; /* cache for other commands */ struct hda_cache_rec cmd_cache; /* cache for other commands */
struct mutex spdif_mutex; struct mutex spdif_mutex;
struct mutex control_mutex;
unsigned int spdif_status; /* IEC958 status bits */ unsigned int spdif_status; /* IEC958 status bits */
unsigned short spdif_ctls; /* SPDIF control bits */ unsigned short spdif_ctls; /* SPDIF control bits */
unsigned int spdif_in_enable; /* SPDIF input enable? */ unsigned int spdif_in_enable; /* SPDIF input enable? */
......
...@@ -996,10 +996,11 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id) ...@@ -996,10 +996,11 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id)
spin_unlock(&chip->reg_lock); spin_unlock(&chip->reg_lock);
snd_pcm_period_elapsed(azx_dev->substream); snd_pcm_period_elapsed(azx_dev->substream);
spin_lock(&chip->reg_lock); spin_lock(&chip->reg_lock);
} else { } else if (chip->bus && chip->bus->workq) {
/* bogus IRQ, process it later */ /* bogus IRQ, process it later */
azx_dev->irq_pending = 1; azx_dev->irq_pending = 1;
schedule_work(&chip->irq_pending_work); queue_work(chip->bus->workq,
&chip->irq_pending_work);
} }
} }
} }
...@@ -1741,7 +1742,6 @@ static void azx_clear_irq_pending(struct azx *chip) ...@@ -1741,7 +1742,6 @@ static void azx_clear_irq_pending(struct azx *chip)
for (i = 0; i < chip->num_streams; i++) for (i = 0; i < chip->num_streams; i++)
chip->azx_dev[i].irq_pending = 0; chip->azx_dev[i].irq_pending = 0;
spin_unlock_irq(&chip->reg_lock); spin_unlock_irq(&chip->reg_lock);
flush_scheduled_work();
} }
static struct snd_pcm_ops azx_pcm_ops = { static struct snd_pcm_ops azx_pcm_ops = {
......
...@@ -3900,6 +3900,7 @@ static const char *ad1884a_models[AD1884A_MODELS] = { ...@@ -3900,6 +3900,7 @@ static const char *ad1884a_models[AD1884A_MODELS] = {
static struct snd_pci_quirk ad1884a_cfg_tbl[] = { static struct snd_pci_quirk ad1884a_cfg_tbl[] = {
SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE), SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE),
SND_PCI_QUIRK(0x103c, 0x3037, "HP 2230s", AD1884A_LAPTOP),
SND_PCI_QUIRK(0x103c, 0x3056, "HP", AD1884A_MOBILE), SND_PCI_QUIRK(0x103c, 0x3056, "HP", AD1884A_MOBILE),
SND_PCI_QUIRK(0x103c, 0x30e6, "HP 6730b", AD1884A_LAPTOP), SND_PCI_QUIRK(0x103c, 0x30e6, "HP 6730b", AD1884A_LAPTOP),
SND_PCI_QUIRK(0x103c, 0x30e7, "HP EliteBook 8530p", AD1884A_LAPTOP), SND_PCI_QUIRK(0x103c, 0x30e7, "HP EliteBook 8530p", AD1884A_LAPTOP),
...@@ -4262,13 +4263,13 @@ static int patch_ad1882(struct hda_codec *codec) ...@@ -4262,13 +4263,13 @@ static int patch_ad1882(struct hda_codec *codec)
spec->num_adc_nids = ARRAY_SIZE(ad1882_adc_nids); spec->num_adc_nids = ARRAY_SIZE(ad1882_adc_nids);
spec->adc_nids = ad1882_adc_nids; spec->adc_nids = ad1882_adc_nids;
spec->capsrc_nids = ad1882_capsrc_nids; spec->capsrc_nids = ad1882_capsrc_nids;
if (codec->vendor_id == 0x11d1882) if (codec->vendor_id == 0x11d41882)
spec->input_mux = &ad1882_capture_source; spec->input_mux = &ad1882_capture_source;
else else
spec->input_mux = &ad1882a_capture_source; spec->input_mux = &ad1882a_capture_source;
spec->num_mixers = 2; spec->num_mixers = 2;
spec->mixers[0] = ad1882_base_mixers; spec->mixers[0] = ad1882_base_mixers;
if (codec->vendor_id == 0x11d1882) if (codec->vendor_id == 0x11d41882)
spec->mixers[1] = ad1882_loopback_mixers; spec->mixers[1] = ad1882_loopback_mixers;
else else
spec->mixers[1] = ad1882a_loopback_mixers; spec->mixers[1] = ad1882a_loopback_mixers;
......
...@@ -162,12 +162,14 @@ static struct hda_codec_preset snd_hda_preset_nvhdmi[] = { ...@@ -162,12 +162,14 @@ static struct hda_codec_preset snd_hda_preset_nvhdmi[] = {
{ .id = 0x10de0002, .name = "MCP78 HDMI", .patch = patch_nvhdmi }, { .id = 0x10de0002, .name = "MCP78 HDMI", .patch = patch_nvhdmi },
{ .id = 0x10de0007, .name = "MCP7A HDMI", .patch = patch_nvhdmi }, { .id = 0x10de0007, .name = "MCP7A HDMI", .patch = patch_nvhdmi },
{ .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi }, { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi },
{ .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi },
{} /* terminator */ {} /* terminator */
}; };
MODULE_ALIAS("snd-hda-codec-id:10de0002"); MODULE_ALIAS("snd-hda-codec-id:10de0002");
MODULE_ALIAS("snd-hda-codec-id:10de0007"); MODULE_ALIAS("snd-hda-codec-id:10de0007");
MODULE_ALIAS("snd-hda-codec-id:10de0067"); MODULE_ALIAS("snd-hda-codec-id:10de0067");
MODULE_ALIAS("snd-hda-codec-id:10de8001");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Nvidia HDMI HD-audio codec"); MODULE_DESCRIPTION("Nvidia HDMI HD-audio codec");
......
...@@ -1502,11 +1502,11 @@ static int alc_cap_vol_info(struct snd_kcontrol *kcontrol, ...@@ -1502,11 +1502,11 @@ static int alc_cap_vol_info(struct snd_kcontrol *kcontrol,
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
int err; int err;
mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */ mutex_lock(&codec->control_mutex);
kcontrol->private_value = HDA_COMPOSE_AMP_VAL(spec->adc_nids[0], 3, 0, kcontrol->private_value = HDA_COMPOSE_AMP_VAL(spec->adc_nids[0], 3, 0,
HDA_INPUT); HDA_INPUT);
err = snd_hda_mixer_amp_volume_info(kcontrol, uinfo); err = snd_hda_mixer_amp_volume_info(kcontrol, uinfo);
mutex_unlock(&codec->spdif_mutex); /* reuse spdif_mutex */ mutex_unlock(&codec->control_mutex);
return err; return err;
} }
...@@ -1517,11 +1517,11 @@ static int alc_cap_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag, ...@@ -1517,11 +1517,11 @@ static int alc_cap_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag,
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
int err; int err;
mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */ mutex_lock(&codec->control_mutex);
kcontrol->private_value = HDA_COMPOSE_AMP_VAL(spec->adc_nids[0], 3, 0, kcontrol->private_value = HDA_COMPOSE_AMP_VAL(spec->adc_nids[0], 3, 0,
HDA_INPUT); HDA_INPUT);
err = snd_hda_mixer_amp_tlv(kcontrol, op_flag, size, tlv); err = snd_hda_mixer_amp_tlv(kcontrol, op_flag, size, tlv);
mutex_unlock(&codec->spdif_mutex); /* reuse spdif_mutex */ mutex_unlock(&codec->control_mutex);
return err; return err;
} }
...@@ -1537,11 +1537,11 @@ static int alc_cap_getput_caller(struct snd_kcontrol *kcontrol, ...@@ -1537,11 +1537,11 @@ static int alc_cap_getput_caller(struct snd_kcontrol *kcontrol,
unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
int err; int err;
mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */ mutex_lock(&codec->control_mutex);
kcontrol->private_value = HDA_COMPOSE_AMP_VAL(spec->adc_nids[adc_idx], kcontrol->private_value = HDA_COMPOSE_AMP_VAL(spec->adc_nids[adc_idx],
3, 0, HDA_INPUT); 3, 0, HDA_INPUT);
err = func(kcontrol, ucontrol); err = func(kcontrol, ucontrol);
mutex_unlock(&codec->spdif_mutex); /* reuse spdif_mutex */ mutex_unlock(&codec->control_mutex);
return err; return err;
} }
...@@ -8461,6 +8461,10 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { ...@@ -8461,6 +8461,10 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
SND_PCI_QUIRK(0x1025, 0x0121, "Acer Aspire 5920G", ALC883_ACER_ASPIRE), SND_PCI_QUIRK(0x1025, 0x0121, "Acer Aspire 5920G", ALC883_ACER_ASPIRE),
SND_PCI_QUIRK(0x1025, 0x013e, "Acer Aspire 4930G", SND_PCI_QUIRK(0x1025, 0x013e, "Acer Aspire 4930G",
ALC888_ACER_ASPIRE_4930G), ALC888_ACER_ASPIRE_4930G),
SND_PCI_QUIRK(0x1025, 0x013f, "Acer Aspire 5930G",
ALC888_ACER_ASPIRE_4930G),
SND_PCI_QUIRK(0x1025, 0x015e, "Acer Aspire 6930G",
ALC888_ACER_ASPIRE_4930G),
SND_PCI_QUIRK(0x1025, 0, "Acer laptop", ALC883_ACER), /* default Acer */ SND_PCI_QUIRK(0x1025, 0, "Acer laptop", ALC883_ACER), /* default Acer */
SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL), SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL),
SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG), SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG),
...@@ -8522,6 +8526,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { ...@@ -8522,6 +8526,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
SND_PCI_QUIRK(0x1991, 0x5625, "Haier W66", ALC883_HAIER_W66), SND_PCI_QUIRK(0x1991, 0x5625, "Haier W66", ALC883_HAIER_W66),
SND_PCI_QUIRK(0x8086, 0x0001, "DG33BUC", ALC883_3ST_6ch_INTEL), SND_PCI_QUIRK(0x8086, 0x0001, "DG33BUC", ALC883_3ST_6ch_INTEL),
SND_PCI_QUIRK(0x8086, 0x0002, "DG33FBC", ALC883_3ST_6ch_INTEL), SND_PCI_QUIRK(0x8086, 0x0002, "DG33FBC", ALC883_3ST_6ch_INTEL),
SND_PCI_QUIRK(0x8086, 0x0022, "DX58SO", ALC883_3ST_6ch_INTEL),
SND_PCI_QUIRK(0x8086, 0xd601, "D102GGC", ALC883_3ST_6ch), SND_PCI_QUIRK(0x8086, 0xd601, "D102GGC", ALC883_3ST_6ch),
{} {}
}; };
...@@ -11689,6 +11694,7 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = { ...@@ -11689,6 +11694,7 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = {
SND_PCI_QUIRK(0x1025, 0x015b, "Acer Aspire One", SND_PCI_QUIRK(0x1025, 0x015b, "Acer Aspire One",
ALC268_ACER_ASPIRE_ONE), ALC268_ACER_ASPIRE_ONE),
SND_PCI_QUIRK(0x1028, 0x0253, "Dell OEM", ALC268_DELL), SND_PCI_QUIRK(0x1028, 0x0253, "Dell OEM", ALC268_DELL),
SND_PCI_QUIRK(0x1028, 0x02b0, "Dell Inspiron Mini9", ALC268_DELL),
SND_PCI_QUIRK(0x103c, 0x30cc, "TOSHIBA", ALC268_TOSHIBA), SND_PCI_QUIRK(0x103c, 0x30cc, "TOSHIBA", ALC268_TOSHIBA),
SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST), SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST),
SND_PCI_QUIRK(0x1179, 0xff10, "TOSHIBA A205", ALC268_TOSHIBA), SND_PCI_QUIRK(0x1179, 0xff10, "TOSHIBA A205", ALC268_TOSHIBA),
......
...@@ -197,7 +197,7 @@ static const char *twl4030_earpiece_texts[] = ...@@ -197,7 +197,7 @@ static const char *twl4030_earpiece_texts[] =
static const unsigned int twl4030_earpiece_values[] = static const unsigned int twl4030_earpiece_values[] =
{0x0, 0x1, 0x2, 0x4}; {0x0, 0x1, 0x2, 0x4};
static const struct soc_value_enum twl4030_earpiece_enum = static const struct soc_enum twl4030_earpiece_enum =
SOC_VALUE_ENUM_SINGLE(TWL4030_REG_EAR_CTL, 1, 0x7, SOC_VALUE_ENUM_SINGLE(TWL4030_REG_EAR_CTL, 1, 0x7,
ARRAY_SIZE(twl4030_earpiece_texts), ARRAY_SIZE(twl4030_earpiece_texts),
twl4030_earpiece_texts, twl4030_earpiece_texts,
...@@ -213,7 +213,7 @@ static const char *twl4030_predrivel_texts[] = ...@@ -213,7 +213,7 @@ static const char *twl4030_predrivel_texts[] =
static const unsigned int twl4030_predrivel_values[] = static const unsigned int twl4030_predrivel_values[] =
{0x0, 0x1, 0x2, 0x4}; {0x0, 0x1, 0x2, 0x4};
static const struct soc_value_enum twl4030_predrivel_enum = static const struct soc_enum twl4030_predrivel_enum =
SOC_VALUE_ENUM_SINGLE(TWL4030_REG_PREDL_CTL, 1, 0x7, SOC_VALUE_ENUM_SINGLE(TWL4030_REG_PREDL_CTL, 1, 0x7,
ARRAY_SIZE(twl4030_predrivel_texts), ARRAY_SIZE(twl4030_predrivel_texts),
twl4030_predrivel_texts, twl4030_predrivel_texts,
...@@ -229,7 +229,7 @@ static const char *twl4030_predriver_texts[] = ...@@ -229,7 +229,7 @@ static const char *twl4030_predriver_texts[] =
static const unsigned int twl4030_predriver_values[] = static const unsigned int twl4030_predriver_values[] =
{0x0, 0x1, 0x2, 0x4}; {0x0, 0x1, 0x2, 0x4};
static const struct soc_value_enum twl4030_predriver_enum = static const struct soc_enum twl4030_predriver_enum =
SOC_VALUE_ENUM_SINGLE(TWL4030_REG_PREDR_CTL, 1, 0x7, SOC_VALUE_ENUM_SINGLE(TWL4030_REG_PREDR_CTL, 1, 0x7,
ARRAY_SIZE(twl4030_predriver_texts), ARRAY_SIZE(twl4030_predriver_texts),
twl4030_predriver_texts, twl4030_predriver_texts,
...@@ -317,7 +317,7 @@ static const char *twl4030_analoglmic_texts[] = ...@@ -317,7 +317,7 @@ static const char *twl4030_analoglmic_texts[] =
static const unsigned int twl4030_analoglmic_values[] = static const unsigned int twl4030_analoglmic_values[] =
{0x0, 0x1, 0x2, 0x4, 0x8}; {0x0, 0x1, 0x2, 0x4, 0x8};
static const struct soc_value_enum twl4030_analoglmic_enum = static const struct soc_enum twl4030_analoglmic_enum =
SOC_VALUE_ENUM_SINGLE(TWL4030_REG_ANAMICL, 0, 0xf, SOC_VALUE_ENUM_SINGLE(TWL4030_REG_ANAMICL, 0, 0xf,
ARRAY_SIZE(twl4030_analoglmic_texts), ARRAY_SIZE(twl4030_analoglmic_texts),
twl4030_analoglmic_texts, twl4030_analoglmic_texts,
...@@ -333,7 +333,7 @@ static const char *twl4030_analogrmic_texts[] = ...@@ -333,7 +333,7 @@ static const char *twl4030_analogrmic_texts[] =
static const unsigned int twl4030_analogrmic_values[] = static const unsigned int twl4030_analogrmic_values[] =
{0x0, 0x1, 0x4}; {0x0, 0x1, 0x4};
static const struct soc_value_enum twl4030_analogrmic_enum = static const struct soc_enum twl4030_analogrmic_enum =
SOC_VALUE_ENUM_SINGLE(TWL4030_REG_ANAMICR, 0, 0x5, SOC_VALUE_ENUM_SINGLE(TWL4030_REG_ANAMICR, 0, 0x5,
ARRAY_SIZE(twl4030_analogrmic_texts), ARRAY_SIZE(twl4030_analogrmic_texts),
twl4030_analogrmic_texts, twl4030_analogrmic_texts,
...@@ -1280,6 +1280,8 @@ static int twl4030_remove(struct platform_device *pdev) ...@@ -1280,6 +1280,8 @@ static int twl4030_remove(struct platform_device *pdev)
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->codec;
printk(KERN_INFO "TWL4030 Audio Codec remove\n"); printk(KERN_INFO "TWL4030 Audio Codec remove\n");
snd_soc_free_pcms(socdev);
snd_soc_dapm_free(socdev);
kfree(codec); kfree(codec);
return 0; return 0;
......
...@@ -1584,37 +1584,6 @@ int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol, ...@@ -1584,37 +1584,6 @@ int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol,
} }
EXPORT_SYMBOL_GPL(snd_soc_put_enum_double); EXPORT_SYMBOL_GPL(snd_soc_put_enum_double);
/**
* snd_soc_info_value_enum_double - semi enumerated double mixer info callback
* @kcontrol: mixer control
* @uinfo: control element information
*
* Callback to provide information about a double semi enumerated
* mixer control.
*
* Semi enumerated mixer: the enumerated items are referred as values. Can be
* used for handling bitfield coded enumeration for example.
*
* Returns 0 for success.
*/
int snd_soc_info_value_enum_double(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{
struct soc_value_enum *e = (struct soc_value_enum *)
kcontrol->private_value;
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
uinfo->count = e->shift_l == e->shift_r ? 1 : 2;
uinfo->value.enumerated.items = e->max;
if (uinfo->value.enumerated.item > e->max - 1)
uinfo->value.enumerated.item = e->max - 1;
strcpy(uinfo->value.enumerated.name,
e->texts[uinfo->value.enumerated.item]);
return 0;
}
EXPORT_SYMBOL_GPL(snd_soc_info_value_enum_double);
/** /**
* snd_soc_get_value_enum_double - semi enumerated double mixer get callback * snd_soc_get_value_enum_double - semi enumerated double mixer get callback
* @kcontrol: mixer control * @kcontrol: mixer control
...@@ -1631,8 +1600,7 @@ int snd_soc_get_value_enum_double(struct snd_kcontrol *kcontrol, ...@@ -1631,8 +1600,7 @@ int snd_soc_get_value_enum_double(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct soc_value_enum *e = (struct soc_value_enum *) struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
kcontrol->private_value;
unsigned short reg_val, val, mux; unsigned short reg_val, val, mux;
reg_val = snd_soc_read(codec, e->reg); reg_val = snd_soc_read(codec, e->reg);
...@@ -1671,8 +1639,7 @@ int snd_soc_put_value_enum_double(struct snd_kcontrol *kcontrol, ...@@ -1671,8 +1639,7 @@ int snd_soc_put_value_enum_double(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct soc_value_enum *e = (struct soc_value_enum *) struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
kcontrol->private_value;
unsigned short val; unsigned short val;
unsigned short mask; unsigned short mask;
......
...@@ -137,7 +137,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w, ...@@ -137,7 +137,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
} }
break; break;
case snd_soc_dapm_value_mux: { case snd_soc_dapm_value_mux: {
struct soc_value_enum *e = (struct soc_value_enum *) struct soc_enum *e = (struct soc_enum *)
w->kcontrols[i].private_value; w->kcontrols[i].private_value;
int val, item; int val, item;
...@@ -200,30 +200,6 @@ static int dapm_connect_mux(struct snd_soc_codec *codec, ...@@ -200,30 +200,6 @@ static int dapm_connect_mux(struct snd_soc_codec *codec,
return -ENODEV; return -ENODEV;
} }
/* connect value_mux widget to it's interconnecting audio paths */
static int dapm_connect_value_mux(struct snd_soc_codec *codec,
struct snd_soc_dapm_widget *src, struct snd_soc_dapm_widget *dest,
struct snd_soc_dapm_path *path, const char *control_name,
const struct snd_kcontrol_new *kcontrol)
{
struct soc_value_enum *e = (struct soc_value_enum *)
kcontrol->private_value;
int i;
for (i = 0; i < e->max; i++) {
if (!(strcmp(control_name, e->texts[i]))) {
list_add(&path->list, &codec->dapm_paths);
list_add(&path->list_sink, &dest->sources);
list_add(&path->list_source, &src->sinks);
path->name = (char *)e->texts[i];
dapm_set_path_status(dest, path, 0);
return 0;
}
}
return -ENODEV;
}
/* connect mixer widget to it's interconnecting audio paths */ /* connect mixer widget to it's interconnecting audio paths */
static int dapm_connect_mixer(struct snd_soc_codec *codec, static int dapm_connect_mixer(struct snd_soc_codec *codec,
struct snd_soc_dapm_widget *src, struct snd_soc_dapm_widget *dest, struct snd_soc_dapm_widget *src, struct snd_soc_dapm_widget *dest,
...@@ -774,45 +750,6 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget, ...@@ -774,45 +750,6 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
return 0; return 0;
} }
/* test and update the power status of a value_mux widget */
static int dapm_value_mux_update_power(struct snd_soc_dapm_widget *widget,
struct snd_kcontrol *kcontrol, int mask,
int mux, int val, struct soc_value_enum *e)
{
struct snd_soc_dapm_path *path;
int found = 0;
if (widget->id != snd_soc_dapm_value_mux)
return -ENODEV;
if (!snd_soc_test_bits(widget->codec, e->reg, mask, val))
return 0;
/* find dapm widget path assoc with kcontrol */
list_for_each_entry(path, &widget->codec->dapm_paths, list) {
if (path->kcontrol != kcontrol)
continue;
if (!path->name || !e->texts[mux])
continue;
found = 1;
/* we now need to match the string in the enum to the path */
if (!(strcmp(path->name, e->texts[mux])))
path->connect = 1; /* new connection */
else
path->connect = 0; /* old connection must be
powered down */
}
if (found) {
dapm_power_widgets(widget->codec, SND_SOC_DAPM_STREAM_NOP);
dump_dapm(widget->codec, "mux power update");
}
return 0;
}
/* test and update the power status of a mixer or switch widget */ /* test and update the power status of a mixer or switch widget */
static int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget, static int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget,
struct snd_kcontrol *kcontrol, int reg, struct snd_kcontrol *kcontrol, int reg,
...@@ -1045,17 +982,12 @@ static int snd_soc_dapm_add_route(struct snd_soc_codec *codec, ...@@ -1045,17 +982,12 @@ static int snd_soc_dapm_add_route(struct snd_soc_codec *codec,
path->connect = 1; path->connect = 1;
return 0; return 0;
case snd_soc_dapm_mux: case snd_soc_dapm_mux:
case snd_soc_dapm_value_mux:
ret = dapm_connect_mux(codec, wsource, wsink, path, control, ret = dapm_connect_mux(codec, wsource, wsink, path, control,
&wsink->kcontrols[0]); &wsink->kcontrols[0]);
if (ret != 0) if (ret != 0)
goto err; goto err;
break; break;
case snd_soc_dapm_value_mux:
ret = dapm_connect_value_mux(codec, wsource, wsink, path,
control, &wsink->kcontrols[0]);
if (ret != 0)
goto err;
break;
case snd_soc_dapm_switch: case snd_soc_dapm_switch:
case snd_soc_dapm_mixer: case snd_soc_dapm_mixer:
ret = dapm_connect_mixer(codec, wsource, wsink, path, control); ret = dapm_connect_mixer(codec, wsource, wsink, path, control);
...@@ -1382,8 +1314,7 @@ int snd_soc_dapm_get_value_enum_double(struct snd_kcontrol *kcontrol, ...@@ -1382,8 +1314,7 @@ int snd_soc_dapm_get_value_enum_double(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol); struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
struct soc_value_enum *e = (struct soc_value_enum *) struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
kcontrol->private_value;
unsigned short reg_val, val, mux; unsigned short reg_val, val, mux;
reg_val = snd_soc_read(widget->codec, e->reg); reg_val = snd_soc_read(widget->codec, e->reg);
...@@ -1423,8 +1354,7 @@ int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol, ...@@ -1423,8 +1354,7 @@ int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol); struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
struct soc_value_enum *e = (struct soc_value_enum *) struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
kcontrol->private_value;
unsigned short val, mux; unsigned short val, mux;
unsigned short mask; unsigned short mask;
int ret = 0; int ret = 0;
...@@ -1443,7 +1373,7 @@ int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol, ...@@ -1443,7 +1373,7 @@ int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol,
mutex_lock(&widget->codec->mutex); mutex_lock(&widget->codec->mutex);
widget->value = val; widget->value = val;
dapm_value_mux_update_power(widget, kcontrol, mask, mux, val, e); dapm_mux_update_power(widget, kcontrol, mask, mux, val, e);
if (widget->event) { if (widget->event) {
if (widget->event_flags & SND_SOC_DAPM_PRE_REG) { if (widget->event_flags & SND_SOC_DAPM_PRE_REG) {
ret = widget->event(widget, ret = widget->event(widget,
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#endif #endif
MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>"); MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
MODULE_DESCRIPTION("caiaq USB audio, version 1.3.9"); MODULE_DESCRIPTION("caiaq USB audio, version 1.3.10");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
"{Native Instruments, RigKontrol3}," "{Native Instruments, RigKontrol3},"
......
...@@ -75,6 +75,7 @@ struct snd_usb_caiaqdev { ...@@ -75,6 +75,7 @@ struct snd_usb_caiaqdev {
wait_queue_head_t ep1_wait_queue; wait_queue_head_t ep1_wait_queue;
wait_queue_head_t prepare_wait_queue; wait_queue_head_t prepare_wait_queue;
int spec_received, audio_parm_answer; int spec_received, audio_parm_answer;
int midi_out_active;
char vendor_name[CAIAQ_USB_STR_LEN]; char vendor_name[CAIAQ_USB_STR_LEN];
char product_name[CAIAQ_USB_STR_LEN]; char product_name[CAIAQ_USB_STR_LEN];
......
...@@ -59,6 +59,11 @@ static int snd_usb_caiaq_midi_output_open(struct snd_rawmidi_substream *substrea ...@@ -59,6 +59,11 @@ static int snd_usb_caiaq_midi_output_open(struct snd_rawmidi_substream *substrea
static int snd_usb_caiaq_midi_output_close(struct snd_rawmidi_substream *substream) static int snd_usb_caiaq_midi_output_close(struct snd_rawmidi_substream *substream)
{ {
struct snd_usb_caiaqdev *dev = substream->rmidi->private_data;
if (dev->midi_out_active) {
usb_kill_urb(&dev->midi_out_urb);
dev->midi_out_active = 0;
}
return 0; return 0;
} }
...@@ -69,7 +74,8 @@ static void snd_usb_caiaq_midi_send(struct snd_usb_caiaqdev *dev, ...@@ -69,7 +74,8 @@ static void snd_usb_caiaq_midi_send(struct snd_usb_caiaqdev *dev,
dev->midi_out_buf[0] = EP1_CMD_MIDI_WRITE; dev->midi_out_buf[0] = EP1_CMD_MIDI_WRITE;
dev->midi_out_buf[1] = 0; /* port */ dev->midi_out_buf[1] = 0; /* port */
len = snd_rawmidi_transmit_peek(substream, dev->midi_out_buf+3, EP1_BUFSIZE-3); len = snd_rawmidi_transmit(substream, dev->midi_out_buf + 3,
EP1_BUFSIZE - 3);
if (len <= 0) if (len <= 0)
return; return;
...@@ -79,24 +85,24 @@ static void snd_usb_caiaq_midi_send(struct snd_usb_caiaqdev *dev, ...@@ -79,24 +85,24 @@ static void snd_usb_caiaq_midi_send(struct snd_usb_caiaqdev *dev,
ret = usb_submit_urb(&dev->midi_out_urb, GFP_ATOMIC); ret = usb_submit_urb(&dev->midi_out_urb, GFP_ATOMIC);
if (ret < 0) if (ret < 0)
log("snd_usb_caiaq_midi_send(%p): usb_submit_urb() failed, %d\n", log("snd_usb_caiaq_midi_send(%p): usb_submit_urb() failed,"
substream, ret); "ret=%d, len=%d\n",
substream, ret, len);
else
dev->midi_out_active = 1;
} }
static void snd_usb_caiaq_midi_output_trigger(struct snd_rawmidi_substream *substream, int up) static void snd_usb_caiaq_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)
{ {
struct snd_usb_caiaqdev *dev = substream->rmidi->private_data; struct snd_usb_caiaqdev *dev = substream->rmidi->private_data;
if (dev->midi_out_substream != NULL) if (up) {
return; dev->midi_out_substream = substream;
if (!dev->midi_out_active)
if (!up) { snd_usb_caiaq_midi_send(dev, substream);
} else {
dev->midi_out_substream = NULL; dev->midi_out_substream = NULL;
return;
} }
dev->midi_out_substream = substream;
snd_usb_caiaq_midi_send(dev, substream);
} }
...@@ -161,16 +167,14 @@ int snd_usb_caiaq_midi_init(struct snd_usb_caiaqdev *device) ...@@ -161,16 +167,14 @@ int snd_usb_caiaq_midi_init(struct snd_usb_caiaqdev *device)
void snd_usb_caiaq_midi_output_done(struct urb* urb) void snd_usb_caiaq_midi_output_done(struct urb* urb)
{ {
struct snd_usb_caiaqdev *dev = urb->context; struct snd_usb_caiaqdev *dev = urb->context;
char *buf = urb->transfer_buffer;
dev->midi_out_active = 0;
if (urb->status != 0) if (urb->status != 0)
return; return;
if (!dev->midi_out_substream) if (!dev->midi_out_substream)
return; return;
snd_rawmidi_transmit_ack(dev->midi_out_substream, buf[2]);
dev->midi_out_substream = NULL;
snd_usb_caiaq_midi_send(dev, dev->midi_out_substream); snd_usb_caiaq_midi_send(dev, dev->midi_out_substream);
} }
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