- Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 01/24] sound/pci: coding style fixes: ac97
by Alexander Beregalov 10 Sep '08

10 Sep '08

- <asm/io.h> -> <linux/io.h> - remove trailing whitespaces - convert comments Only compile tested. Signed-off-by: Alexander Beregalov <a.beregalov(a)gmail.com> --- sound/pci/ac97/ac97_codec.c | 192 ++++++++++++++++---------------- sound/pci/ac97/ac97_patch.c | 252 +++++++++++++++++++++--------------------- sound/pci/ac97/ac97_pcm.c | 10 +- sound/pci/ac97/ac97_proc.c | 24 ++-- 4 files changed, 239 insertions(+), 239 deletions(-) diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 6704acb..0cf819a 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c @@ -141,33 +141,33 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = { { 0x43525958, 0xfffffff8, "CS4205", patch_cirrus_spdif, NULL }, { 0x43525960, 0xfffffff8, "CS4291", NULL, NULL }, { 0x43525970, 0xfffffff8, "CS4202", NULL, NULL }, -{ 0x43585421, 0xffffffff, "HSD11246", NULL, NULL }, // SmartMC II -{ 0x43585428, 0xfffffff8, "Cx20468", patch_conexant, NULL }, // SmartAMC fixme: the mask might be different +{ 0x43585421, 0xffffffff, "HSD11246", NULL, NULL }, /* SmartMC II */ +{ 0x43585428, 0xfffffff8, "Cx20468", patch_conexant, NULL }, /* SmartAMC fixme: the mask might be different */ { 0x43585431, 0xffffffff, "Cx20551", patch_cx20551, NULL }, { 0x44543031, 0xfffffff0, "DT0398", NULL, NULL }, -{ 0x454d4328, 0xffffffff, "EM28028", NULL, NULL }, // same as TR28028? +{ 0x454d4328, 0xffffffff, "EM28028", NULL, NULL }, /* same as TR28028? */ { 0x45838308, 0xffffffff, "ESS1988", NULL, NULL }, { 0x48525300, 0xffffff00, "HMP9701", NULL, NULL }, { 0x49434501, 0xffffffff, "ICE1230", NULL, NULL }, -{ 0x49434511, 0xffffffff, "ICE1232", NULL, NULL }, // alias VIA VT1611A? +{ 0x49434511, 0xffffffff, "ICE1232", NULL, NULL }, /* alias VIA VT1611A? */ { 0x49434514, 0xffffffff, "ICE1232A", NULL, NULL }, -{ 0x49434551, 0xffffffff, "VT1616", patch_vt1616, NULL }, -{ 0x49434552, 0xffffffff, "VT1616i", patch_vt1616, NULL }, // VT1616 compatible (chipset integrated) +{ 0x49434551, 0xffffffff, "VT1616", patch_vt1616, NULL }, +{ 0x49434552, 0xffffffff, "VT1616i", patch_vt1616, NULL }, /* VT1616 compatible (chipset integrated) */ { 0x49544520, 0xffffffff, "IT2226E", NULL, NULL }, { 0x49544561, 0xffffffff, "IT2646E", patch_it2646, NULL }, -{ 0x4e534300, 0xffffffff, "LM4540,43,45,46,48", NULL, NULL }, // only guess --jk +{ 0x4e534300, 0xffffffff, "LM4540,43,45,46,48", NULL, NULL }, /* only guess --jk */ { 0x4e534331, 0xffffffff, "LM4549", NULL, NULL }, -{ 0x4e534350, 0xffffffff, "LM4550", patch_lm4550, NULL }, // volume wrap fix +{ 0x4e534350, 0xffffffff, "LM4550", patch_lm4550, NULL }, /* volume wrap fix */ { 0x50534304, 0xffffffff, "UCB1400", patch_ucb1400, NULL }, { 0x53494c20, 0xffffffe0, "Si3036,8", mpatch_si3036, mpatch_si3036, AC97_MODEM_PATCH }, { 0x54524102, 0xffffffff, "TR28022", NULL, NULL }, { 0x54524103, 0xffffffff, "TR28023", NULL, NULL }, { 0x54524106, 0xffffffff, "TR28026", NULL, NULL }, -{ 0x54524108, 0xffffffff, "TR28028", patch_tritech_tr28028, NULL }, // added by xin jin [07/09/99] -{ 0x54524123, 0xffffffff, "TR28602", NULL, NULL }, // only guess --jk [TR28023 = eMicro EM28023 (new CT1297)] +{ 0x54524108, 0xffffffff, "TR28028", patch_tritech_tr28028, NULL }, /* added by xin jin [07/09/99] */ +{ 0x54524123, 0xffffffff, "TR28602", NULL, NULL }, /* only guess --jk [TR28023 = eMicro EM28023 (new CT1297)] */ { 0x54584e20, 0xffffffff, "TLC320AD9xC", NULL, NULL }, -{ 0x56494161, 0xffffffff, "VIA1612A", NULL, NULL }, // modified ICE1232 with S/PDIF -{ 0x56494170, 0xffffffff, "VIA1617A", patch_vt1617a, NULL }, // modified VT1616 with S/PDIF +{ 0x56494161, 0xffffffff, "VIA1612A", NULL, NULL }, /* modified ICE1232 with S/PDIF */ +{ 0x56494170, 0xffffffff, "VIA1617A", patch_vt1617a, NULL }, /* modified VT1616 with S/PDIF */ { 0x56494182, 0xffffffff, "VIA1618", patch_vt1618, NULL }, { 0x57454301, 0xffffffff, "W83971D", NULL, NULL }, { 0x574d4c00, 0xffffffff, "WM9701,WM9701A", NULL, NULL }, @@ -186,11 +186,11 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = { { 0x83847608, 0xffffffff, "STAC9708,11", patch_sigmatel_stac9708, NULL }, { 0x83847609, 0xffffffff, "STAC9721,23", patch_sigmatel_stac9721, NULL }, { 0x83847644, 0xffffffff, "STAC9744", patch_sigmatel_stac9744, NULL }, -{ 0x83847650, 0xffffffff, "STAC9750,51", NULL, NULL }, // patch? -{ 0x83847652, 0xffffffff, "STAC9752,53", NULL, NULL }, // patch? +{ 0x83847650, 0xffffffff, "STAC9750,51", NULL, NULL }, /* patch? */ +{ 0x83847652, 0xffffffff, "STAC9752,53", NULL, NULL }, /* patch? */ { 0x83847656, 0xffffffff, "STAC9756,57", patch_sigmatel_stac9756, NULL }, { 0x83847658, 0xffffffff, "STAC9758,59", patch_sigmatel_stac9758, NULL }, -{ 0x83847666, 0xffffffff, "STAC9766,67", NULL, NULL }, // patch? +{ 0x83847666, 0xffffffff, "STAC9766,67", NULL, NULL }, /* patch? */ { 0, 0, NULL, NULL, NULL } }; @@ -274,7 +274,7 @@ EXPORT_SYMBOL(snd_ac97_write); /** * snd_ac97_read - read a value from the given register - * + * * @ac97: the ac97 instance * @reg: the register to read * @@ -293,9 +293,9 @@ unsigned short snd_ac97_read(struct snd_ac97 *ac97, unsigned short reg) /* read a register - return the cached value if already read */ static inline unsigned short snd_ac97_read_cache(struct snd_ac97 *ac97, unsigned short reg) { - if (! test_bit(reg, ac97->reg_accessed)) { + if (!test_bit(reg, ac97->reg_accessed)) { ac97->regs[reg] = ac97->bus->ops->read(ac97, reg); - // set_bit(reg, ac97->reg_accessed); + /* set_bit(reg, ac97->reg_accessed); */ } return ac97->regs[reg]; } @@ -437,11 +437,11 @@ static int snd_ac97_info_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { struct ac97_enum *e = (struct ac97_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->mask; - + if (uinfo->value.enumerated.item > e->mask - 1) uinfo->value.enumerated.item = e->mask - 1; strcpy(uinfo->value.enumerated.name, e->texts[uinfo->value.enumerated.item]); @@ -454,7 +454,7 @@ static int snd_ac97_get_enum_double(struct snd_kcontrol *kcontrol, struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol); struct ac97_enum *e = (struct ac97_enum *)kcontrol->private_value; unsigned short val, bitmask; - + for (bitmask = 1; bitmask < e->mask; bitmask <<= 1) ; val = snd_ac97_read_cache(ac97, e->reg); @@ -472,7 +472,7 @@ static int snd_ac97_put_enum_double(struct snd_kcontrol *kcontrol, struct ac97_enum *e = (struct ac97_enum *)kcontrol->private_value; unsigned short val; unsigned short mask, bitmask; - + for (bitmask = 1; bitmask < e->mask; bitmask <<= 1) ; if (ucontrol->value.enumerated.item[0] > e->mask - 1) @@ -561,7 +561,7 @@ static int snd_ac97_put_volsw(struct snd_kcontrol *kcontrol, int invert = (kcontrol->private_value >> 24) & 0x01; int err, page_save; unsigned short val, val2, val_mask; - + page_save = snd_ac97_page_save(ac97, reg, kcontrol); val = (ucontrol->value.integer.value[0] & mask); if (invert) @@ -622,8 +622,8 @@ AC97_ENUM_SINGLE(AC97_GENERAL_PURPOSE, 9, 2, std_mix), AC97_ENUM_SINGLE(AC97_GENERAL_PURPOSE, 8, 2, std_mic), }; -static const struct snd_kcontrol_new snd_ac97_control_capture_src = -AC97_ENUM("Capture Source", std_enum[0]); +static const struct snd_kcontrol_new snd_ac97_control_capture_src = +AC97_ENUM("Capture Source", std_enum[0]); static const struct snd_kcontrol_new snd_ac97_control_capture_vol = AC97_DOUBLE("Capture Volume", AC97_REC_GAIN, 8, 0, 15, 0); @@ -690,7 +690,7 @@ static int snd_ac97_spdif_mask_info(struct snd_kcontrol *kcontrol, struct snd_ct uinfo->count = 1; return 0; } - + static int snd_ac97_spdif_cmask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { ucontrol->value.iec958.status[0] = IEC958_AES0_PROFESSIONAL | @@ -702,7 +702,7 @@ static int snd_ac97_spdif_cmask_get(struct snd_kcontrol *kcontrol, struct snd_ct ucontrol->value.iec958.status[3] = IEC958_AES3_CON_FS; return 0; } - + static int snd_ac97_spdif_pmask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { /* FIXME: AC'97 spec doesn't say which bits are used for what */ @@ -725,7 +725,7 @@ static int snd_ac97_spdif_default_get(struct snd_kcontrol *kcontrol, struct snd_ mutex_unlock(&ac97->reg_mutex); return 0; } - + static int snd_ac97_spdif_default_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol); @@ -752,7 +752,7 @@ static int snd_ac97_spdif_default_put(struct snd_kcontrol *kcontrol, struct snd_ val |= 1<<3; if (!(new & IEC958_AES0_CON_NOT_COPYRIGHT)) val |= 1<<2; - val |= ((new >> 8) & 0xff) << 4; // category + original + val |= ((new >> 8) & 0xff) << 4; /* category + original */ switch ((new >> 24) & 0xff) { case IEC958_AES3_CON_FS_44100: val |= 0<<12; break; case IEC958_AES3_CON_FS_48000: val |= 2<<12; break; @@ -768,16 +768,16 @@ static int snd_ac97_spdif_default_put(struct snd_kcontrol *kcontrol, struct snd_ if (ac97->flags & AC97_CS_SPDIF) { int x = (val >> 12) & 0x03; switch (x) { - case 0: x = 1; break; // 44.1 - case 2: x = 0; break; // 48.0 - default: x = 0; break; // illegal. + case 0: x = 1; break; /* 44.1 */ + case 2: x = 0; break; /* 48.0 */ + default: x = 0; break; /* illegal. */ } change |= snd_ac97_update_bits_nolock(ac97, AC97_CSR_SPDIF, 0x3fff, ((val & 0xcfff) | (x << 12))); } else if (ac97->flags & AC97_CX_SPDIF) { int v; v = new & (IEC958_AES0_CON_EMPHASIS_5015|IEC958_AES0_CON_NOT_COPYRIGHT) ? 0 : AC97_CXR_COPYRGT; v |= new & IEC958_AES0_NONAUDIO ? AC97_CXR_SPDIF_AC3 : AC97_CXR_SPDIF_PCM; - change |= snd_ac97_update_bits_nolock(ac97, AC97_CXR_AUDIO_MISC, + change |= snd_ac97_update_bits_nolock(ac97, AC97_CXR_AUDIO_MISC, AC97_CXR_SPDIF_MASK | AC97_CXR_COPYRGT, v); } else if (ac97->id == AC97_ID_YMF743) { @@ -806,7 +806,7 @@ static int snd_ac97_put_spsa(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_ int reg = kcontrol->private_value & 0xff; int shift = (kcontrol->private_value >> 8) & 0xff; int mask = (kcontrol->private_value >> 16) & 0xff; - // int invert = (kcontrol->private_value >> 24) & 0xff; + /* int invert = (kcontrol->private_value >> 24) & 0xff; */ unsigned short value, old, new; int change; @@ -893,7 +893,7 @@ static int snd_ac97_ad18xx_pcm_get_bits(struct snd_kcontrol *kcontrol, struct sn int lshift = (kcontrol->private_value >> 8) & 0x0f; int rshift = (kcontrol->private_value >> 12) & 0x0f; int mask = (kcontrol->private_value >> 16) & 0xff; - + ucontrol->value.integer.value[0] = mask - ((ac97->spec.ad18xx.pcmreg[codec] >> lshift) & mask); if (lshift != rshift && (ac97->flags & AC97_STEREO_MUTES)) ucontrol->value.integer.value[1] = mask - ((ac97->spec.ad18xx.pcmreg[codec] >> rshift) & mask); @@ -908,7 +908,7 @@ static int snd_ac97_ad18xx_pcm_put_bits(struct snd_kcontrol *kcontrol, struct sn int rshift = (kcontrol->private_value >> 12) & 0x0f; int mask = (kcontrol->private_value >> 16) & 0xff; unsigned short val, valmask; - + val = (mask - (ucontrol->value.integer.value[0] & mask)) << lshift; valmask = mask << lshift; if (lshift != rshift && (ac97->flags & AC97_STEREO_MUTES)) { @@ -936,7 +936,7 @@ static int snd_ac97_ad18xx_pcm_get_volume(struct snd_kcontrol *kcontrol, struct { struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol); int codec = kcontrol->private_value & 3; - + mutex_lock(&ac97->page_mutex); ucontrol->value.integer.value[0] = 31 - ((ac97->spec.ad18xx.pcmreg[codec] >> 0) & 31); ucontrol->value.integer.value[1] = 31 - ((ac97->spec.ad18xx.pcmreg[codec] >> 8) & 31); @@ -949,7 +949,7 @@ static int snd_ac97_ad18xx_pcm_put_volume(struct snd_kcontrol *kcontrol, struct struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol); int codec = kcontrol->private_value & 3; unsigned short val1, val2; - + val1 = 31 - (ucontrol->value.integer.value[0] & 31); val2 = 31 - (ucontrol->value.integer.value[1] & 31); return snd_ac97_ad18xx_update_pcm_bits(ac97, codec, 0x1f1f, (val1 << 8) | val2); @@ -1023,11 +1023,11 @@ static int snd_ac97_dev_free(struct snd_device *device) return snd_ac97_free(ac97); } -static int snd_ac97_try_volume_mix(struct snd_ac97 * ac97, int reg) +static int snd_ac97_try_volume_mix(struct snd_ac97 *ac97, int reg) { unsigned short val, mask = 0x8000; - if (! snd_ac97_valid_reg(ac97, reg)) + if (!snd_ac97_valid_reg(ac97, reg)) return 0; switch (reg) { @@ -1092,7 +1092,7 @@ static void check_volume_resolution(struct snd_ac97 *ac97, int reg, unsigned cha } *lo_max = *hi_max = 0; - for (i = 0 ; i < ARRAY_SIZE(cbit); i++) { + for (i = 0; i < ARRAY_SIZE(cbit); i++) { unsigned short val; snd_ac97_write(ac97, reg, 0x8080 | cbit[i] | (cbit[i] << 8)); /* Do the read twice due to buffers on some ac97 codecs. @@ -1110,7 +1110,7 @@ static void check_volume_resolution(struct snd_ac97 *ac97, int reg, unsigned cha } } -static int snd_ac97_try_bit(struct snd_ac97 * ac97, int reg, int bit) +static int snd_ac97_try_bit(struct snd_ac97 *ac97, int reg, int bit) { unsigned short mask, val, orig, res; @@ -1124,7 +1124,7 @@ static int snd_ac97_try_bit(struct snd_ac97 * ac97, int reg, int bit) } /* check the volume resolution of center/lfe */ -static void snd_ac97_change_volume_params2(struct snd_ac97 * ac97, int reg, int shift, unsigned char *max) +static void snd_ac97_change_volume_params2(struct snd_ac97 *ac97, int reg, int shift, unsigned char *max) { unsigned short val, val1; @@ -1151,7 +1151,7 @@ static inline int printable(unsigned int x) } static struct snd_kcontrol *snd_ac97_cnew(const struct snd_kcontrol_new *_template, - struct snd_ac97 * ac97) + struct snd_ac97 *ac97) { struct snd_kcontrol_new template; memcpy(&template, _template, sizeof(template)); @@ -1170,7 +1170,7 @@ static int snd_ac97_cmute_new_stereo(struct snd_card *card, char *name, int reg, int err; unsigned short val, val1, mute_mask; - if (! snd_ac97_valid_reg(ac97, reg)) + if (!snd_ac97_valid_reg(ac97, reg)) return 0; mute_mask = 0x8000; @@ -1238,7 +1238,7 @@ static int snd_ac97_cvol_new(struct snd_card *card, char *name, int reg, unsigne int err; struct snd_kcontrol *kctl; - if (! snd_ac97_valid_reg(ac97, reg)) + if (!snd_ac97_valid_reg(ac97, reg)) return 0; if (hi_max) { /* invert */ @@ -1275,7 +1275,7 @@ static int snd_ac97_cmix_new_stereo(struct snd_card *card, const char *pfx, char name[44]; unsigned char lo_max, hi_max; - if (! snd_ac97_valid_reg(ac97, reg)) + if (!snd_ac97_valid_reg(ac97, reg)) return 0; if (snd_ac97_try_bit(ac97, reg, 15)) { @@ -1301,7 +1301,7 @@ static int snd_ac97_cmix_new_stereo(struct snd_card *card, const char *pfx, static unsigned int snd_ac97_determine_spdif_rates(struct snd_ac97 *ac97); -static int snd_ac97_mixer_build(struct snd_ac97 * ac97) +static int snd_ac97_mixer_build(struct snd_ac97 *ac97) { struct snd_card *card = ac97->bus->card; struct snd_kcontrol *kctl; @@ -1325,7 +1325,7 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97) ac97->regs[AC97_CENTER_LFE_MASTER] = 0x8080; /* build center controls */ - if ((snd_ac97_try_volume_mix(ac97, AC97_CENTER_LFE_MASTER)) + if ((snd_ac97_try_volume_mix(ac97, AC97_CENTER_LFE_MASTER)) && !(ac97->flags & AC97_AD_MULTI)) { if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_center[0], ac97))) < 0) return err; @@ -1353,7 +1353,7 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97) } /* build surround controls */ - if ((snd_ac97_try_volume_mix(ac97, AC97_SURROUND_MASTER)) + if ((snd_ac97_try_volume_mix(ac97, AC97_SURROUND_MASTER)) && !(ac97->flags & AC97_AD_MULTI)) { /* Surround Master (0x38) is with stereo mutes */ if ((err = snd_ac97_cmix_new_stereo(card, "Surround Playback", @@ -1368,14 +1368,14 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97) AC97_HEADPHONE, 0, ac97)) < 0) return err; } - + /* build master mono controls */ if (snd_ac97_try_volume_mix(ac97, AC97_MASTER_MONO)) { if ((err = snd_ac97_cmix_new(card, "Master Mono Playback", AC97_MASTER_MONO, 0, ac97)) < 0) return err; } - + /* build master tone controls */ if (!(ac97->flags & AC97_HAS_NO_TONE)) { if (snd_ac97_try_volume_mix(ac97, AC97_MASTER_TONE)) { @@ -1391,9 +1391,9 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97) snd_ac97_write_cache(ac97, AC97_MASTER_TONE, 0x0f0f); } } - + /* build PC Speaker controls */ - if (!(ac97->flags & AC97_HAS_NO_PC_BEEP) && + if (!(ac97->flags & AC97_HAS_NO_PC_BEEP) && ((ac97->flags & AC97_HAS_PC_BEEP) || snd_ac97_try_volume_mix(ac97, AC97_PC_BEEP))) { for (idx = 0; idx < 2; idx++) @@ -1403,7 +1403,7 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97) snd_ac97_write_cache(ac97, AC97_PC_BEEP, snd_ac97_read(ac97, AC97_PC_BEEP) | 0x801e); } - + /* build Phone controls */ if (!(ac97->flags & AC97_HAS_NO_PHONE)) { if (snd_ac97_try_volume_mix(ac97, AC97_PHONE)) { @@ -1412,7 +1412,7 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97) return err; } } - + /* build MIC controls */ if (!(ac97->flags & AC97_HAS_NO_MIC)) { if (snd_ac97_try_volume_mix(ac97, AC97_MIC)) { @@ -1430,7 +1430,7 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97) AC97_LINE, 1, ac97)) < 0) return err; } - + /* build CD controls */ if (!(ac97->flags & AC97_HAS_NO_CD)) { if (snd_ac97_try_volume_mix(ac97, AC97_CD)) { @@ -1439,7 +1439,7 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97) return err; } } - + /* build Video controls */ if (!(ac97->flags & AC97_HAS_NO_VIDEO)) { if (snd_ac97_try_volume_mix(ac97, AC97_VIDEO)) { @@ -1620,7 +1620,7 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97) } ac97->spdif_status = SNDRV_PCM_DEFAULT_CON_SPDIF; } - + /* build chip specific controls */ if (ac97->build_ops->build_specific) if ((err = ac97->build_ops->build_specific(ac97)) < 0) @@ -1628,7 +1628,7 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97) if (snd_ac97_try_bit(ac97, AC97_POWERDOWN, 15)) { kctl = snd_ac97_cnew(&snd_ac97_control_eapd, ac97); - if (! kctl) + if (!kctl) return -ENOMEM; if (ac97->scaps & AC97_SCAP_INV_EAPD) set_inv_eapd(ac97, kctl); @@ -1639,11 +1639,11 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97) return 0; } -static int snd_ac97_modem_build(struct snd_card *card, struct snd_ac97 * ac97) +static int snd_ac97_modem_build(struct snd_card *card, struct snd_ac97 *ac97) { int err, idx; - //printk("AC97_GPIO_CFG = %x\n",snd_ac97_read(ac97,AC97_GPIO_CFG)); + /* printk("AC97_GPIO_CFG = %x\n",snd_ac97_read(ac97,AC97_GPIO_CFG)); */ snd_ac97_write(ac97, AC97_GPIO_CFG, 0xffff & ~(AC97_GPIO_LINE1_OH)); snd_ac97_write(ac97, AC97_GPIO_POLARITY, 0xffff & ~(AC97_GPIO_LINE1_OH)); snd_ac97_write(ac97, AC97_GPIO_STICKY, 0xffff); @@ -1776,15 +1776,15 @@ void snd_ac97_get_name(struct snd_ac97 *ac97, unsigned int id, char *name, int m printable(id >> 16), printable(id >> 8)); pid = look_for_codec_id(snd_ac97_codec_id_vendors, id); - if (! pid) + if (!pid) return; strcpy(name, pid->name); if (ac97 && pid->patch) { if ((modem && (pid->flags & AC97_MODEM_PATCH)) || - (! modem && ! (pid->flags & AC97_MODEM_PATCH))) + (!modem && !(pid->flags & AC97_MODEM_PATCH))) pid->patch(ac97); - } + } pid = look_for_codec_id(snd_ac97_codec_ids, id); if (pid) { @@ -1794,7 +1794,7 @@ void snd_ac97_get_name(struct snd_ac97 *ac97, unsigned int id, char *name, int m sprintf(name + strlen(name), " rev %d", id & ~pid->mask); if (ac97 && pid->patch) { if ((modem && (pid->flags & AC97_MODEM_PATCH)) || - (! modem && ! (pid->flags & AC97_MODEM_PATCH))) + (!modem && !(pid->flags & AC97_MODEM_PATCH))) pid->patch(ac97); } } else @@ -1829,7 +1829,7 @@ static int ac97_reset_wait(struct snd_ac97 *ac97, int timeout, int with_modem) end_time = jiffies + timeout; do { - + /* use preliminary reads to settle the communication */ snd_ac97_read(ac97, AC97_RESET); snd_ac97_read(ac97, AC97_VENDOR_ID1); @@ -1872,7 +1872,7 @@ static int ac97_reset_wait(struct snd_ac97 *ac97, int timeout, int with_modem) * * The ops table must include valid callbacks (at least read and * write). The other callbacks, wait and reset, are not mandatory. - * + * * The clock is set to 48000. If another clock is needed, set * (*rbus)->clock manually. * @@ -1971,7 +1971,7 @@ static void do_update_power(struct work_struct *work) * * The template must include the codec number (num) and address (addr), * and the private data (private_data). - * + * * The ac97 instance is registered as a low-level device, so you don't * have to release it manually. * @@ -2061,10 +2061,10 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template, /* proceed anyway - it's often non-critical */ } } - __access_ok: +__access_ok: ac97->id = snd_ac97_read(ac97, AC97_VENDOR_ID1) << 16; ac97->id |= snd_ac97_read(ac97, AC97_VENDOR_ID2); - if (! (ac97->scaps & AC97_SCAP_DETECT_BY_VENDOR) && + if (!(ac97->scaps & AC97_SCAP_DETECT_BY_VENDOR) && (ac97->id == 0x00000000 || ac97->id == 0xffffffff)) { snd_printk(KERN_ERR "AC'97 %d access is not valid [0x%x], removing mixer.\n", ac97->num, ac97->id); snd_ac97_free(ac97); @@ -2073,7 +2073,7 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template, pid = look_for_codec_id(snd_ac97_codec_ids, ac97->id); if (pid) ac97->flags |= pid->flags; - + /* test for AC'97 */ if (!(ac97->scaps & AC97_SCAP_SKIP_AUDIO) && !(ac97->scaps & AC97_SCAP_AUDIO)) { /* test if we can write to the record gain volume register */ @@ -2104,14 +2104,14 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template, return -EACCES; } - if (bus->ops->reset) // FIXME: always skipping? + if (bus->ops->reset) /* FIXME: always skipping? */ goto __ready_ok; /* FIXME: add powerdown control */ if (ac97_is_audio(ac97)) { /* nothing should be in powerdown mode */ snd_ac97_write_cache(ac97, AC97_POWERDOWN, 0); - if (! (ac97->flags & AC97_DEFAULT_POWER_OFF)) { + if (!(ac97->flags & AC97_DEFAULT_POWER_OFF)) { snd_ac97_write_cache(ac97, AC97_RESET, 0); /* reset to defaults */ udelay(100); snd_ac97_write_cache(ac97, AC97_POWERDOWN, 0); @@ -2158,8 +2158,8 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template, } while (time_after_eq(end_time, jiffies)); snd_printk(KERN_WARNING "MC'97 %d converters and GPIO not ready (0x%x)\n", ac97->num, snd_ac97_read(ac97, AC97_EXTENDED_MSTATUS)); } - - __ready_ok: + +__ready_ok: if (ac97_is_audio(ac97)) ac97->addr = (ac97->ext_id & AC97_EI_ADDR_MASK) >> AC97_EI_ADDR_SHIFT; else @@ -2167,7 +2167,7 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template, if (ac97->ext_id & 0x01c9) { /* L/R, MIC, SDAC, LDAC VRA support */ reg = snd_ac97_read(ac97, AC97_EXTENDED_STATUS); reg |= ac97->ext_id & 0x01c0; /* LDAC/SDAC/CDAC */ - if (! bus->no_vra) + if (!bus->no_vra) reg |= ac97->ext_id & 0x0009; /* VRA/VRM */ snd_ac97_write_cache(ac97, AC97_EXTENDED_STATUS, reg); } @@ -2210,8 +2210,8 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template, if (bus->ops->init) bus->ops->init(ac97); snd_ac97_get_name(ac97, ac97->id, name, !ac97_is_audio(ac97)); - snd_ac97_get_name(NULL, ac97->id, name, !ac97_is_audio(ac97)); // ac97->id might be changed in the special setup code - if (! ac97->build_ops) + snd_ac97_get_name(NULL, ac97->id, name, !ac97_is_audio(ac97)); /* ac97->id might be changed in the special setup code */ + if (!ac97->build_ops) ac97->build_ops = &null_build_ops; if (ac97_is_audio(ac97)) { @@ -2295,7 +2295,7 @@ static void snd_ac97_powerdown(struct snd_ac97 *ac97) /* powerdown external amplifier */ if (ac97->scaps & AC97_SCAP_INV_EAPD) power = ac97->regs[AC97_POWERDOWN] & ~AC97_PD_EAPD; - else if (! (ac97->scaps & AC97_SCAP_EAPD_LED)) + else if (!(ac97->scaps & AC97_SCAP_EAPD_LED)) power = ac97->regs[AC97_POWERDOWN] | AC97_PD_EAPD; power |= AC97_PD_PR6; /* Headphone amplifier powerdown */ power |= AC97_PD_PR0 | AC97_PD_PR1; /* ADC & DAC powerdown */ @@ -2347,7 +2347,7 @@ int snd_ac97_update_power(struct snd_ac97 *ac97, int reg, int powerup) { int i; - if (! ac97) + if (!ac97) return 0; if (reg) { @@ -2416,8 +2416,8 @@ static void update_power_regs(struct snd_ac97 *ac97) snd_ac97_update_bits(ac97, power_regs[i].power_reg, power_regs[i].mask, bits); } - if (! power_up) { - if (! (ac97->regs[AC97_POWERDOWN] & AC97_PD_PR2)) { + if (!power_up) { + if (!(ac97->regs[AC97_POWERDOWN] & AC97_PD_PR2)) { /* power down analog mix and vref */ snd_ac97_update_bits(ac97, AC97_POWERDOWN, AC97_PD_PR2, AC97_PD_PR2); @@ -2437,7 +2437,7 @@ static void update_power_regs(struct snd_ac97 *ac97) */ void snd_ac97_suspend(struct snd_ac97 *ac97) { - if (! ac97) + if (!ac97) return; if (ac97->build_ops->suspend) ac97->build_ops->suspend(ac97); @@ -2457,7 +2457,7 @@ static void snd_ac97_restore_status(struct snd_ac97 *ac97) { int i; - for (i = 2; i < 0x7c ; i += 2) { + for (i = 2; i < 0x7c; i += 2) { if (i == AC97_POWERDOWN || i == AC97_EXTENDED_ID) continue; /* restore only accessible registers @@ -2501,7 +2501,7 @@ void snd_ac97_resume(struct snd_ac97 *ac97) { unsigned long end_time; - if (! ac97) + if (!ac97) return; if (ac97->bus->ops->reset) { @@ -2510,7 +2510,7 @@ void snd_ac97_resume(struct snd_ac97 *ac97) } snd_ac97_write(ac97, AC97_POWERDOWN, 0); - if (! (ac97->flags & AC97_DEFAULT_POWER_OFF)) { + if (!(ac97->flags & AC97_DEFAULT_POWER_OFF)) { if (!(ac97->scaps & AC97_SCAP_SKIP_AUDIO)) snd_ac97_write(ac97, AC97_RESET, 0); else if (!(ac97->scaps & AC97_SCAP_SKIP_MODEM)) @@ -2568,7 +2568,7 @@ static void set_ctl_name(char *dst, const char *src, const char *suffix) sprintf(dst, "%s %s", src, suffix); else strcpy(dst, src); -} +} /* remove the control with the given name and optional suffix */ static int snd_ac97_remove_ctl(struct snd_ac97 *ac97, const char *name, @@ -2644,7 +2644,7 @@ static int tune_hp_only(struct snd_ac97 *ac97) { struct snd_kcontrol *msw = ctl_find(ac97, "Master Playback Switch", NULL); struct snd_kcontrol *mvol = ctl_find(ac97, "Master Playback Volume", NULL); - if (! msw || ! mvol) + if (!msw || !mvol) return -ENOENT; msw->put = bind_hp_volsw_put; mvol->put = bind_hp_volsw_put; @@ -2699,7 +2699,7 @@ static int tune_ad_sharing(struct snd_ac97 *ac97) return 0; } -static const struct snd_kcontrol_new snd_ac97_alc_jack_detect = +static const struct snd_kcontrol_new snd_ac97_alc_jack_detect = AC97_SINGLE("Jack Detect", AC97_ALC650_CLOCK, 5, 1, 0); /* ac97 tune: set up ALC jack-select */ @@ -2720,7 +2720,7 @@ static int tune_alc_jack(struct snd_ac97 *ac97) static int tune_inv_eapd(struct snd_ac97 *ac97) { struct snd_kcontrol *kctl = ctl_find(ac97, "External Amplifier", NULL); - if (! kctl) + if (!kctl) return -ENOENT; set_inv_eapd(ac97, kctl); return 0; @@ -2749,7 +2749,7 @@ static int master_mute_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem static int tune_mute_led(struct snd_ac97 *ac97) { struct snd_kcontrol *msw = ctl_find(ac97, "Master Playback Switch", NULL); - if (! msw) + if (!msw) return -ENOENT; msw->put = master_mute_sw_put; snd_ac97_remove_ctl(ac97, "External Amplifier", NULL); @@ -2782,7 +2782,7 @@ static int tune_hp_mute_led(struct snd_ac97 *ac97) { struct snd_kcontrol *msw = ctl_find(ac97, "Master Playback Switch", NULL); struct snd_kcontrol *mvol = ctl_find(ac97, "Master Playback Volume", NULL); - if (! msw || ! mvol) + if (!msw || !mvol) return -ENOENT; msw->put = hp_master_mute_sw_put; mvol->put = bind_hp_volsw_put; @@ -2830,7 +2830,7 @@ static int apply_quirk_str(struct snd_ac97 *ac97, const char *typestr) for (i = 0; i < ARRAY_SIZE(applicable_quirks); i++) { q = &applicable_quirks[i]; - if (q->name && ! strcmp(typestr, q->name)) + if (q->name && !strcmp(typestr, q->name)) return apply_quirk(ac97, i); } /* for compatibility, accept the numbers, too */ @@ -2864,13 +2864,13 @@ int snd_ac97_tune_hardware(struct snd_ac97 *ac97, struct ac97_quirk *quirk, cons return result; } - if (! quirk) + if (!quirk) return -EINVAL; for (; quirk->subvendor; quirk++) { if (quirk->subvendor != ac97->subsystem_vendor) continue; - if ((! quirk->mask && quirk->subdevice == ac97->subsystem_device) || + if ((!quirk->mask && quirk->subdevice == ac97->subsystem_device) || quirk->subdevice == (quirk->mask & ac97->subsystem_device)) { if (quirk->codec_id && quirk->codec_id != ac97->id) continue; diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c index 6ce3cbe..19e8572 100644 --- a/sound/pci/ac97/ac97_patch.c +++ b/sound/pci/ac97/ac97_patch.c @@ -30,7 +30,7 @@ * Chip specific initialization */ -static int patch_build_controls(struct snd_ac97 * ac97, const struct snd_kcontrol_new *controls, int count) +static int patch_build_controls(struct snd_ac97 *ac97, const struct snd_kcontrol_new *controls, int count) { int idx, err; @@ -446,7 +446,7 @@ static const struct snd_kcontrol_new snd_ac97_ymf753_controls_spdif[3] = { AC97_YMF7X3_DIT_CTRL, 2, 1, 1) }; -static int patch_yamaha_ymf753_post_spdif(struct snd_ac97 * ac97) +static int patch_yamaha_ymf753_post_spdif(struct snd_ac97 *ac97) { int err; @@ -460,7 +460,7 @@ static struct snd_ac97_build_ops patch_yamaha_ymf753_ops = { .build_post_spdif = patch_yamaha_ymf753_post_spdif }; -static int patch_yamaha_ymf753(struct snd_ac97 * ac97) +static int patch_yamaha_ymf753(struct snd_ac97 *ac97) { /* Patch for Yamaha YMF753, Copyright (c) by David Shust, dshust(a)shustring.com. This chip has nonstandard and extended behaviour with regard to its S/PDIF output. @@ -486,14 +486,14 @@ AC97_DOUBLE("Front Playback Volume", AC97_WM97XX_FMIXER_VOL, 8, 0, 31, 1), AC97_SINGLE("Front Playback Switch", AC97_WM97XX_FMIXER_VOL, 15, 1, 1), }; -static int patch_wolfson_wm9703_specific(struct snd_ac97 * ac97) +static int patch_wolfson_wm9703_specific(struct snd_ac97 *ac97) { /* This is known to work for the ViewSonic ViewPad 1000 * Randolph Bentson <bentson(a)holmsjoen.com> - * WM9703/9707/9708/9717 + * WM9703/9707/9708/9717 */ int err, i; - + for (i = 0; i < ARRAY_SIZE(wm97xx_snd_ac97_controls); i++) { if ((err = snd_ctl_add(ac97->bus->card, snd_ac97_cnew(&wm97xx_snd_ac97_controls[i], ac97))) < 0) return err; @@ -506,7 +506,7 @@ static struct snd_ac97_build_ops patch_wolfson_wm9703_ops = { .build_specific = patch_wolfson_wm9703_specific, }; -static int patch_wolfson03(struct snd_ac97 * ac97) +static int patch_wolfson03(struct snd_ac97 *ac97) { ac97->build_ops = &patch_wolfson_wm9703_ops; return 0; @@ -521,7 +521,7 @@ AC97_DOUBLE("Rear DAC Volume", AC97_WM9704_RPCM_VOL, 8, 0, 31, 1), AC97_DOUBLE("Surround Volume", AC97_SURROUND_MASTER, 8, 0, 31, 1), }; -static int patch_wolfson_wm9704_specific(struct snd_ac97 * ac97) +static int patch_wolfson_wm9704_specific(struct snd_ac97 *ac97) { int err, i; for (i = 0; i < ARRAY_SIZE(wm9704_snd_ac97_controls); i++) { @@ -537,14 +537,14 @@ static struct snd_ac97_build_ops patch_wolfson_wm9704_ops = { .build_specific = patch_wolfson_wm9704_specific, }; -static int patch_wolfson04(struct snd_ac97 * ac97) +static int patch_wolfson04(struct snd_ac97 *ac97) { /* WM9704M/9704Q */ ac97->build_ops = &patch_wolfson_wm9704_ops; return 0; } -static int patch_wolfson_wm9705_specific(struct snd_ac97 * ac97) +static int patch_wolfson_wm9705_specific(struct snd_ac97 *ac97) { int err, i; for (i = 0; i < ARRAY_SIZE(wm97xx_snd_ac97_controls); i++) { @@ -559,7 +559,7 @@ static struct snd_ac97_build_ops patch_wolfson_wm9705_ops = { .build_specific = patch_wolfson_wm9705_specific, }; -static int patch_wolfson05(struct snd_ac97 * ac97) +static int patch_wolfson05(struct snd_ac97 *ac97) { /* WM9705, WM9710 */ ac97->build_ops = &patch_wolfson_wm9705_ops; @@ -578,7 +578,7 @@ static const char* wm9711_rec_adc[] = {"Stereo", "Left", "Right", "Mute"}; static const char* wm9711_base[] = {"Linear Control", "Adaptive Boost"}; static const char* wm9711_rec_gain[] = {"+1.5dB Steps", "+0.75dB Steps"}; static const char* wm9711_mic[] = {"Mic 1", "Differential", "Mic 2", "Stereo"}; -static const char* wm9711_rec_sel[] = +static const char* wm9711_rec_sel[] = {"Mic 1", "NC", "NC", "Master Mix", "Line", "Headphone Mix", "Phone Mix", "Phone"}; static const char* wm9711_ng_type[] = {"Constant Gain", "Mute"}; @@ -675,10 +675,10 @@ AC97_SINGLE("Headphone ZC Switch", AC97_HEADPHONE, 7, 1, 0), AC97_SINGLE("Mono ZC Switch", AC97_MASTER_MONO, 7, 1, 0), }; -static int patch_wolfson_wm9711_specific(struct snd_ac97 * ac97) +static int patch_wolfson_wm9711_specific(struct snd_ac97 *ac97) { int err, i; - + for (i = 0; i < ARRAY_SIZE(wm9711_snd_ac97_controls); i++) { if ((err = snd_ctl_add(ac97->bus->card, snd_ac97_cnew(&wm9711_snd_ac97_controls[i], ac97))) < 0) return err; @@ -696,32 +696,32 @@ static struct snd_ac97_build_ops patch_wolfson_wm9711_ops = { .build_specific = patch_wolfson_wm9711_specific, }; -static int patch_wolfson11(struct snd_ac97 * ac97) +static int patch_wolfson11(struct snd_ac97 *ac97) { /* WM9711, WM9712 */ ac97->build_ops = &patch_wolfson_wm9711_ops; ac97->flags |= AC97_HAS_NO_REC_GAIN | AC97_STEREO_MUTES | AC97_HAS_NO_MIC | AC97_HAS_NO_PC_BEEP | AC97_HAS_NO_VIDEO | AC97_HAS_NO_CD; - + return 0; } static const char* wm9713_mic_mixer[] = {"Stereo", "Mic 1", "Mic 2", "Mute"}; static const char* wm9713_rec_mux[] = {"Stereo", "Left", "Right", "Mute"}; -static const char* wm9713_rec_src[] = - {"Mic 1", "Mic 2", "Line", "Mono In", "Headphone Mix", "Master Mix", +static const char* wm9713_rec_src[] = + {"Mic 1", "Mic 2", "Line", "Mono In", "Headphone Mix", "Master Mix", "Mono Mix", "Zh"}; static const char* wm9713_rec_gain[] = {"+1.5dB Steps", "+0.75dB Steps"}; static const char* wm9713_alc_select[] = {"None", "Left", "Right", "Stereo"}; static const char* wm9713_mono_pga[] = {"Vmid", "Zh", "Mono Mix", "Inv 1"}; -static const char* wm9713_spk_pga[] = +static const char* wm9713_spk_pga[] = {"Vmid", "Zh", "Headphone Mix", "Master Mix", "Inv", "NC", "NC", "NC"}; static const char* wm9713_hp_pga[] = {"Vmid", "Zh", "Headphone Mix", "NC"}; static const char* wm9713_out3_pga[] = {"Vmid", "Zh", "Inv 1", "NC"}; static const char* wm9713_out4_pga[] = {"Vmid", "Zh", "Inv 2", "NC"}; -static const char* wm9713_dac_inv[] = - {"Off", "Mono Mix", "Master Mix", "Headphone Mix L", "Headphone Mix R", +static const char* wm9713_dac_inv[] = + {"Off", "Mono Mix", "Master Mix", "Headphone Mix L", "Headphone Mix R", "Headphone Mix Mono", "NC", "Vmid"}; static const char* wm9713_base[] = {"Linear Control", "Adaptive Boost"}; static const char* wm9713_ng_type[] = {"Constant Gain", "Mute"}; @@ -842,10 +842,10 @@ AC97_SINGLE("3D Lower Cut-off Switch", AC97_REC_GAIN_MIC, 4, 1, 0), AC97_SINGLE("3D Depth", AC97_REC_GAIN_MIC, 0, 15, 1), }; -static int patch_wolfson_wm9713_3d (struct snd_ac97 * ac97) +static int patch_wolfson_wm9713_3d(struct snd_ac97 *ac97) { int err, i; - + for (i = 0; i < ARRAY_SIZE(wm13_snd_ac97_controls_3d); i++) { if ((err = snd_ctl_add(ac97->bus->card, snd_ac97_cnew(&wm13_snd_ac97_controls_3d[i], ac97))) < 0) return err; @@ -853,10 +853,10 @@ static int patch_wolfson_wm9713_3d (struct snd_ac97 * ac97) return 0; } -static int patch_wolfson_wm9713_specific(struct snd_ac97 * ac97) +static int patch_wolfson_wm9713_specific(struct snd_ac97 *ac97) { int err, i; - + for (i = 0; i < ARRAY_SIZE(wm13_snd_ac97_controls); i++) { if ((err = snd_ctl_add(ac97->bus->card, snd_ac97_cnew(&wm13_snd_ac97_controls[i], ac97))) < 0) return err; @@ -872,13 +872,13 @@ static int patch_wolfson_wm9713_specific(struct snd_ac97 * ac97) } #ifdef CONFIG_PM -static void patch_wolfson_wm9713_suspend (struct snd_ac97 * ac97) +static void patch_wolfson_wm9713_suspend(struct snd_ac97 *ac97) { snd_ac97_write_cache(ac97, AC97_EXTENDED_MID, 0xfeff); snd_ac97_write_cache(ac97, AC97_EXTENDED_MSTATUS, 0xffff); } -static void patch_wolfson_wm9713_resume (struct snd_ac97 * ac97) +static void patch_wolfson_wm9713_resume(struct snd_ac97 *ac97) { snd_ac97_write_cache(ac97, AC97_EXTENDED_MID, 0xda00); snd_ac97_write_cache(ac97, AC97_EXTENDED_MSTATUS, 0x3810); @@ -889,13 +889,13 @@ static void patch_wolfson_wm9713_resume (struct snd_ac97 * ac97) static struct snd_ac97_build_ops patch_wolfson_wm9713_ops = { .build_specific = patch_wolfson_wm9713_specific, .build_3d = patch_wolfson_wm9713_3d, -#ifdef CONFIG_PM +#ifdef CONFIG_PM .suspend = patch_wolfson_wm9713_suspend, .resume = patch_wolfson_wm9713_resume #endif }; -static int patch_wolfson13(struct snd_ac97 * ac97) +static int patch_wolfson13(struct snd_ac97 *ac97) { /* WM9713, WM9714 */ ac97->build_ops = &patch_wolfson_wm9713_ops; @@ -915,7 +915,7 @@ static int patch_wolfson13(struct snd_ac97 * ac97) /* * Tritech codec */ -static int patch_tritech_tr28028(struct snd_ac97 * ac97) +static int patch_tritech_tr28028(struct snd_ac97 *ac97) { snd_ac97_write_cache(ac97, 0x26, 0x0300); snd_ac97_write_cache(ac97, 0x26, 0x0000); @@ -927,7 +927,7 @@ static int patch_tritech_tr28028(struct snd_ac97 * ac97) /* * Sigmatel STAC97xx codecs */ -static int patch_sigmatel_stac9700_3d(struct snd_ac97 * ac97) +static int patch_sigmatel_stac9700_3d(struct snd_ac97 *ac97) { struct snd_kcontrol *kctl; int err; @@ -940,7 +940,7 @@ static int patch_sigmatel_stac9700_3d(struct snd_ac97 * ac97) return 0; } -static int patch_sigmatel_stac9708_3d(struct snd_ac97 * ac97) +static int patch_sigmatel_stac9708_3d(struct snd_ac97 *ac97) { struct snd_kcontrol *kctl; int err; @@ -968,7 +968,7 @@ AC97_SINGLE("Sigmatel DAC 6dB Attenuate", AC97_SIGMATEL_ANALOG, 1, 1, 0), AC97_SINGLE("Sigmatel ADC 6dB Attenuate", AC97_SIGMATEL_ANALOG, 0, 1, 0) }; -static int patch_sigmatel_stac97xx_specific(struct snd_ac97 * ac97) +static int patch_sigmatel_stac97xx_specific(struct snd_ac97 *ac97) { int err; @@ -993,7 +993,7 @@ static struct snd_ac97_build_ops patch_sigmatel_stac9700_ops = { .build_specific = patch_sigmatel_stac97xx_specific }; -static int patch_sigmatel_stac9700(struct snd_ac97 * ac97) +static int patch_sigmatel_stac9700(struct snd_ac97 *ac97) { ac97->build_ops = &patch_sigmatel_stac9700_ops; return 0; @@ -1040,7 +1040,7 @@ static struct snd_ac97_build_ops patch_sigmatel_stac9708_ops = { .build_specific = patch_sigmatel_stac9708_specific }; -static int patch_sigmatel_stac9708(struct snd_ac97 * ac97) +static int patch_sigmatel_stac9708(struct snd_ac97 *ac97) { unsigned int codec72, codec6c; @@ -1066,11 +1066,11 @@ static int patch_sigmatel_stac9708(struct snd_ac97 * ac97) return 0; } -static int patch_sigmatel_stac9721(struct snd_ac97 * ac97) +static int patch_sigmatel_stac9721(struct snd_ac97 *ac97) { ac97->build_ops = &patch_sigmatel_stac9700_ops; if (snd_ac97_read(ac97, AC97_SIGMATEL_ANALOG) == 0) { - // patch for SigmaTel + /* patch for SigmaTel */ snd_ac97_write_cache(ac97, AC97_SIGMATEL_CIC1, 0xabba); snd_ac97_write_cache(ac97, AC97_SIGMATEL_CIC2, 0x4000); snd_ac97_write_cache(ac97, AC97_SIGMATEL_BIAS1, 0xabba); @@ -1080,9 +1080,9 @@ static int patch_sigmatel_stac9721(struct snd_ac97 * ac97) return 0; } -static int patch_sigmatel_stac9744(struct snd_ac97 * ac97) +static int patch_sigmatel_stac9744(struct snd_ac97 *ac97) { - // patch for SigmaTel + /* patch for SigmaTel */ ac97->build_ops = &patch_sigmatel_stac9700_ops; snd_ac97_write_cache(ac97, AC97_SIGMATEL_CIC1, 0xabba); snd_ac97_write_cache(ac97, AC97_SIGMATEL_CIC2, 0x0000); /* is this correct? --jk */ @@ -1092,9 +1092,9 @@ static int patch_sigmatel_stac9744(struct snd_ac97 * ac97) return 0; } -static int patch_sigmatel_stac9756(struct snd_ac97 * ac97) +static int patch_sigmatel_stac9756(struct snd_ac97 *ac97) { - // patch for SigmaTel + /* patch for SigmaTel */ ac97->build_ops = &patch_sigmatel_stac9700_ops; snd_ac97_write_cache(ac97, AC97_SIGMATEL_CIC1, 0xabba); snd_ac97_write_cache(ac97, AC97_SIGMATEL_CIC2, 0x0000); /* is this correct? --jk */ @@ -1269,7 +1269,7 @@ static struct snd_ac97_build_ops patch_sigmatel_stac9758_ops = { .build_specific = patch_sigmatel_stac9758_specific }; -static int patch_sigmatel_stac9758(struct snd_ac97 * ac97) +static int patch_sigmatel_stac9758(struct snd_ac97 *ac97) { static unsigned short regs[4] = { AC97_SIGMATEL_OUTSEL, @@ -1293,12 +1293,12 @@ static int patch_sigmatel_stac9758(struct snd_ac97 * ac97) int i; /* Gateway M675 notebook */ - if (ac97->pci && + if (ac97->pci && ac97->subsystem_vendor == 0x107b && ac97->subsystem_device == 0x0601) pregs = m675_regs; - // patch for SigmaTel + /* patch for SigmaTel */ ac97->build_ops = &patch_sigmatel_stac9758_ops; /* FIXME: assume only page 0 for writing cache */ snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, AC97_PAGE_VENDOR); @@ -1317,7 +1317,7 @@ static const struct snd_kcontrol_new snd_ac97_cirrus_controls_spdif[2] = { AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "AC97-SPSA", AC97_CSR_ACMODE, 0, 3, 0) }; -static int patch_cirrus_build_spdif(struct snd_ac97 * ac97) +static int patch_cirrus_build_spdif(struct snd_ac97 *ac97) { int err; @@ -1343,7 +1343,7 @@ static struct snd_ac97_build_ops patch_cirrus_ops = { .build_spdif = patch_cirrus_build_spdif }; -static int patch_cirrus_spdif(struct snd_ac97 * ac97) +static int patch_cirrus_spdif(struct snd_ac97 *ac97) { /* Basically, the cs4201/cs4205/cs4297a has non-standard sp/dif registers. WHY CAN'T ANYONE FOLLOW THE BLOODY SPEC? *sigh* @@ -1357,18 +1357,18 @@ static int patch_cirrus_spdif(struct snd_ac97 * ac97) */ ac97->build_ops = &patch_cirrus_ops; - ac97->flags |= AC97_CS_SPDIF; + ac97->flags |= AC97_CS_SPDIF; ac97->rates[AC97_RATES_SPDIF] &= ~SNDRV_PCM_RATE_32000; ac97->ext_id |= AC97_EI_SPDIF; /* force the detection of spdif */ snd_ac97_write_cache(ac97, AC97_CSR_ACMODE, 0x0080); return 0; } -static int patch_cirrus_cs4299(struct snd_ac97 * ac97) +static int patch_cirrus_cs4299(struct snd_ac97 *ac97) { /* force the detection of PC Beep */ ac97->flags |= AC97_HAS_PC_BEEP; - + return patch_cirrus_spdif(ac97); } @@ -1379,7 +1379,7 @@ static const struct snd_kcontrol_new snd_ac97_conexant_controls_spdif[1] = { AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH), AC97_CXR_AUDIO_MISC, 3, 1, 0), }; -static int patch_conexant_build_spdif(struct snd_ac97 * ac97) +static int patch_conexant_build_spdif(struct snd_ac97 *ac97) { int err; @@ -1400,7 +1400,7 @@ static struct snd_ac97_build_ops patch_conexant_ops = { .build_spdif = patch_conexant_build_spdif }; -static int patch_conexant(struct snd_ac97 * ac97) +static int patch_conexant(struct snd_ac97 *ac97) { ac97->build_ops = &patch_conexant_ops; ac97->flags |= AC97_CX_SPDIF; @@ -1434,13 +1434,13 @@ static void ad18xx_resume(struct snd_ac97 *ac97) } } - if (! (ac97->flags & AC97_AD_MULTI)) + if (!(ac97->flags & AC97_AD_MULTI)) /* normal restore */ snd_ac97_restore_status(ac97); else { /* restore the AD18xx codec configurations */ for (codec = 0; codec < 3; codec++) { - if (! ac97->spec.ad18xx.id[codec]) + if (!ac97->spec.ad18xx.id[codec]) continue; /* select single codec */ snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000, @@ -1451,14 +1451,14 @@ static void ad18xx_resume(struct snd_ac97 *ac97) snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000, 0x7000); /* restore status */ - for (i = 2; i < 0x7c ; i += 2) { + for (i = 2; i < 0x7c; i += 2) { if (i == AC97_POWERDOWN || i == AC97_EXTENDED_ID) continue; if (test_bit(i, ac97->reg_accessed)) { /* handle multi codecs for AD18xx */ if (i == AC97_PCM) { for (codec = 0; codec < 3; codec++) { - if (! ac97->spec.ad18xx.id[codec]) + if (!ac97->spec.ad18xx.id[codec]) continue; /* select single codec */ snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000, @@ -1501,22 +1501,22 @@ static const struct snd_ac97_res_table ad1819_restbl[] = { { } /* terminator */ }; -static int patch_ad1819(struct snd_ac97 * ac97) +static int patch_ad1819(struct snd_ac97 *ac97) { unsigned short scfg; - // patch for Analog Devices + /* patch for Analog Devices */ scfg = snd_ac97_read(ac97, AC97_AD_SERIAL_CFG); snd_ac97_write_cache(ac97, AC97_AD_SERIAL_CFG, scfg | 0x7000); /* select all codecs */ ac97->res_table = ad1819_restbl; return 0; } -static unsigned short patch_ad1881_unchained(struct snd_ac97 * ac97, int idx, unsigned short mask) +static unsigned short patch_ad1881_unchained(struct snd_ac97 *ac97, int idx, unsigned short mask) { unsigned short val; - // test for unchained codec + /* test for unchained codec */ snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000, mask); snd_ac97_write_cache(ac97, AC97_AD_CODEC_CFG, 0x0000); /* ID0C, ID1C, SDIE = off */ val = snd_ac97_read(ac97, AC97_VENDOR_ID2); @@ -1528,13 +1528,13 @@ static unsigned short patch_ad1881_unchained(struct snd_ac97 * ac97, int idx, un return mask; } -static int patch_ad1881_chained1(struct snd_ac97 * ac97, int idx, unsigned short codec_bits) +static int patch_ad1881_chained1(struct snd_ac97 *ac97, int idx, unsigned short codec_bits) { static int cfg_bits[3] = { 1<<12, 1<<14, 1<<13 }; unsigned short val; - + snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000, cfg_bits[idx]); - snd_ac97_write_cache(ac97, AC97_AD_CODEC_CFG, 0x0004); // SDIE + snd_ac97_write_cache(ac97, AC97_AD_CODEC_CFG, 0x0004); /* SDIE */ val = snd_ac97_read(ac97, AC97_VENDOR_ID2); if ((val & 0xff40) != 0x5340) return 0; @@ -1546,26 +1546,26 @@ static int patch_ad1881_chained1(struct snd_ac97 * ac97, int idx, unsigned short return 1; } -static void patch_ad1881_chained(struct snd_ac97 * ac97, int unchained_idx, int cidx1, int cidx2) +static void patch_ad1881_chained(struct snd_ac97 *ac97, int unchained_idx, int cidx1, int cidx2) { - // already detected? + /* already detected? */ if (ac97->spec.ad18xx.unchained[cidx1] || ac97->spec.ad18xx.chained[cidx1]) cidx1 = -1; if (ac97->spec.ad18xx.unchained[cidx2] || ac97->spec.ad18xx.chained[cidx2]) cidx2 = -1; if (cidx1 < 0 && cidx2 < 0) return; - // test for chained codecs + /* test for chained codecs */ snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000, ac97->spec.ad18xx.unchained[unchained_idx]); - snd_ac97_write_cache(ac97, AC97_AD_CODEC_CFG, 0x0002); // ID1C + snd_ac97_write_cache(ac97, AC97_AD_CODEC_CFG, 0x0002); /* ID1C */ ac97->spec.ad18xx.codec_cfg[unchained_idx] = 0x0002; if (cidx1 >= 0) { if (cidx2 < 0) patch_ad1881_chained1(ac97, cidx1, 0); - else if (patch_ad1881_chained1(ac97, cidx1, 0x0006)) // SDIE | ID1C + else if (patch_ad1881_chained1(ac97, cidx1, 0x0006)) /* SDIE | ID1C */ patch_ad1881_chained1(ac97, cidx2, 0); - else if (patch_ad1881_chained1(ac97, cidx2, 0x0006)) // SDIE | ID1C + else if (patch_ad1881_chained1(ac97, cidx2, 0x0006)) /* SDIE | ID1C */ patch_ad1881_chained1(ac97, cidx1, 0); } else if (cidx2 >= 0) { patch_ad1881_chained1(ac97, cidx2, 0); @@ -1578,15 +1578,15 @@ static struct snd_ac97_build_ops patch_ad1881_build_ops = { #endif }; -static int patch_ad1881(struct snd_ac97 * ac97) +static int patch_ad1881(struct snd_ac97 *ac97) { static const char cfg_idxs[3][2] = { {2, 1}, {0, 2}, {0, 1} }; - - // patch for Analog Devices + + /* patch for Analog Devices */ unsigned short codecs[3]; unsigned short val; int idx, num; @@ -1597,7 +1597,7 @@ static int patch_ad1881(struct snd_ac97 * ac97) codecs[1] = patch_ad1881_unchained(ac97, 1, (1<<14)); codecs[2] = patch_ad1881_unchained(ac97, 2, (1<<13)); - if (! (codecs[0] || codecs[1] || codecs[2])) + if (!(codecs[0] || codecs[1] || codecs[2])) goto __end; for (idx = 0; idx < 3; idx++) @@ -1613,7 +1613,7 @@ static int patch_ad1881(struct snd_ac97 * ac97) ac97->scaps |= AC97_SCAP_CENTER_LFE_DAC; } - __end: +__end: /* select all codecs */ snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000, 0x7000); /* check if only one codec is present */ @@ -1623,8 +1623,8 @@ static int patch_ad1881(struct snd_ac97 * ac97) if (num == 1) { /* ok, deselect all ID bits */ snd_ac97_write_cache(ac97, AC97_AD_CODEC_CFG, 0x0000); - ac97->spec.ad18xx.codec_cfg[0] = - ac97->spec.ad18xx.codec_cfg[1] = + ac97->spec.ad18xx.codec_cfg[0] = + ac97->spec.ad18xx.codec_cfg[1] = ac97->spec.ad18xx.codec_cfg[2] = 0x0000; } /* required for AD1886/AD1885 combination */ @@ -1648,7 +1648,7 @@ static const struct snd_kcontrol_new snd_ac97_controls_ad1885[] = { static const DECLARE_TLV_DB_SCALE(db_scale_6bit_6db_max, -8850, 150, 0); -static int patch_ad1885_specific(struct snd_ac97 * ac97) +static int patch_ad1885_specific(struct snd_ac97 *ac97) { int err; @@ -1666,7 +1666,7 @@ static struct snd_ac97_build_ops patch_ad1885_build_ops = { #endif }; -static int patch_ad1885(struct snd_ac97 * ac97) +static int patch_ad1885(struct snd_ac97 *ac97) { patch_ad1881(ac97); /* This is required to deal with the Intel D815EEAL2 */ @@ -1679,7 +1679,7 @@ static int patch_ad1885(struct snd_ac97 * ac97) return 0; } -static int patch_ad1886_specific(struct snd_ac97 * ac97) +static int patch_ad1886_specific(struct snd_ac97 *ac97) { reset_tlv(ac97, "Headphone Playback Volume", db_scale_6bit_6db_max); @@ -1693,7 +1693,7 @@ static struct snd_ac97_build_ops patch_ad1886_build_ops = { #endif }; -static int patch_ad1886(struct snd_ac97 * ac97) +static int patch_ad1886(struct snd_ac97 *ac97) { patch_ad1881(ac97); /* Presario700 workaround */ @@ -1847,7 +1847,7 @@ static const struct snd_kcontrol_new snd_ac97_ad198x_spdif_source = { .put = snd_ac97_ad198x_spdif_source_put, }; -static int patch_ad198x_post_spdif(struct snd_ac97 * ac97) +static int patch_ad198x_post_spdif(struct snd_ac97 *ac97) { return patch_build_controls(ac97, &snd_ac97_ad198x_spdif_source, 1); } @@ -1882,7 +1882,7 @@ static int check_list(struct snd_ac97 *ac97, const unsigned int *list) return 0; } -static int patch_ad1981a_specific(struct snd_ac97 * ac97) +static int patch_ad1981a_specific(struct snd_ac97 *ac97) { if (check_list(ac97, ad1981_jacks_blacklist)) return 0; @@ -2092,10 +2092,10 @@ static struct snd_ac97_build_ops patch_ad1888_build_ops = { .update_jacks = ad1888_update_jacks, }; -static int patch_ad1888(struct snd_ac97 * ac97) +static int patch_ad1888(struct snd_ac97 *ac97) { unsigned short misc; - + patch_ad1881(ac97); ac97->build_ops = &patch_ad1888_build_ops; @@ -2141,7 +2141,7 @@ static struct snd_ac97_build_ops patch_ad1980_build_ops = { .update_jacks = ad1888_update_jacks, }; -static int patch_ad1980(struct snd_ac97 * ac97) +static int patch_ad1980(struct snd_ac97 *ac97) { patch_ad1888(ac97); ac97->build_ops = &patch_ad1980_build_ops; @@ -2175,7 +2175,7 @@ static int snd_ac97_ad1985_vrefout_get(struct snd_kcontrol *kcontrol, return 0; } -static int snd_ac97_ad1985_vrefout_put(struct snd_kcontrol *kcontrol, +static int snd_ac97_ad1985_vrefout_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { static const int ctrl2reg[4] = {1, 2, 0, 3}; @@ -2256,10 +2256,10 @@ static struct snd_ac97_build_ops patch_ad1985_build_ops = { .update_jacks = ad1985_update_jacks, }; -static int patch_ad1985(struct snd_ac97 * ac97) +static int patch_ad1985(struct snd_ac97 *ac97) { unsigned short misc; - + patch_ad1881(ac97); ac97->build_ops = &patch_ad1985_build_ops; misc = snd_ac97_read(ac97, AC97_AD_MISC); @@ -2548,7 +2548,7 @@ static struct snd_ac97_build_ops patch_ad1986_build_ops = { .update_jacks = ad1986_update_jacks, }; -static int patch_ad1986(struct snd_ac97 * ac97) +static int patch_ad1986(struct snd_ac97 *ac97) { patch_ad1881(ac97); ac97->build_ops = &patch_ad1986_build_ops; @@ -2575,7 +2575,7 @@ static int patch_alc203(struct snd_ac97 *ac97) static void alc650_update_jacks(struct snd_ac97 *ac97) { int shared; - + /* shared Line-In / Surround Out */ shared = is_shared_surrout(ac97); snd_ac97_update_bits(ac97, AC97_ALC650_MULTICH, 1 << 9, @@ -2628,7 +2628,7 @@ static const struct snd_kcontrol_new snd_ac97_spdif_controls_alc650[] = { static const DECLARE_TLV_DB_SCALE(db_scale_5bit_3db_max, -4350, 150, 0); -static int patch_alc650_specific(struct snd_ac97 * ac97) +static int patch_alc650_specific(struct snd_ac97 *ac97) { int err; @@ -2649,7 +2649,7 @@ static struct snd_ac97_build_ops patch_alc650_ops = { .update_jacks = alc650_update_jacks }; -static int patch_alc650(struct snd_ac97 * ac97) +static int patch_alc650(struct snd_ac97 *ac97) { unsigned short val; @@ -2672,7 +2672,7 @@ static int patch_alc650(struct snd_ac97 * ac97) ac97->id == 0x414c4723); /* enable AC97_ALC650_GPIO_SETUP, AC97_ALC650_CLOCK for R/W */ - snd_ac97_write_cache(ac97, AC97_ALC650_GPIO_STATUS, + snd_ac97_write_cache(ac97, AC97_ALC650_GPIO_STATUS, snd_ac97_read(ac97, AC97_ALC650_GPIO_STATUS) | 0x8000); /* Enable SPDIF-IN only on Rev.E and above */ @@ -2680,7 +2680,7 @@ static int patch_alc650(struct snd_ac97 * ac97) /* SPDIF IN with pin 47 */ if (ac97->spec.dev_flags && /* ASUS A6KM requires EAPD */ - ! (ac97->subsystem_vendor == 0x1043 && + !(ac97->subsystem_vendor == 0x1043 && ac97->subsystem_device == 0x1103)) val |= 0x03; /* enable */ else @@ -2710,7 +2710,7 @@ static int patch_alc650(struct snd_ac97 * ac97) static void alc655_update_jacks(struct snd_ac97 *ac97) { int shared; - + /* shared Line-In / Surround Out */ shared = is_shared_surrout(ac97); ac97_update_bits_page(ac97, AC97_ALC650_MULTICH, 1 << 9, @@ -2783,7 +2783,7 @@ static const struct snd_kcontrol_new snd_ac97_spdif_controls_alc655[] = { }, }; -static int patch_alc655_specific(struct snd_ac97 * ac97) +static int patch_alc655_specific(struct snd_ac97 *ac97) { int err; @@ -2801,7 +2801,7 @@ static struct snd_ac97_build_ops patch_alc655_ops = { .update_jacks = alc655_update_jacks }; -static int patch_alc655(struct snd_ac97 * ac97) +static int patch_alc655(struct snd_ac97 *ac97) { unsigned int val; @@ -2862,7 +2862,7 @@ static void alc850_update_jacks(struct snd_ac97 *ac97) { int shared; int aux_is_back_surround; - + /* shared Line-In / Surround Out */ shared = is_shared_surrout(ac97); /* SURR 1kOhm (bit4), Amp (bit5) */ @@ -2963,7 +2963,7 @@ static const struct snd_kcontrol_new snd_ac97_cm9738_controls[] = { AC97_CHANNEL_MODE_4CH_CTL, }; -static int patch_cm9738_specific(struct snd_ac97 * ac97) +static int patch_cm9738_specific(struct snd_ac97 *ac97) { return patch_build_controls(ac97, snd_ac97_cm9738_controls, ARRAY_SIZE(snd_ac97_cm9738_controls)); } @@ -2973,7 +2973,7 @@ static struct snd_ac97_build_ops patch_cm9738_ops = { .update_jacks = cm9738_update_jacks }; -static int patch_cm9738(struct snd_ac97 * ac97) +static int patch_cm9738(struct snd_ac97 *ac97) { ac97->build_ops = &patch_cm9738_ops; /* FIXME: can anyone confirm below? */ @@ -3012,7 +3012,7 @@ static int snd_ac97_cmedia_spdif_playback_source_put(struct snd_kcontrol *kcontr struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol); return snd_ac97_update_bits(ac97, AC97_CM9739_SPDIF_CTRL, - 0x01 << 1, + 0x01 << 1, (ucontrol->value.enumerated.item[0] & 0x01) << 1); } @@ -3028,7 +3028,7 @@ static const struct snd_kcontrol_new snd_ac97_cm9739_controls_spdif[] = { /* BIT 2: IG_SPIV */ AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,NONE) "Valid Switch", AC97_CM9739_SPDIF_CTRL, 2, 1, 0), /* BIT 3: SPI2F */ - AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,NONE) "Monitor", AC97_CM9739_SPDIF_CTRL, 3, 1, 0), + AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,NONE) "Monitor", AC97_CM9739_SPDIF_CTRL, 3, 1, 0), /* BIT 4: SPI2SDI */ AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), AC97_CM9739_SPDIF_CTRL, 4, 1, 0), /* BIT 8: SPD32 - 32bit SPDIF - not supported yet */ @@ -3049,12 +3049,12 @@ static const struct snd_kcontrol_new snd_ac97_cm9739_controls[] = { AC97_CHANNEL_MODE_CTL, }; -static int patch_cm9739_specific(struct snd_ac97 * ac97) +static int patch_cm9739_specific(struct snd_ac97 *ac97) { return patch_build_controls(ac97, snd_ac97_cm9739_controls, ARRAY_SIZE(snd_ac97_cm9739_controls)); } -static int patch_cm9739_post_spdif(struct snd_ac97 * ac97) +static int patch_cm9739_post_spdif(struct snd_ac97 *ac97) { return patch_build_controls(ac97, snd_ac97_cm9739_controls_spdif, ARRAY_SIZE(snd_ac97_cm9739_controls_spdif)); } @@ -3065,7 +3065,7 @@ static struct snd_ac97_build_ops patch_cm9739_ops = { .update_jacks = cm9739_update_jacks }; -static int patch_cm9739(struct snd_ac97 * ac97) +static int patch_cm9739(struct snd_ac97 *ac97) { unsigned short val; @@ -3100,7 +3100,7 @@ static int patch_cm9739(struct snd_ac97 * ac97) val = snd_ac97_read(ac97, AC97_CM9739_MULTI_CHAN) & (1 << 4); val |= (1 << 3); val |= (1 << 13); - if (! (ac97->ext_id & AC97_EI_SPDIF)) + if (!(ac97->ext_id & AC97_EI_SPDIF)) val |= (1 << 14); snd_ac97_write_cache(ac97, AC97_CM9739_MULTI_CHAN, val); @@ -3216,19 +3216,19 @@ static const struct snd_kcontrol_new snd_ac97_cm9761_controls_spdif[] = { /* BIT 2: IG_SPIV */ AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,NONE) "Valid Switch", AC97_CM9761_SPDIF_CTRL, 2, 1, 0), /* BIT 3: SPI2F */ - AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,NONE) "Monitor", AC97_CM9761_SPDIF_CTRL, 3, 1, 0), + AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,NONE) "Monitor", AC97_CM9761_SPDIF_CTRL, 3, 1, 0), /* BIT 4: SPI2SDI */ AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), AC97_CM9761_SPDIF_CTRL, 4, 1, 0), /* BIT 9-10: DAC_CTL */ AC97_ENUM("DAC Clock Source", cm9761_dac_clock_enum), }; -static int patch_cm9761_post_spdif(struct snd_ac97 * ac97) +static int patch_cm9761_post_spdif(struct snd_ac97 *ac97) { return patch_build_controls(ac97, snd_ac97_cm9761_controls_spdif, ARRAY_SIZE(snd_ac97_cm9761_controls_spdif)); } -static int patch_cm9761_specific(struct snd_ac97 * ac97) +static int patch_cm9761_specific(struct snd_ac97 *ac97) { return patch_build_controls(ac97, snd_ac97_cm9761_controls, ARRAY_SIZE(snd_ac97_cm9761_controls)); } @@ -3308,7 +3308,7 @@ static int patch_cm9761(struct snd_ac97 *ac97) return 0; } - + #define AC97_CM9780_SIDE 0x60 #define AC97_CM9780_JACK 0x62 #define AC97_CM9780_MIXER 0x64 @@ -3418,7 +3418,7 @@ static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name, return 0; } -static int patch_vt1616_specific(struct snd_ac97 * ac97) +static int patch_vt1616_specific(struct snd_ac97 *ac97) { struct snd_kcontrol *kctl; int err; @@ -3453,7 +3453,7 @@ static struct snd_ac97_build_ops patch_vt1616_ops = { .build_specific = patch_vt1616_specific }; -static int patch_vt1616(struct snd_ac97 * ac97) +static int patch_vt1616(struct snd_ac97 *ac97) { ac97->build_ops = &patch_vt1616_ops; return 0; @@ -3480,7 +3480,7 @@ static int snd_ac97_vt1617a_smart51_info(struct snd_kcontrol *kcontrol, /* ordering in this list reflects vt1617a docs for Reg 20 and * 7a and Table 6 that lays out the matrix NB WRT Table6: SM51 * is SM51EN *AND* it's Bit14, not Bit15 so the table is very - * counter-intuitive */ + * counter-intuitive */ static const char* texts[] = { "LineIn Mic1", "LineIn Mic1 Mic3", "Surr LFE/C Mic3", "LineIn LFE/C Mic3", @@ -3492,18 +3492,18 @@ static int snd_ac97_vt1617a_smart51_info(struct snd_kcontrol *kcontrol, static int snd_ac97_vt1617a_smart51_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - ushort usSM51, usMS; + ushort usSM51, usMS; struct snd_ac97 *pac97; - + pac97 = snd_kcontrol_chip(kcontrol); /* grab codec handle */ /* grab our desired bits, then mash them together in a manner * consistent with Table 6 on page 17 in the 1617a docs */ - + usSM51 = snd_ac97_read(pac97, 0x7a) >> 14; usMS = snd_ac97_read(pac97, 0x20) >> 8; - + ucontrol->value.enumerated.item[0] = (usSM51 << 1) + usMS; return 0; @@ -3512,7 +3512,7 @@ static int snd_ac97_vt1617a_smart51_get(struct snd_kcontrol *kcontrol, static int snd_ac97_vt1617a_smart51_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - ushort usSM51, usMS, usReg; + ushort usSM51, usMS, usReg; struct snd_ac97 *pac97; @@ -3548,7 +3548,7 @@ static const struct snd_kcontrol_new snd_ac97_controls_vt1617a[] = { }, }; -static int patch_vt1617a(struct snd_ac97 * ac97) +static int patch_vt1617a(struct snd_ac97 *ac97) { int err = 0; int val; @@ -3793,7 +3793,7 @@ static const struct snd_kcontrol_new snd_ac97_spdif_controls_it2646[] = { AC97_SINGLE("IEC958 Input Monitor", 0x76, 13, 1, 0), }; -static int patch_it2646_specific(struct snd_ac97 * ac97) +static int patch_it2646_specific(struct snd_ac97 *ac97) { int err; if ((err = patch_build_controls(ac97, snd_ac97_controls_it2646, ARRAY_SIZE(snd_ac97_controls_it2646))) < 0) @@ -3808,7 +3808,7 @@ static struct snd_ac97_build_ops patch_it2646_ops = { .update_jacks = it2646_update_jacks }; -static int patch_it2646(struct snd_ac97 * ac97) +static int patch_it2646(struct snd_ac97 *ac97) { ac97->build_ops = &patch_it2646_ops; /* full DAC volume */ @@ -3828,7 +3828,7 @@ static const struct snd_kcontrol_new snd_ac97_controls_si3036[] = { AC97_DOUBLE("Modem Speaker Volume", 0x5c, 14, 12, 3, 1) }; -static int patch_si3036_specific(struct snd_ac97 * ac97) +static int patch_si3036_specific(struct snd_ac97 *ac97) { int idx, err; for (idx = 0; idx < ARRAY_SIZE(snd_ac97_controls_si3036); idx++) @@ -3841,10 +3841,10 @@ static struct snd_ac97_build_ops patch_si3036_ops = { .build_specific = patch_si3036_specific, }; -static int mpatch_si3036(struct snd_ac97 * ac97) +static int mpatch_si3036(struct snd_ac97 *ac97) { ac97->build_ops = &patch_si3036_ops; - snd_ac97_write_cache(ac97, 0x5c, 0xf210 ); + snd_ac97_write_cache(ac97, 0x5c, 0xf210); snd_ac97_write_cache(ac97, 0x68, 0); return 0; } @@ -3879,7 +3879,7 @@ static int patch_lm4550(struct snd_ac97 *ac97) return 0; } -/* +/* * UCB1400 codec (http://www.semiconductors.philips.com/acrobat_download/datasheets/UCB1400-0…) */ static const struct snd_kcontrol_new snd_ac97_controls_ucb1400[] = { @@ -3895,7 +3895,7 @@ AC97_SINGLE("DC Filter", 0x6a, 4, 1, 0), AC97_SINGLE("Smart Low Power Mode", 0x6c, 4, 3, 0), }; -static int patch_ucb1400_specific(struct snd_ac97 * ac97) +static int patch_ucb1400_specific(struct snd_ac97 *ac97) { int idx, err; for (idx = 0; idx < ARRAY_SIZE(snd_ac97_controls_ucb1400); idx++) @@ -3908,7 +3908,7 @@ static struct snd_ac97_build_ops patch_ucb1400_ops = { .build_specific = patch_ucb1400_specific, }; -static int patch_ucb1400(struct snd_ac97 * ac97) +static int patch_ucb1400(struct snd_ac97 *ac97) { ac97->build_ops = &patch_ucb1400_ops; /* enable headphone driver and smart low power mode by default */ diff --git a/sound/pci/ac97/ac97_pcm.c b/sound/pci/ac97/ac97_pcm.c index 48cbda9..cb86273 100644 --- a/sound/pci/ac97/ac97_pcm.c +++ b/sound/pci/ac97/ac97_pcm.c @@ -175,7 +175,7 @@ static int set_spdif_rate(struct snd_ac97 *ac97, unsigned short rate) unsigned short old, bits, reg, mask; unsigned int sbits; - if (! (ac97->ext_id & AC97_EI_SPDIF)) + if (!(ac97->ext_id & AC97_EI_SPDIF)) return -ENODEV; /* TODO: double rate support */ @@ -258,7 +258,7 @@ int snd_ac97_set_rate(struct snd_ac97 *ac97, int reg, unsigned int rate) { int dbl; unsigned int tmp; - + dbl = rate > 48000; if (dbl) { if (!(ac97->flags & AC97_DOUBLE_RATE)) @@ -281,11 +281,11 @@ int snd_ac97_set_rate(struct snd_ac97 *ac97, int reg, unsigned int rate) return -EINVAL; break; case AC97_PCM_SURR_DAC_RATE: - if (! (ac97->scaps & AC97_SCAP_SURROUND_DAC)) + if (!(ac97->scaps & AC97_SCAP_SURROUND_DAC)) return -EINVAL; break; case AC97_PCM_LFE_DAC_RATE: - if (! (ac97->scaps & AC97_SCAP_CENTER_LFE_DAC)) + if (!(ac97->scaps & AC97_SCAP_CENTER_LFE_DAC)) return -EINVAL; break; case AC97_SPDIF: @@ -618,7 +618,7 @@ int snd_ac97_pcm_open(struct ac97_pcm *pcm, unsigned int rate, } if (reg_ok[cidx] & (1 << (reg - AC97_PCM_FRONT_DAC_RATE))) continue; - //printk(KERN_DEBUG "setting ac97 reg 0x%x to rate %d\n", reg, rate); + /* printk(KERN_DEBUG "setting ac97 reg 0x%x to rate %d\n", reg, rate); */ err = snd_ac97_set_rate(pcm->r[r].codec[cidx], reg, rate); if (err < 0) snd_printk(KERN_ERR "error in snd_ac97_set_rate: cidx=%d, reg=0x%x, rate=%d, err=%d\n", cidx, reg, rate, err); diff --git a/sound/pci/ac97/ac97_proc.c b/sound/pci/ac97/ac97_proc.c index 060ea59..11f7e50 100644 --- a/sound/pci/ac97/ac97_proc.c +++ b/sound/pci/ac97/ac97_proc.c @@ -140,7 +140,7 @@ static void snd_ac97_proc_read_main(struct snd_ac97 *ac97, struct snd_info_buffe AC97_PAGE_MASK, val & AC97_PAGE_MASK); } - // val = snd_ac97_read(ac97, AC97_RESET); + /* val = snd_ac97_read(ac97, AC97_RESET); */ val = ac97->caps; snd_iprintf(buffer, "Capabilities :%s%s%s%s%s%s\n", val & AC97_BC_DEDICATED_MIC ? " -dedicated MIC PCM IN channel-" : "", @@ -188,7 +188,7 @@ static void snd_ac97_proc_read_main(struct snd_ac97 *ac97, struct snd_info_buffe ext = snd_ac97_read(ac97, AC97_EXTENDED_ID); if (ext == 0) goto __modem; - + snd_iprintf(buffer, "Extended ID : codec=%i rev=%i%s%s%s%s DSA=%i%s%s%s%s\n", (ext & AC97_EI_ADDR_MASK) >> AC97_EI_ADDR_SHIFT, (ext & AC97_EI_REV_MASK) >> AC97_EI_REV_SHIFT, @@ -295,11 +295,11 @@ static void snd_ac97_proc_read_main(struct snd_ac97 *ac97, struct snd_info_buffe } - __modem: +__modem: mext = snd_ac97_read(ac97, AC97_EXTENDED_MID); if (mext == 0) return; - + snd_iprintf(buffer, "Extended modem ID: codec=%i%s%s%s%s%s\n", (mext & AC97_MEI_ADDR_MASK) >> AC97_MEI_ADDR_SHIFT, mext & AC97_MEI_CID2 ? " CID2" : "", @@ -342,9 +342,9 @@ static void snd_ac97_proc_read_main(struct snd_ac97 *ac97, struct snd_info_buffe static void snd_ac97_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) { struct snd_ac97 *ac97 = entry->private_data; - + mutex_lock(&ac97->page_mutex); - if ((ac97->id & 0xffffff40) == AC97_ID_AD1881) { // Analog Devices AD1881/85/86 + if ((ac97->id & 0xffffff40) == AC97_ID_AD1881) { /* Analog Devices AD1881/85/86 */ int idx; for (idx = 0; idx < 3; idx++) if (ac97->spec.ad18xx.id[idx]) { @@ -356,7 +356,7 @@ static void snd_ac97_proc_read(struct snd_info_entry *entry, struct snd_info_buf } /* select all codecs */ snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000, 0x7000); - + snd_iprintf(buffer, "\nAD18XX configuration\n"); snd_iprintf(buffer, "Unchained : 0x%04x,0x%04x,0x%04x\n", ac97->spec.ad18xx.unchained[0], @@ -401,13 +401,13 @@ static void snd_ac97_proc_regs_read_main(struct snd_ac97 *ac97, struct snd_info_ } } -static void snd_ac97_proc_regs_read(struct snd_info_entry *entry, +static void snd_ac97_proc_regs_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) { struct snd_ac97 *ac97 = entry->private_data; mutex_lock(&ac97->page_mutex); - if ((ac97->id & 0xffffff40) == AC97_ID_AD1881) { // Analog Devices AD1881/85/86 + if ((ac97->id & 0xffffff40) == AC97_ID_AD1881) { /* Analog Devices AD1881/85/86 */ int idx; for (idx = 0; idx < 3; idx++) @@ -421,11 +421,11 @@ static void snd_ac97_proc_regs_read(struct snd_info_entry *entry, snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000, 0x7000); } else { snd_ac97_proc_regs_read_main(ac97, buffer, 0); - } + } mutex_unlock(&ac97->page_mutex); } -void snd_ac97_proc_init(struct snd_ac97 * ac97) +void snd_ac97_proc_init(struct snd_ac97 *ac97) { struct snd_info_entry *entry; char name[32]; @@ -458,7 +458,7 @@ void snd_ac97_proc_init(struct snd_ac97 * ac97) ac97->proc_regs = entry; } -void snd_ac97_proc_done(struct snd_ac97 * ac97) +void snd_ac97_proc_done(struct snd_ac97 *ac97) { snd_info_free_entry(ac97->proc_regs); ac97->proc_regs = NULL;

2 4

[alsa-devel] Where to report ALSA bugs?
by William Estrada 10 Sep '08

10 Sep '08

Hi group, I am making progress with my ALSA apps but in the process I have found a few bugs. One of them is in the documentation. In http://www.alsa-project.org/alsa-doc/alsa-lib/group___p_c_m.html#g692ad9e59… Under Parameters=> 'Size frames to be written' should be 'frames to be read'. Just FYI. -- William Estrada MrUmunhum(a)popdial.com Mt-Umunhum-Wireless.net ( http://Mt-Umunhum-Wireless.net ) Ymessenger: MrUmunhum

4 3

[alsa-devel] Request - emu20k1 support
by Maximilian Güntner 10 Sep '08

10 Sep '08

Hi, what is the current status in the development of the native emu20k1, ( for the low-end X-fis , Gamer, Music... ) driver? thanks - CU beomuex

3 2

[alsa-devel] [PATCH 1/2] ca0106 playback 44100Hz support to SPDIF and playback format & rate constraints
by Ben Stanley 10 Sep '08

10 Sep '08

Dear list, This patch provides the ability to play back digital audio via SPDIF at a sampling rate of 44100Hz. It also implements rate constraints to ensure that the hardware restrictions of the card are not violated. Note that if 44100Hz is used, then all used channels must use that frequency. For example, opening hw:0,0 at 48000 and then opening hw:0,1 at 44100 will fail due to constraints. However, you may successfully open both hw:0,0 and hw:0,1 at 44100 (presume no other channels open). Further details of the restriction may be found in the thread http://thread.gmane.org/gmane.linux.alsa.devel/52149/focus=52345 This patch also implements playback format restrictions, such that only one playback format may be in use at any time. I tested driver playback using the attached script (Test_ca0106_driver.sh). I get good audio output for all combinations of sampling rates and formats except for 192kHz S16 (as noted at the end of the script). Sometimes it works and sometimes it doesn't. The reason for the failure is not apparent at this time. It could have something to do with my receiver. I don't know. The attached script also checks and validates that the rate and format constraints operate as required. I periodically have trouble with this driver not producing sound output. This has been investigated and the cause is explained here http://thread.gmane.org/gmane.linux.alsa.devel/55384/focus=55410 I intend to submit a new patch to address this in the future. This patch has been in use for three months on my MythTV system (Ubuntu 8.04). I find it works reliably for me. I also use it with xine, aplay, mplayer, mame, and childsplay. I have checked with checkpatch.pl . Patch is against v1.0.18rc1. Signed-off-by: Ben Stanley Ben.Stanley(a)exemail.com.au This is the patch against alsa-kmirror. --- pci/ca0106/ca0106.h | 7 +- pci/ca0106/ca0106_main.c | 266 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 229 insertions(+), 44 deletions(-) diff --git a/pci/ca0106/ca0106.h b/pci/ca0106/ca0106.h index 74175fc..376fa9c 100644 --- a/pci/ca0106/ca0106.h +++ b/pci/ca0106/ca0106.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2004 James Courtier-Dutton <James(a)superbug.demon.co.uk> * Driver CA0106 chips. e.g. Sound Blaster Audigy LS and Live 24bit - * Version: 0.0.22 + * Version: 0.0.23 * * FEATURES currently supported: * See ca0106_main.c for features. @@ -49,6 +49,8 @@ * Implement support for Line-in capture on SB Live 24bit. * 0.0.22 * Add support for mute control on SB Live 24bit (cards w/ SPI DAC) + * 0.0.23 + * Add support for playback sampling rate and format constraints. * * * This code was initally based on code from ALSA's emu10k1x.c which is: @@ -644,6 +646,8 @@ #include "ca_midi.h" +#define DRVNAME "snd-ca0106" + struct snd_ca0106; struct snd_ca0106_channel { @@ -659,6 +663,7 @@ struct snd_ca0106_pcm { struct snd_pcm_substream *substream; int channel_id; unsigned short running; + unsigned short hw_reserved; }; struct snd_ca0106_details { diff --git a/pci/ca0106/ca0106_main.c b/pci/ca0106/ca0106_main.c index 2f8b28a..33f992b 100644 --- a/pci/ca0106/ca0106_main.c +++ b/pci/ca0106/ca0106_main.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2004 James Courtier-Dutton <James(a)superbug.demon.co.uk> * Driver CA0106 chips. e.g. Sound Blaster Audigy LS and Live 24bit - * Version: 0.0.25 + * Version: 0.0.26 * * FEATURES currently supported: * Front, Rear and Center/LFE. @@ -83,9 +83,14 @@ * Add support for mute control on SB Live 24bit (cards w/ SPI DAC) * 0.0.25 * Powerdown SPI DAC channels when not in use + * 0.0.26 Ben Stanley + * Added support for output at 44100Hz rate (SPDIF only). + * Implemented constraints system for output rate and format. * * BUGS: * Some stability problems when unloading the snd-ca0106 kernel module. + * Some programs fail to produce sound output (tested on SPDIF). See + * http://thread.gmane.org/gmane.linux.alsa.devel/55384/focus=55410 * -- * * TODO: @@ -145,6 +150,7 @@ #include <sound/core.h> #include <sound/initval.h> #include <sound/pcm.h> +#include <sound/pcm_params.h> #include <sound/ac97_codec.h> #include <sound/info.h> @@ -284,9 +290,9 @@ static struct snd_pcm_hardware snd_ca0106_playback_hw = { SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_SYNC_START, .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE, - .rates = (SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 | - SNDRV_PCM_RATE_192000), - .rate_min = 48000, + .rates = (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | + SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_192000), + .rate_min = 44100, .rate_max = 192000, .channels_min = 2, //1, .channels_max = 2, //6, @@ -318,6 +324,111 @@ static struct snd_pcm_hardware snd_ca0106_capture_hw = { .fifo_size = 0, }; +static unsigned int all_spdif_playback_rates[] = + {44100, 48000, 96000, 192000}; + +static int hw_rule_playback_rate( + struct snd_pcm_hw_params *params, + struct snd_pcm_hw_rule *rule) +{ + struct snd_ca0106 *chip = rule->private; + int chi, any_44100 = 0, any_non_44100 = 0, mask = 0; + struct snd_ca0106_channel *chp = 0; + struct snd_pcm_runtime *runtime; + if (snd_BUG_ON(!chip)) + return -EINVAL; + + if (chip->spdif_enable) { + for (chi = 0; chi < 4; ++chi) { + chp = &(chip->playback_channels[chi]); + if (!chp->use) + continue; + if (snd_BUG_ON(!chp->epcm)) + return -EINVAL; + if (!chp->epcm->hw_reserved) + continue; + if (snd_BUG_ON(!chp->epcm->substream)) + return -EINVAL; + if (snd_BUG_ON(!chp->epcm->substream->runtime)) + return -EINVAL; + runtime = chp->epcm->substream->runtime; + snd_printd("snd_hw_rule_playback_rate: ch=%d, " + "rate=%d.\n", chi, runtime->rate); + any_44100 += runtime->rate == 44100; + any_non_44100 += runtime->rate != 44100; + } + if (snd_BUG_ON(any_44100 && any_non_44100)) + return -EINVAL; + if (any_44100) + mask = 0x1; + else if (any_non_44100) + mask = 0xE; + else + mask = 0xF; + } else { + /* 44100Hz is not supported for DAC (FIXME Why?) */ + mask = 0xE; + } + snd_printd("snd_hw_rule_playback_rate: any_44100=%d, " + "any_non_44100=%d, mask=0x%X, spdif=%d\n", + any_44100, any_non_44100, mask, chip->spdif_enable); + return snd_interval_list( + hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE), + ARRAY_SIZE(all_spdif_playback_rates), + all_spdif_playback_rates, mask); +} + +static int hw_rule_playback_format( + struct snd_pcm_hw_params *params, + struct snd_pcm_hw_rule *rule) +{ + struct snd_ca0106 *chip = rule->private; + int chi, any_S16 = 0, any_S32 = 0; + struct snd_ca0106_channel *chp = 0; + struct snd_pcm_runtime *runtime; + struct snd_mask fmt, *f = hw_param_mask( + params, SNDRV_PCM_HW_PARAM_FORMAT); + int result; + if (snd_BUG_ON(!chip)) + return -EINVAL; + snd_mask_none(&fmt); + + for (chi = 0; chi < 4; ++chi) { + chp = &(chip->playback_channels[chi]); + if (!chp->use) + continue; + if (snd_BUG_ON(!chp->epcm)) + return -EINVAL; + if (!chp->epcm->hw_reserved) + continue; + if (snd_BUG_ON(!chp->epcm->substream)) + return -EINVAL; + if (snd_BUG_ON(!chp->epcm->substream->runtime)) + return -EINVAL; + runtime = chp->epcm->substream->runtime; + snd_printd("snd_hw_rule_playback_format: ch=%d, format=%d.\n", + chi, runtime->format); + any_S16 += runtime->format == SNDRV_PCM_FORMAT_S16_LE; + any_S32 += runtime->format == SNDRV_PCM_FORMAT_S32_LE; + } + if (snd_BUG_ON(any_S16 && any_S32)) + return -EINVAL; + if (any_S16) + snd_mask_set(&fmt, SNDRV_PCM_FORMAT_S16_LE); + else if (any_S32) + snd_mask_set(&fmt, SNDRV_PCM_FORMAT_S32_LE); + else { + /* No format yet chosen, so both formats are available. */ + snd_mask_set(&fmt, SNDRV_PCM_FORMAT_S16_LE); + snd_mask_set(&fmt, SNDRV_PCM_FORMAT_S32_LE); + } + result = snd_mask_refine(f, &fmt); + snd_printd("snd_hw_rule_playback_format: any_S16=%d, any_S32=%d, " + "refined_fmt=0x%X, avail_fmt=0x%X, changed=%d\n", + any_S16, any_S32, f->bits[0], fmt.bits[0], result); + return result; +} + unsigned int snd_ca0106_ptr_read(struct snd_ca0106 * emu, unsigned int reg, unsigned int chn) @@ -508,10 +619,24 @@ static int snd_ca0106_pcm_open_playback_channel(struct snd_pcm_substream *substr //printk("open:channel_id=%d, chip=%p, channel=%p\n",channel_id, chip, channel); //channel->interrupt = snd_ca0106_pcm_channel_interrupt; channel->epcm = epcm; - if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0) + err = snd_pcm_hw_constraint_integer( + runtime, SNDRV_PCM_HW_PARAM_PERIODS); + if (err < 0) return err; - if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) < 0) + err = snd_pcm_hw_constraint_step( + runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64); + if (err < 0) return err; + err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, + hw_rule_playback_rate, (void *)chip, + SNDRV_PCM_HW_PARAM_RATE, -1); + if (err < 0) + return err; + err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_FORMAT, + hw_rule_playback_format, (void *)chip, + SNDRV_PCM_HW_PARAM_FORMAT, -1); + if (err < 0) + return err; snd_pcm_set_sync(substream); if (chip->details->spi_dac && channel_id != PCM_FRONT_CHANNEL) { @@ -646,6 +771,9 @@ static int snd_ca0106_pcm_hw_params_playback(struct snd_pcm_substream *substream /* hw_free callback */ static int snd_ca0106_pcm_hw_free_playback(struct snd_pcm_substream *substream) { + struct snd_pcm_runtime *runtime = substream->runtime; + struct snd_ca0106_pcm *epcm = runtime->private_data; + epcm->hw_reserved = 0; return snd_pcm_lib_free_pages(substream); } @@ -667,53 +795,103 @@ static int snd_ca0106_pcm_hw_free_capture(struct snd_pcm_substream *substream) static int snd_ca0106_pcm_prepare_playback(struct snd_pcm_substream *substream) { struct snd_ca0106 *emu = snd_pcm_substream_chip(substream); - struct snd_pcm_runtime *runtime = substream->runtime; + struct snd_pcm_runtime *runtime = substream->runtime, *runtimei = 0; struct snd_ca0106_pcm *epcm = runtime->private_data; - int channel = epcm->channel_id; + struct snd_ca0106_channel *chp = 0; + int channel = epcm->channel_id, chi, any_44100 = 0, any_non_44100 = 0; u32 *table_base = (u32 *)(emu->buffer.area+(8*16*channel)); u32 period_size_bytes = frames_to_bytes(runtime, runtime->period_size); u32 hcfg_mask = HCFG_PLAYBACK_S32_LE; u32 hcfg_set = 0x00000000; u32 hcfg; - u32 reg40_mask = 0x30000 << (channel<<1); + u32 reg40_mask = 0xFF0000; u32 reg40_set = 0; u32 reg40; - /* FIXME: Depending on mixer selection of SPDIF out or not, select the spdif rate or the DAC rate. */ - u32 reg71_mask = 0x03030000 ; /* Global. Set SPDIF rate. We only support 44100 to spdif, not to DAC. */ + u32 reg71_mask; + u32 reg71_shift; u32 reg71_set = 0; u32 reg71; int i; - //snd_printk("prepare:channel_number=%d, rate=%d, format=0x%x, channels=%d, buffer_size=%ld, period_size=%ld, periods=%u, frames_to_bytes=%d\n",channel, runtime->rate, runtime->format, runtime->channels, runtime->buffer_size, runtime->period_size, runtime->periods, frames_to_bytes(runtime, 1)); - //snd_printk("dma_addr=%x, dma_area=%p, table_base=%p\n",runtime->dma_addr, runtime->dma_area, table_base); - //snd_printk("dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",emu->buffer.addr, emu->buffer.area, emu->buffer.bytes); - /* Rate can be set per channel. */ - /* reg40 control host to fifo */ - /* reg71 controls DAC rate. */ - switch (runtime->rate) { - case 44100: - reg40_set = 0x10000 << (channel<<1); - reg71_set = 0x01010000; - break; - case 48000: - reg40_set = 0; - reg71_set = 0; - break; - case 96000: - reg40_set = 0x20000 << (channel<<1); - reg71_set = 0x02020000; - break; - case 192000: - reg40_set = 0x30000 << (channel<<1); - reg71_set = 0x03030000; - break; - default: - reg40_set = 0; - reg71_set = 0; - break; + epcm->hw_reserved = 1; + /* FIXME CLEAN UP IF spdif_enable IS CHANGED WHILE CHANNELS ARE OPENED + * OR PREVENT THIS FROM HAPPENING. */ + if (emu->spdif_enable) + reg71_shift = 24; /* SPDIF Output Rate */ + else + reg71_shift = 16; /* I2S Output Rate */ + reg71_mask = 0x3 << reg71_shift; + + printk(KERN_DEBUG DRVNAME ": prepare_playback: " + "channel_number=%d, rate=%d, format=0x%x, channels=%d, " + "buffer_size=%ld,period_size=%ld, periods=%u, " + "frames_to_bytes=%d\n", + channel, runtime->rate, runtime->format, runtime->channels, + runtime->buffer_size, runtime->period_size, runtime->periods, + frames_to_bytes(runtime, 1)); + /*printk("dma_addr=%x, dma_area=%p, table_base=%p\n", + runtime->dma_addr,runtime->dma_area, table_base);*/ + /*printk("dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n", + emu->buffer.addr,emu->buffer.area, emu->buffer.bytes);*/ + /* We are forced to build the settings for all the channels. */ + for (chi = 0; chi < 4; ++chi) { + chp = &(emu->playback_channels[chi]); + if (!chp->use) + continue; + if (snd_BUG_ON(!chp->epcm)) + return -EINVAL; + if (chi != channel && !chp->epcm->hw_reserved) + continue; + if (snd_BUG_ON(!chp->epcm->substream)) + return -EINVAL; + if (snd_BUG_ON(!chp->epcm->substream->runtime)) + return -EINVAL; + runtimei = chp->epcm->substream->runtime; + any_44100 += runtimei->rate == 44100; + any_non_44100 += runtimei->rate != 44100; + /* Rate can be set per channel. */ + /* reg40 control host to fifo */ + /* reg71 controls DAC rate. */ + switch (runtimei->rate) { + case 44100: + /* We only support 44100 to spdif, not to DAC. + (FIXME WHY?)*/ + if (emu->spdif_enable) { + /* When using 44100, *all* channels + must be set to that rate. */ + reg40_set |= 0x550000; + reg71_set |= 0x1 << reg71_shift; + break; + } else { + printk(KERN_ERR DRVNAME + "prepare_playback: " + "44100Hz is invalid for DAC.\n"); + } + case 48000: + /* reg40_set &= !(0x1 << (chi<<1)); */ + /* reg71_set &= !(0x1 << reg71_shift); */ + break; + case 96000: + reg40_set |= 0x20000 << (chi<<1); + reg71_set |= 0x2 << reg71_shift; + break; + case 192000: + reg40_set |= 0x30000 << (chi<<1); + reg71_set |= 0x3 << reg71_shift; + break; + default: + printk(KERN_ERR DRVNAME + ": prepare_playback: " + "Bad sampling frequency %d.\n", + runtimei->rate); + } } - /* Format is a global setting */ - /* FIXME: Only let the first channel accessed set this. */ + printk(KERN_DEBUG DRVNAME ": prepare_playback: any_44100=%d, " + "any_non_44100=%d, spdif=%d.\n", + any_44100, any_non_44100, emu->spdif_enable); + /* Format is a global setting. */ + /* Only the first channel accessed can set this + (enforced by constraints). */ switch (runtime->format) { case SNDRV_PCM_FORMAT_S16_LE: hcfg_set = 0; @@ -1363,8 +1541,8 @@ static int __devinit snd_ca0106_create(int dev, struct snd_card *card, pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial); pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model); #if 1 - printk(KERN_INFO "snd-ca0106: Model %04x Rev %08x Serial %08x\n", chip->model, - pci->revision, chip->serial); + printk(KERN_INFO DRVNAME ": Model %04x Rev %08x Serial %08x\n", + chip->model, pci->revision, chip->serial); #endif strcpy(card->driver, "CA0106"); strcpy(card->shortname, "CA0106"); @@ -1378,7 +1556,9 @@ static int __devinit snd_ca0106_create(int dev, struct snd_card *card, } chip->details = c; if (subsystem[dev]) { - printk(KERN_INFO "snd-ca0106: Sound card name=%s, subsystem=0x%x. Forced to subsystem=0x%x\n", + printk(KERN_INFO DRVNAME + ": Sound card name=%s, subsystem=0x%x. " + "Forced to subsystem=0x%x\n", c->name, chip->serial, subsystem[dev]); } -- 1.5.4.3

5 15

Re: [alsa-devel] [Alsa-user] X-Fi support ?
by Vedran Miletić 10 Sep '08

10 Sep '08

Titanium is second generation X-Fi, and ALSA has yet to support the 1st generation. It's very unlikely that it will happen anytime soon. 2008/9/10 William Zumwalt <wizumwalt(a)gmail.com>: > Hi all, > I have an X-Fi Titanium Fatal1ty card and have been having a really hard > time trying to get the driver for it installed and was wondering if anyone > had an idea when this card would be supported by alsa. > Thanks, > > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great > prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Alsa-user mailing list > Alsa-user(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/alsa-user > > -- Vedran Miletić

1 0

[alsa-devel] wm8731 capture -dapm failure
by Alan Horstmann 09 Sep '08

09 Sep '08

I've started a new thread to avoid confusion, and copied bits here: On Monday 08 September 2008 21:51, Mark Brown wrote: > On Mon, Sep 08, 2008 at 09:27:13PM +0100, Alan Horstmann wrote: > > With just this one change we have been successful in running the codec > > over spi. At present we do have an issue with dapm during capture > > -nothing is being turned on! Any pointers would be appreciated. > > If you define DEBUG when building soc-dapm.c (a define at the top of the > source file will do the trick) then it will be very verbose about the > decisions it's making - that will normally point out the problem. > Probably either one of the input controls is not configured to make a > path from the input pins to the ADC or the input has been mistakenly > marked as disabled. That gets us lots of info to digest, and it does look like there are no dapm capture paths -listing below. What we cannot fathom is why! Can users of wm8731 confirm successful capture with dapm on any platform? It is not clear at this stage whether we are looking for a problem on our platform, or a general bug in the driver dapm code. Any assistance would be appreciated. Alan widget ADC HiFi Capture stream Capture event 1 widget DAC HiFi Playback stream Capture event 1 reg old 5f new 5f change 0 reg old 5f new 5f change 0 DAPM WM8731 snd_soc_dapm_stream_event Ext Spk: Off in 0 out 1 in static LHPOUT Int Mic: Off in 1 out 0 out static Mic Bias LLINEIN: Off in 0 out 1 out static Line Input RLINEIN: Off in 0 out 1 out static Line Input MICIN: Off in 1 out 0 in static Mic Bias out static Mic Bias Mic Bias: Off in 1 out 0 in static Int Mic in static MICIN out static MICIN Line Input: Off in 0 out 1 in static RLINEIN in static LLINEIN out Line In Input Mux Input Mux: Off in 0 out 1 in Line In Line Input out static ADC ADC: Off in 0 out 1 in static Input Mux RHPOUT: Off in 0 out 1 in static Output Mixer ROUT: Off in 0 out 1 in static Output Mixer LHPOUT: Off in 0 out 1 in static Output Mixer out static Ext Spk LOUT: Off in 0 out 1 in static Output Mixer DAC: Off in 0 out 4 out HiFi Playback Switch Output Mixer Output Mixer: Off in 0 out 4 in HiFi Playback Switch DAC out static LOUT out static LHPOUT out static ROUT out static RHPOUT

2 2

[alsa-devel] Problems with pulseaudio / asla on PS3
by Kevin Gilbert 09 Sep '08

09 Sep '08

Hi, I'm trying to get an jukebox application going on a Sony PlayStation3 using Qt-Embedded, Phonon and PulseAudio. The application is working well on my KDE- based laptop where it appears that the application is using Phonon -> ALSA -> PulseAudio. But there is no sound from the application when run on the PS3. I initially reported this problem to the PulseAudio mailing list. The first post on this topic is at https://tango.0pointer.de/pipermail/pulseaudio- discuss/2008-August/002249.html . In pacticular, see these posts: 1) https://tango.0pointer.de/pipermail/pulseaudio-discuss/2008- September/002346.html where I detail the results of a final test using the latest development version of PulseAudio; and 2) https://tango.0pointer.de/pipermail/pulseaudio-discuss/2008- September/002347.html where a PulseAudio developer diagnoses the problem as being within ALSA. For convenience, the following is from the latter post: "So, what happens here is this: your device can only do non-interleaved audio and is hence configured for it (as we can see from that "slave setup" listing above). Because your hardware lacks a hardware volume control ALSA puts "softvol" on top of the hw device: the "Soft Volume PCM" you can see in the first part. That device is initialized for interleaved audio as you can see. Which is what PA supports and PA asked for. Now, if softval takes non-interleaved from below and gives interleaved to the layer above than it would need to rearrange those samples -- which it however doesn't actually. PA hence checks with those asserts if the audio data is properly arranged -- which it is not as we can see. This is a bug in ALSA's softvol module. Please report this on alsa-devel. softvol falsely claims to be able to rearrange non-interleaved audio to interleaved." Not sure what other information I should post here so I'll wait for any feedback. Thanks in advance, Kevin

4 7

[alsa-devel] [PATCH 1/8] ASoC: Make all codecs depend on rather than selecting I2C
by Mark Brown 09 Sep '08

09 Sep '08

The I2C layer uses I/O operations that aren't available on all architectures and since select bypasses Kconfig dependency checking selecting I2C breaks builds like allmodconfig on some architectures. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 5d77dc3..13ae4fd 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1,6 +1,6 @@ config SND_SOC_ALL_CODECS tristate "Build all ASoC CODEC drivers" - select I2C + depends on I2C select SPI select SND_SOC_AK4535 select SND_SOC_UDA1380 -- 1.5.6.5

6 20

[alsa-devel] how is 'dir' in snd_pcm_hw_params_set_periods_near() supposed to work?
by Lennart Poettering 09 Sep '08

09 Sep '08

Heya! How is the 'dir' argument in snd_pcm_hw_params_set_periods_near() supposed to work? I'd assume that passing dir=1 would mean that it is looked for a number of periods that is greater *or equal* to what we request. If we pass dir=-1 we'd be looking for a number of periods that is smaller *or equal* to what we request. However, what I am experiencing is that there is no "or equal". On my softvol on hda setup here if I ask for 5 periods I will always get 6 if I pass dir=1 -- even if the could give me 5 and will give me five if I pass dir=0. The docs don't really elaborate on this much. I'd certainly think that having ">=" and "<=" here is much more useful and natural than ">" and "<", and hence I was wondering: is this just a bug in the software or is it really intended to be this way? Lennart -- Lennart Poettering Red Hat, Inc. lennart [at] poettering [dot] net ICQ# 11060553 http://0pointer.net/lennart/ GnuPG 0x1A015CC4

2 1

[alsa-devel] [PATCH 09/24] sound/pci: coding style fixes: sound/pci/e*
by Alexander Beregalov 09 Sep '08

09 Sep '08

- <asm/io.h> -> <linux/io.h> - remove trailing whitespaces - convert comments Only compile tested. Signed-off-by: Alexander Beregalov <a.beregalov(a)gmail.com> --- sound/pci/ens1370.c | 60 ++++++++++++++++++++-------------------- sound/pci/es1938.c | 68 +++++++++++++++++++++++----------------------- sound/pci/es1968.c | 74 +++++++++++++++++++++++++------------------------- 3 files changed, 101 insertions(+), 101 deletions(-) diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c index 9bf9536..56a8f7c 100644 --- a/sound/pci/ens1370.c +++ b/sound/pci/ens1370.c @@ -26,7 +26,7 @@ * by Kurt J. Bosch */ -#include <asm/io.h> +#include <linux/io.h> #include <linux/delay.h> #include <linux/interrupt.h> #include <linux/init.h> @@ -467,13 +467,13 @@ MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); static unsigned int snd_es1370_fixed_rates[] = {5512, 11025, 22050, 44100}; static struct snd_pcm_hw_constraint_list snd_es1370_hw_constraints_rates = { - .count = 4, + .count = 4, .list = snd_es1370_fixed_rates, .mask = 0, }; static struct snd_ratnum es1370_clock = { .num = ES_1370_SRCLOCK, - .den_min = 29, + .den_min = 29, .den_max = 353, .den_step = 1, }; @@ -494,7 +494,7 @@ static struct snd_pcm_hw_constraint_ratdens snd_es1371_hw_constraints_dac_clock }; static struct snd_ratnum es1371_adc_clock = { .num = 48000 << 15, - .den_min = 32768, + .den_min = 32768, .den_max = 393216, .den_step = 1, }; @@ -542,7 +542,7 @@ static unsigned int snd_es1371_src_read(struct ensoniq * ensoniq, unsigned short /* now, wait for busy and the correct time to read */ temp = snd_es1371_wait_src_ready(ensoniq); - + if ((temp & 0x00870000) != 0x00010000) { /* wait for the right state */ for (i = 0; i < POLL_COUNT; i++) { @@ -552,12 +552,12 @@ static unsigned int snd_es1371_src_read(struct ensoniq * ensoniq, unsigned short } } - /* hide the state bits */ + /* hide the state bits */ r = orig & (ES_1371_SRC_DISABLE | ES_1371_DIS_P1 | ES_1371_DIS_P2 | ES_1371_DIS_R1); r |= ES_1371_SRC_RAM_ADDRO(reg); outl(r, ES_REG(ensoniq, 1371_SMPRATE)); - + return temp; } @@ -648,7 +648,7 @@ static unsigned short snd_es1371_codec_read(struct snd_ac97 *ac97, struct ensoniq *ensoniq = ac97->private_data; unsigned int t, x, fail = 0; - __again: +__again: mutex_lock(&ensoniq->src_mutex); for (t = 0; t < POLL_COUNT; t++) { if (!(inl(ES_REG(ensoniq, 1371_CODEC)) & ES_1371_CODEC_WIP)) { @@ -677,7 +677,7 @@ static unsigned short snd_es1371_codec_read(struct snd_ac97 *ac97, /* wait for WIP again */ for (t = 0; t < POLL_COUNT; t++) { if (!(inl(ES_REG(ensoniq, 1371_CODEC)) & ES_1371_CODEC_WIP)) - break; + break; } /* now wait for the stinkin' data (RDY) */ for (t = 0; t < POLL_COUNT; t++) { @@ -1053,7 +1053,7 @@ static struct snd_pcm_hardware snd_ensoniq_playback1 = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000, #else (SNDRV_PCM_RATE_KNOT | /* 5512Hz rate */ - SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_22050 | + SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100), #endif .rate_min = 4000, @@ -1072,7 +1072,7 @@ static struct snd_pcm_hardware snd_ensoniq_playback2 = { .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | - SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE | + SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_SYNC_START), .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000, @@ -1424,7 +1424,7 @@ static int snd_es1371_spdif_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol); - + spin_lock_irq(&ensoniq->reg_lock); ucontrol->value.integer.value[0] = ensoniq->ctrl & ES_1373_SPDIF_THRU ? 1 : 0; spin_unlock_irq(&ensoniq->reg_lock); @@ -1437,7 +1437,7 @@ static int snd_es1371_spdif_put(struct snd_kcontrol *kcontrol, struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol); unsigned int nval1, nval2; int change; - + nval1 = ucontrol->value.integer.value[0] ? ES_1373_SPDIF_THRU : 0; nval2 = ucontrol->value.integer.value[0] ? ES_1373_SPDIF_EN : 0; spin_lock_irq(&ensoniq->reg_lock); @@ -1487,7 +1487,7 @@ static int snd_es1373_rear_get(struct snd_kcontrol *kcontrol, { struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol); int val = 0; - + spin_lock_irq(&ensoniq->reg_lock); if ((ensoniq->cssr & (ES_1373_REAR_BIT27|ES_1373_REAR_BIT26| ES_1373_REAR_BIT24)) == ES_1373_REAR_BIT26) @@ -1503,7 +1503,7 @@ static int snd_es1373_rear_put(struct snd_kcontrol *kcontrol, struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol); unsigned int nval1; int change; - + nval1 = ucontrol->value.integer.value[0] ? ES_1373_REAR_BIT26 : (ES_1373_REAR_BIT27|ES_1373_REAR_BIT24); spin_lock_irq(&ensoniq->reg_lock); @@ -1532,7 +1532,7 @@ static int snd_es1373_line_get(struct snd_kcontrol *kcontrol, { struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol); int val = 0; - + spin_lock_irq(&ensoniq->reg_lock); if ((ensoniq->ctrl & ES_1371_GPIO_OUTM) >= 4) val = 1; @@ -1547,7 +1547,7 @@ static int snd_es1373_line_put(struct snd_kcontrol *kcontrol, struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol); int changed; unsigned int ctrl; - + spin_lock_irq(&ensoniq->reg_lock); ctrl = ensoniq->ctrl; if (ucontrol->value.integer.value[0]) @@ -1690,7 +1690,7 @@ static int snd_ensoniq_control_get(struct snd_kcontrol *kcontrol, { struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol); int mask = kcontrol->private_value; - + spin_lock_irq(&ensoniq->reg_lock); ucontrol->value.integer.value[0] = ensoniq->ctrl & mask ? 1 : 0; spin_unlock_irq(&ensoniq->reg_lock); @@ -1704,7 +1704,7 @@ static int snd_ensoniq_control_put(struct snd_kcontrol *kcontrol, int mask = kcontrol->private_value; unsigned int nval; int change; - + nval = ucontrol->value.integer.value[0] ? mask : 0; spin_lock_irq(&ensoniq->reg_lock); change = (ensoniq->ctrl & mask) != nval; @@ -1864,7 +1864,7 @@ static inline void snd_ensoniq_free_gameport(struct ensoniq *ensoniq) { } */ -static void snd_ensoniq_proc_read(struct snd_info_entry *entry, +static void snd_ensoniq_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) { struct ensoniq *ensoniq = entry->private_data; @@ -1891,7 +1891,7 @@ static void __devinit snd_ensoniq_proc_init(struct ensoniq * ensoniq) { struct snd_info_entry *entry; - if (! snd_card_proc_new(ensoniq->card, "audiopci", &entry)) + if (!snd_card_proc_new(ensoniq->card, "audiopci", &entry)) snd_info_set_text_ops(entry, ensoniq, snd_ensoniq_proc_read); } @@ -1914,7 +1914,7 @@ static int snd_ensoniq_free(struct ensoniq *ensoniq) if (ensoniq->irq >= 0) synchronize_irq(ensoniq->irq); pci_set_power_state(ensoniq->pci, 3); - __hw_end: +__hw_end: #ifdef CHIP1370 if (ensoniq->dma_bug.area) snd_dma_free_pages(&ensoniq->dma_bug); @@ -1982,7 +1982,7 @@ static void snd_ensoniq_chip_init(struct ensoniq *ensoniq) udelay(20); outl(ensoniq->ctrl, ES_REG(ensoniq, CONTROL)); /* Init the sample rate converter */ - snd_es1371_wait_src_ready(ensoniq); + snd_es1371_wait_src_ready(ensoniq); outl(ES_1371_SRC_DISABLE, ES_REG(ensoniq, 1371_SMPRATE)); for (idx = 0; idx < 0x80; idx++) snd_es1371_src_write(ensoniq, idx, 0); @@ -2021,13 +2021,13 @@ static int snd_ensoniq_suspend(struct pci_dev *pci, pm_message_t state) { struct snd_card *card = pci_get_drvdata(pci); struct ensoniq *ensoniq = card->private_data; - + snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); snd_pcm_suspend_all(ensoniq->pcm1); snd_pcm_suspend_all(ensoniq->pcm2); - -#ifdef CHIP1371 + +#ifdef CHIP1371 snd_ac97_suspend(ensoniq->u.es1371.ac97); #else /* try to reset AK4531 */ @@ -2038,7 +2038,7 @@ static int snd_ensoniq_suspend(struct pci_dev *pci, pm_message_t state) inw(ES_REG(ensoniq, 1370_CODEC)); udelay(100); snd_ak4531_suspend(ensoniq->u.es1370.ak4531); -#endif +#endif pci_disable_device(pci); pci_save_state(pci); @@ -2063,11 +2063,11 @@ static int snd_ensoniq_resume(struct pci_dev *pci) snd_ensoniq_chip_init(ensoniq); -#ifdef CHIP1371 +#ifdef CHIP1371 snd_ac97_resume(ensoniq->u.es1371.ac97); #else snd_ak4531_resume(ensoniq->u.es1370.ak4531); -#endif +#endif snd_power_change_state(card, SNDRV_CTL_POWER_D0); return 0; } @@ -2482,7 +2482,7 @@ static struct pci_driver driver = { .resume = snd_ensoniq_resume, #endif }; - + static int __init alsa_card_ens137x_init(void) { return pci_register_driver(&driver); diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c index 4cd9a1f..87effdc 100644 --- a/sound/pci/es1938.c +++ b/sound/pci/es1938.c @@ -5,7 +5,7 @@ * Thomas Sailer <sailer(a)ife.ee.ethz.ch>, * Abramo Bagnara <abramo(a)alsa-project.org>, * Markus Gruber <gruber(a)eikon.tum.de> - * + * * Rewritten from sonicvibes.c source. * * TODO: @@ -63,7 +63,7 @@ #include <sound/initval.h> #include <sound/tlv.h> -#include <asm/io.h> +#include <linux/io.h> MODULE_AUTHOR("Jaromir Koutek <miri(a)punknet.cz>"); MODULE_DESCRIPTION("ESS Solo-1"); @@ -167,7 +167,7 @@ MODULE_PARM_DESC(enable, "Enable ESS Solo-1 soundcard."); #define ESS_CMD_SETFORMAT2 0xb7 #define ESS_CMD_DMACONTROL 0xb8 #define ESS_CMD_DMATYPE 0xb9 -#define ESS_CMD_OFFSETLEFT 0xba +#define ESS_CMD_OFFSETLEFT 0xba #define ESS_CMD_OFFSETRIGHT 0xbb #define ESS_CMD_READREG 0xc0 #define ESS_CMD_ENABLEEXT 0xc6 @@ -418,7 +418,7 @@ static void snd_es1938_reset(struct es1938 *chip) } snd_printk(KERN_ERR "ESS Solo-1 reset failed\n"); - __next: +__next: snd_es1938_write_cmd(chip, ESS_CMD_ENABLEEXT); /* Demand transfer DMA: 4 bytes per DMA request */ @@ -426,7 +426,7 @@ static void snd_es1938_reset(struct es1938 *chip) /* Change behaviour of register A1 4x oversampling - 2nd channel DAC asynchronous */ + 2nd channel DAC asynchronous */ snd_es1938_mixer_write(chip, ESSSB_IREG_AUDIO2MODE, 0x32); /* enable/select DMA channel and IRQ channel */ snd_es1938_bits(chip, ESS_CMD_IRQCONTROL, 0xf0, 0x50); @@ -469,7 +469,7 @@ static struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks = { }; -static void snd_es1938_rate_set(struct es1938 *chip, +static void snd_es1938_rate_set(struct es1938 *chip, struct snd_pcm_substream *substream, int mode) { @@ -482,7 +482,7 @@ static void snd_es1938_rate_set(struct es1938 *chip, /* set filter register */ div0 = 256 - 7160000*20/(8*82*runtime->rate); - + if (mode == DAC2) { snd_es1938_mixer_write(chip, 0x70, bits); snd_es1938_mixer_write(chip, 0x72, div0); @@ -650,7 +650,7 @@ static int snd_es1938_capture_prepare(struct snd_pcm_substream *substream) chip->dma1_shift = 2 - mono - is8; snd_es1938_reset_fifo(chip); - + /* program type */ snd_es1938_bits(chip, ESS_CMD_ANALOGCONTROL, 0x03, (mono ? 2 : 1)); @@ -663,12 +663,12 @@ static int snd_es1938_capture_prepare(struct snd_pcm_substream *substream) /* initialize and configure ADC */ snd_es1938_write(chip, ESS_CMD_SETFORMAT2, u ? 0x51 : 0x71); - snd_es1938_write(chip, ESS_CMD_SETFORMAT2, 0x90 | - (u ? 0x00 : 0x20) | - (is8 ? 0x00 : 0x04) | + snd_es1938_write(chip, ESS_CMD_SETFORMAT2, 0x90 | + (u ? 0x00 : 0x20) | + (is8 ? 0x00 : 0x04) | (mono ? 0x40 : 0x08)); - // snd_es1938_reset_fifo(chip); + /* snd_es1938_reset_fifo(chip); */ /* 11. configure system interrupt controller and DMA controller */ snd_es1938_capture_setdma(chip); @@ -713,7 +713,7 @@ static int snd_es1938_playback1_prepare(struct snd_pcm_substream *substream) /* program DMA */ snd_es1938_playback1_setdma(chip); - + return 0; } @@ -735,10 +735,10 @@ static int snd_es1938_playback2_prepare(struct snd_pcm_substream *substream) chip->dma1_shift = 2 - mono - is8; count = 0x10000 - count; - + /* reset */ snd_es1938_reset_fifo(chip); - + snd_es1938_bits(chip, ESS_CMD_ANALOGCONTROL, 0x03, (mono ? 2 : 1)); /* set clock and counters */ @@ -749,13 +749,13 @@ static int snd_es1938_playback2_prepare(struct snd_pcm_substream *substream) /* initialized and configure DAC */ snd_es1938_write(chip, ESS_CMD_SETFORMAT, u ? 0x80 : 0x00); snd_es1938_write(chip, ESS_CMD_SETFORMAT, u ? 0x51 : 0x71); - snd_es1938_write(chip, ESS_CMD_SETFORMAT2, + snd_es1938_write(chip, ESS_CMD_SETFORMAT2, 0x90 | (mono ? 0x40 : 0x08) | (is8 ? 0x00 : 0x04) | (u ? 0x00 : 0x20)); /* program DMA */ snd_es1938_playback2_setdma(chip); - + return 0; } @@ -1036,7 +1036,7 @@ static int __devinit snd_es1938_new_pcm(struct es1938 *chip, int device) return err; snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_es1938_playback_ops); snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_es1938_capture_ops); - + pcm->private_data = chip; pcm->info_flags = 0; strcpy(pcm->name, "ESS Solo-1"); @@ -1049,7 +1049,7 @@ static int __devinit snd_es1938_new_pcm(struct es1938 *chip, int device) } /* ------------------------------------------------------------------- - * + * * *** Mixer part *** */ @@ -1083,7 +1083,7 @@ static int snd_es1938_put_mux(struct snd_kcontrol *kcontrol, { struct es1938 *chip = snd_kcontrol_chip(kcontrol); unsigned char val = ucontrol->value.enumerated.item[0]; - + if (val > 7) return -EINVAL; return snd_es1938_mixer_bits(chip, 0x1c, 0x07, val) != val; @@ -1207,7 +1207,7 @@ static int snd_es1938_get_single(struct snd_kcontrol *kcontrol, int mask = (kcontrol->private_value >> 16) & 0xff; int invert = (kcontrol->private_value >> 24) & 0xff; int val; - + val = snd_es1938_reg_read(chip, reg); ucontrol->value.integer.value[0] = (val >> shift) & mask; if (invert) @@ -1224,7 +1224,7 @@ static int snd_es1938_put_single(struct snd_kcontrol *kcontrol, int mask = (kcontrol->private_value >> 16) & 0xff; int invert = (kcontrol->private_value >> 24) & 0xff; unsigned char val; - + val = (ucontrol->value.integer.value[0] & mask); if (invert) val = mask - val; @@ -1270,7 +1270,7 @@ static int snd_es1938_get_double(struct snd_kcontrol *kcontrol, int mask = (kcontrol->private_value >> 24) & 0xff; int invert = (kcontrol->private_value >> 22) & 1; unsigned char left, right; - + left = snd_es1938_reg_read(chip, left_reg); if (left_reg != right_reg) right = snd_es1938_reg_read(chip, right_reg); @@ -1297,7 +1297,7 @@ static int snd_es1938_put_double(struct snd_kcontrol *kcontrol, int invert = (kcontrol->private_value >> 22) & 1; int change; unsigned char val1, val2, mask1, mask2; - + val1 = ucontrol->value.integer.value[0] & mask; val2 = ucontrol->value.integer.value[1] & mask; if (invert) { @@ -1315,7 +1315,7 @@ static int snd_es1938_put_double(struct snd_kcontrol *kcontrol, if (snd_es1938_reg_bits(chip, right_reg, mask2, val2) != val2) change = 1; } else { - change = (snd_es1938_reg_bits(chip, left_reg, mask1 | mask2, + change = (snd_es1938_reg_bits(chip, left_reg, mask1 | mask2, val1 | val2) != (val1 | val2)); } return change; @@ -1675,7 +1675,7 @@ static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id) #if 0 printk("Es1938debug - interrupt status: =0x%x\n", status); #endif - + /* AUDIO 1 */ if (status & 0x10) { #if 0 @@ -1695,7 +1695,7 @@ static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id) else if (chip->active & DAC1) snd_pcm_period_elapsed(chip->playback2_substream); } - + /* AUDIO 2 */ if (status & 0x20) { #if 0 @@ -1731,10 +1731,10 @@ static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id) /* MPU401 */ if (status & 0x80) { - // the following line is evil! It switches off MIDI interrupt handling after the first interrupt received. - // replacing the last 0 by 0x40 works for ESS-Solo1, but just doing nothing works as well! - // andreas(a)flying-snail.de - // snd_es1938_mixer_bits(chip, ESSSB_IREG_MPU401CONTROL, 0x40, 0); /* ack? */ + /* the following line is evil! It switches off MIDI interrupt handling after the first interrupt received. */ + /* replacing the last 0 by 0x40 works for ESS-Solo1, but just doing nothing works as well! */ + /* andreas(a)flying-snail.de */ + /* snd_es1938_mixer_bits(chip, ESSSB_IREG_MPU401CONTROL, 0x40, 0); ack? */ if (chip->rmidi) { handled = 1; snd_mpu401_uart_interrupt(irq, chip->rmidi->private_data); @@ -1781,7 +1781,7 @@ static int __devinit snd_es1938_mixer(struct es1938 *chip) } return 0; } - + static int __devinit snd_es1938_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) @@ -1851,8 +1851,8 @@ static int __devinit snd_es1938_probe(struct pci_dev *pci, chip->irq, 0, &chip->rmidi) < 0) { printk(KERN_ERR "es1938: unable to initialize MPU-401\n"); } else { - // this line is vital for MIDI interrupt handling on ess-solo1 - // andreas(a)flying-snail.de + /* this line is vital for MIDI interrupt handling on ess-solo1 */ + /* andreas(a)flying-snail.de */ snd_es1938_mixer_bits(chip, ESSSB_IREG_MPU401CONTROL, 0x40, 0x40); } diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 20ee759..46c383f 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c @@ -2,7 +2,7 @@ * Driver for ESS Maestro 1/2/2E Sound Card (started 21.8.99) * Copyright (c) by Matze Braun <MatzeBraun(a)gmx.de>. * Takashi Iwai <tiwai(a)suse.de> - * + * * Most of the driver code comes from Zach Brown(zab(a)redhat.com) * Alan Cox OSS Driver * Rewritted from card-es1938.c source. @@ -29,7 +29,7 @@ * * Hardware Description * - * A working Maestro setup contains the Maestro chip wired to a + * A working Maestro setup contains the Maestro chip wired to a * codec or 2. In the Maestro we have the APUs, the ASSP, and the * Wavecache. The APUs can be though of as virtual audio routing * channels. They can take data from a number of sources and perform @@ -38,7 +38,7 @@ * APUs. The ASSP is a wacky DSP like device that ESS is loth * to release docs on. Thankfully it isn't required on the Maestro * until you start doing insane things like FM emulation and surround - * encoding. The codecs are almost always AC-97 compliant codecs, + * encoding. The codecs are almost always AC-97 compliant codecs, * but it appears that early Maestros may have had PT101 (an ESS * part?) wired to them. The only real difference in the Maestro * families is external goop like docking capability, memory for @@ -76,7 +76,7 @@ * on open time. The sonicvibes OSS routines we inherited really want * power of 2 buffers, so we have all those next to each other, then * 512 byte regions for the recording wavecaches. This ends up - * wasting quite a bit of memory. The only fixes I can see would be + * wasting quite a bit of memory. The only fixes I can see would be * getting a kernel allocator that could work in zones, or figuring out * just how to coerce the WP into doing what we want. * @@ -86,7 +86,7 @@ * like the APU interface that is indirect registers gotten at through * the main maestro indirection. Ouch. We spinlock around the actual * ports on a per card basis. This means spinlock activity at each IO - * operation, but the only IO operation clusters are in non critical + * operation, but the only IO operation clusters are in non critical * paths and it makes the code far easier to follow. Interrupts are * blocked while holding the locks because the int handler has to * get at some of them :(. The mixer interface doesn't, however. @@ -94,7 +94,7 @@ * places. */ -#include <asm/io.h> +#include <linux/io.h> #include <linux/delay.h> #include <linux/interrupt.h> #include <linux/init.h> @@ -896,7 +896,7 @@ snd_es1968_calc_bob_rate(struct es1968 *chip, struct esschan *es, static u32 snd_es1968_compute_rate(struct es1968 *chip, u32 freq) { u32 rate = (freq << 16) / chip->clock; -#if 0 /* XXX: do we need this? */ +#if 0 /* XXX: do we need this? */ if (rate > 0x10000) rate = 0x10000; #endif @@ -971,7 +971,7 @@ static void snd_es1968_program_wavecache(struct es1968 *chip, struct esschan *es { u32 tmpval = (addr - 0x10) & 0xFFF8; - if (! capture) { + if (!capture) { if (!(es->fmt & ESS_FMT_16BIT)) tmpval |= 4; /* 8bit */ if (es->fmt & ESS_FMT_STEREO) @@ -1059,7 +1059,7 @@ static void snd_es1968_playback_setup(struct es1968 *chip, struct esschan *es, and not the APU Regs 4-5. */ apu_set_register(chip, apu, 10, 0x8F00 | (channel ? 0 : 0x10)); - es->apu_mode[channel] += 1; /* stereo */ + es->apu_mode[channel]++; /* stereo */ } else apu_set_register(chip, apu, 10, 0x8F08); } @@ -1255,7 +1255,7 @@ static int snd_es1968_pcm_trigger(struct snd_pcm_substream *substream, int cmd) break; case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: - if (! es->running) + if (!es->running) break; snd_es1968_pcm_stop(chip, es); es->running = 0; @@ -1273,7 +1273,7 @@ static snd_pcm_uframes_t snd_es1968_pcm_pointer(struct snd_pcm_substream *substr unsigned int ptr; ptr = snd_es1968_get_dma_ptr(chip, es) << es->wav_shift; - + return bytes_to_frames(substream->runtime, ptr % es->dma_size); } @@ -1407,7 +1407,7 @@ static void snd_es1968_free_dmabuf(struct es1968 *chip) { struct list_head *p; - if (! chip->dma.area) + if (!chip->dma.area) return; snd_dma_reserve_buf(&chip->dma, snd_dma_pci_buf_id(chip->pci)); while ((p = chip->buf_list.next) != &chip->buf_list) { @@ -1425,11 +1425,11 @@ snd_es1968_init_dmabuf(struct es1968 *chip) chip->dma.dev.type = SNDRV_DMA_TYPE_DEV; chip->dma.dev.dev = snd_dma_pci_data(chip->pci); - if (! snd_dma_get_reserved_buf(&chip->dma, snd_dma_pci_buf_id(chip->pci))) { + if (!snd_dma_get_reserved_buf(&chip->dma, snd_dma_pci_buf_id(chip->pci))) { err = snd_dma_alloc_pages_fallback(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci), chip->total_bufsize, &chip->dma); - if (err < 0 || ! chip->dma.area) { + if (err < 0 || !chip->dma.area) { snd_printk(KERN_ERR "es1968: can't allocate dma pages for size %d\n", chip->total_bufsize); return -ENOMEM; @@ -1478,7 +1478,7 @@ static int snd_es1968_hw_params(struct snd_pcm_substream *substream, } chan->memory = snd_es1968_new_memory(chip, size); if (chan->memory == NULL) { - // snd_printd("cannot allocate dma buffer: size = %d\n", size); + /* snd_printd("cannot allocate dma buffer: size = %d\n", size); */ return -ENOMEM; } snd_pcm_set_runtime_buffer(substream, &chan->memory->buf); @@ -1491,7 +1491,7 @@ static int snd_es1968_hw_free(struct snd_pcm_substream *substream) struct es1968 *chip = snd_pcm_substream_chip(substream); struct snd_pcm_runtime *runtime = substream->runtime; struct esschan *chan; - + if (runtime->private_data == NULL) return 0; chan = runtime->private_data; @@ -1586,7 +1586,7 @@ static int snd_es1968_capture_open(struct snd_pcm_substream *substream) snd_es1968_free_apu_pair(chip, apu1); return apu2; } - + es = kzalloc(sizeof(*es), GFP_KERNEL); if (!es) { snd_es1968_free_apu_pair(chip, apu1); @@ -1854,7 +1854,7 @@ static void snd_es1968_update_pcm(struct es1968 *chip, struct esschan *es) unsigned int hwptr; unsigned int diff; struct snd_pcm_substream *subs = es->substream; - + if (subs == NULL || !es->running) return; @@ -1895,7 +1895,7 @@ static void es1968_update_hw_volume(unsigned long private_data) if (chip->in_suspend) return; - if (! chip->master_switch || ! chip->master_volume) + if (!chip->master_switch || ! chip->master_volume) return; /* FIXME: we can't call snd_ac97_* functions since here is in tasklet. */ @@ -2038,7 +2038,7 @@ static void snd_es1968_ac97_reset(struct es1968 *chip) /* save configuration */ save_ringbus_a = inw(ioaddr + 0x36); - //outw(inw(ioaddr + 0x38) & 0xfffc, ioaddr + 0x38); /* clear second codec id? */ + /* outw(inw(ioaddr + 0x38) & 0xfffc, ioaddr + 0x38); clear second codec id? */ /* set command/status address i/o to 1st codec */ outw(inw(ioaddr + 0x3a) & 0xfffc, ioaddr + 0x3a); outw(inw(ioaddr + 0x3c) & 0xfffc, ioaddr + 0x3c); @@ -2072,7 +2072,7 @@ static void snd_es1968_ac97_reset(struct es1968 *chip) udelay(20); outw(0x0009, ioaddr + 0x60); /* write 9 to gpio */ msleep(500); - //outw(inw(ioaddr + 0x38) & 0xfffc, ioaddr + 0x38); + /* outw(inw(ioaddr + 0x38) & 0xfffc, ioaddr + 0x38); */ outw(inw(ioaddr + 0x3a) & 0xfffc, ioaddr + 0x3a); outw(inw(ioaddr + 0x3c) & 0xfffc, ioaddr + 0x3c); @@ -2154,15 +2154,15 @@ static void snd_es1968_chip_init(struct es1968 *chip) /* We used to muck around with pci config space that * we had no business messing with. We don't know enough - * about the machine to know which DMA mode is appropriate, + * about the machine to know which DMA mode is appropriate, * etc. We were guessing wrong on some machines and making * them unhappy. We now trust in the BIOS to do things right, * which almost certainly means a new host of problems will - * arise with broken BIOS implementations. screw 'em. + * arise with broken BIOS implementations. screw 'em. * We're already intolerant of machines that don't assign * IRQs. */ - + /* Config Reg A */ pci_read_config_word(pci, ESM_CONFIG_A, &w); @@ -2172,7 +2172,7 @@ static void snd_es1968_chip_init(struct es1968 *chip) w |= POST_WRITE; /* Posted write */ w |= PCI_TIMING; /* PCI timing on */ /* XXX huh? claims to be reserved.. */ - w &= ~SWAP_LR; /* swap left/right + w &= ~SWAP_LR; /* swap left/right seems to only have effect on SB Emulation */ w &= ~SUBTR_DECODE; /* Subtractive decode off */ @@ -2223,7 +2223,7 @@ static void snd_es1968_chip_init(struct es1968 *chip) w|=1<<3; /* Turn on 978 hardware volume control. */ w&=~(1<<11); /* Turn on 978 mixer volume control. */ pci_write_config_word(pci, 0x58, w); - + /* Sound Reset */ snd_es1968_reset(chip); @@ -2241,14 +2241,14 @@ static void snd_es1968_chip_init(struct es1968 *chip) /* * Reset the CODEC */ - + snd_es1968_ac97_reset(chip); /* Ring Bus Control B */ n = inl(iobase + ESM_RING_BUS_CONTR_B); n &= ~RINGB_EN_SPDIF; /* SPDIF off */ - //w |= RINGB_EN_2CODEC; /* enable 2nd codec */ + /* w |= RINGB_EN_2CODEC; enable 2nd codec */ outl(n, iobase + ESM_RING_BUS_CONTR_B); /* Set hardware volume control registers to midpoints. @@ -2306,7 +2306,7 @@ static void snd_es1968_chip_init(struct es1968 *chip) maestro_write(chip, 0x0D, 0x7632); - /* Wave cache control on - test off, sg off, + /* Wave cache control on - test off, sg off, enable, enable extra chans 1Mb */ w = inw(iobase + WC_CONTROL); @@ -2353,7 +2353,7 @@ static int es1968_suspend(struct pci_dev *pci, pm_message_t state) struct snd_card *card = pci_get_drvdata(pci); struct es1968 *chip = card->private_data; - if (! chip->do_pm) + if (!chip->do_pm) return 0; chip->in_suspend = 1; @@ -2374,7 +2374,7 @@ static int es1968_resume(struct pci_dev *pci) struct es1968 *chip = card->private_data; struct esschan *es; - if (! chip->do_pm) + if (!chip->do_pm) return 0; /* restore all our config */ @@ -2390,7 +2390,7 @@ static int es1968_resume(struct pci_dev *pci) snd_es1968_chip_init(chip); - /* need to restore the base pointers.. */ + /* need to restore the base pointers.. */ if (chip->dma.addr) { /* set PCMBAR */ wave_set_register(chip, 0x01FC, chip->dma.addr >> 12); @@ -2547,7 +2547,7 @@ static int __devinit snd_es1968_create(struct snd_card *card, } chip = kzalloc(sizeof(*chip), GFP_KERNEL); - if (! chip) { + if (!chip) { pci_disable_device(pci); return -ENOMEM; } @@ -2581,7 +2581,7 @@ static int __devinit snd_es1968_create(struct snd_card *card, return -EBUSY; } chip->irq = pci->irq; - + /* Clear Maestro_map */ for (i = 0; i < 32; i++) chip->maestro_map[i] = 0; @@ -2648,14 +2648,14 @@ static int __devinit snd_es1968_probe(struct pci_dev *pci, card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); if (!card) return -ENOMEM; - + if (total_bufsize[dev] < 128) total_bufsize[dev] = 128; if (total_bufsize[dev] > 4096) total_bufsize[dev] = 4096; if ((err = snd_es1968_create(card, pci, total_bufsize[dev] * 1024, /* in bytes */ - pcm_substreams_p[dev], + pcm_substreams_p[dev], pcm_substreams_c[dev], pci_id->driver_data, use_pm[dev], @@ -2716,7 +2716,7 @@ static int __devinit snd_es1968_probe(struct pci_dev *pci, snd_es1968_start_irq(chip); chip->clock = clock[dev]; - if (! chip->clock) + if (!chip->clock) es1968_measure_clock(chip); sprintf(card->longname, "%s at 0x%lx, irq %i",

1 0