X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Fisa%2Fes18xx.c;fp=sound%2Fisa%2Fes18xx.c;h=7a12848a7b05d68565c493ce4c44d76936834113;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=34998de9968c0ed071f79998785f00c801f43929;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c index 34998de99..7a12848a7 100644 --- a/sound/isa/es18xx.c +++ b/sound/isa/es18xx.c @@ -49,10 +49,6 @@ * - contrarily to some pages in DS_1869.PDF the rates can be set * independently. * - * - Zoom Video is implemented by sharing the FM DAC, thus the user can - * have either FM playback or Video playback but not both simultaneously. - * The Video Playback Switch mixer control toggles this choice. - * * BUGS: * * - There is a major trouble I noted: @@ -67,16 +63,7 @@ * */ -/* - * ES1879 NOTES: - * - When Zoom Video is enabled (reg 0x71 bit 6 toggled on) the PCM playback - * seems to be effected (speaker_test plays a lower frequency). Can't find - * anything in the datasheet to account for this, so a Video Playback Switch - * control has been included to allow ZV to be enabled only when necessary. - * Then again on at least one test system the 0x71 bit 6 enable bit is not - * needed for ZV, so maybe the datasheet is entirely wrong here. - */ - + #include #include #include @@ -85,8 +72,6 @@ #include #include #include -#include - #include #include #include @@ -163,7 +148,7 @@ struct snd_audiodrive { #define ES18XX_DUPLEX_SAME 0x0010 /* Playback and record must share the same rate */ #define ES18XX_NEW_RATE 0x0020 /* More precise rate setting */ #define ES18XX_AUXB 0x0040 /* AuxB mixer control */ -#define ES18XX_HWV 0x0080 /* Has seperate hardware volume mixer controls*/ +#define ES18XX_HWV 0x0080 /* Has hardware volume */ #define ES18XX_MONO 0x0100 /* Mono_in mixer control */ #define ES18XX_I2S 0x0200 /* I2S mixer control */ #define ES18XX_MUTEREC 0x0400 /* Record source can be muted */ @@ -803,12 +788,9 @@ static irqreturn_t snd_es18xx_interrupt(int irq, void *dev_id, struct pt_regs *r /* Hardware volume */ if (status & HWV_IRQ) { - int split = 0; - if (chip->caps & ES18XX_HWV) { - split = snd_es18xx_mixer_read(chip, 0x64) & 0x80; - snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, &chip->hw_switch->id); - snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, &chip->hw_volume->id); - } + int split = snd_es18xx_mixer_read(chip, 0x64) & 0x80; + snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, &chip->hw_switch->id); + snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, &chip->hw_volume->id); if (!split) { snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, &chip->master_switch->id); snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, &chip->master_volume->id); @@ -957,118 +939,37 @@ static int snd_es18xx_capture_close(struct snd_pcm_substream *substream) * MIXER part */ -/* Record source mux routines: - * Depending on the chipset this mux switches between 4, 5, or 8 possible inputs. - * bit table for the 4/5 source mux: - * reg 1C: - * b2 b1 b0 muxSource - * x 0 x microphone - * 0 1 x CD - * 1 1 0 line - * 1 1 1 mixer - * if it's "mixer" and it's a 5 source mux chipset then reg 7A bit 3 determines - * either the play mixer or the capture mixer. - * - * "map4Source" translates from source number to reg bit pattern - * "invMap4Source" translates from reg bit pattern to source number - */ - static int snd_es18xx_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { - static char *texts4Source[4] = { - "Mic", "CD", "Line", "Master" - }; - static char *texts5Source[5] = { - "Mic", "CD", "Line", "Master", "Mix" - }; - static char *texts8Source[8] = { + static char *texts[8] = { "Mic", "Mic Master", "CD", "AOUT", "Mic1", "Mix", "Line", "Master" }; - struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol); uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; uinfo->count = 1; - switch (chip->version) { - case 0x1868: - case 0x1878: - uinfo->value.enumerated.items = 4; - if (uinfo->value.enumerated.item > 3) - uinfo->value.enumerated.item = 3; - strcpy(uinfo->value.enumerated.name, texts4Source[uinfo->value.enumerated.item]); - break; - case 0x1887: - case 0x1888: - uinfo->value.enumerated.items = 5; - if (uinfo->value.enumerated.item > 4) - uinfo->value.enumerated.item = 4; - strcpy(uinfo->value.enumerated.name, texts5Source[uinfo->value.enumerated.item]); - break; - case 0x1869: /* DS somewhat contradictory for 1869: could be be 5 or 8 */ - case 0x1879: - uinfo->value.enumerated.items = 8; - if (uinfo->value.enumerated.item > 7) - uinfo->value.enumerated.item = 7; - strcpy(uinfo->value.enumerated.name, texts8Source[uinfo->value.enumerated.item]); - break; - default: - return -EINVAL; - } + uinfo->value.enumerated.items = 8; + if (uinfo->value.enumerated.item > 7) + uinfo->value.enumerated.item = 7; + strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]); return 0; } static int snd_es18xx_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - static unsigned char invMap4Source[8] = {0, 0, 1, 1, 0, 0, 2, 3}; struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol); - int muxSource = snd_es18xx_mixer_read(chip, 0x1c) & 0x07; - if (!(chip->version == 0x1869 || chip->version == 0x1879)) { - muxSource = invMap4Source[muxSource]; - if (muxSource==3 && - (chip->version == 0x1887 || chip->version == 0x1888) && - (snd_es18xx_mixer_read(chip, 0x7a) & 0x08) - ) - muxSource = 4; - } - ucontrol->value.enumerated.item[0] = muxSource; + ucontrol->value.enumerated.item[0] = snd_es18xx_mixer_read(chip, 0x1c) & 0x07; return 0; } static int snd_es18xx_put_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - static unsigned char map4Source[4] = {0, 2, 6, 7}; struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol); unsigned char val = ucontrol->value.enumerated.item[0]; - unsigned char retVal = 0; - - switch (chip->version) { - /* 5 source chips */ - case 0x1887: - case 0x1888: - if (val > 4) - return -EINVAL; - if (val == 4) { - retVal = snd_es18xx_mixer_bits(chip, 0x7a, 0x08, 0x08) != 0x08; - val = 3; - } else - retVal = snd_es18xx_mixer_bits(chip, 0x7a, 0x08, 0x00) != 0x00; - /* 4 source chips */ - case 0x1868: - case 0x1878: - if (val > 3) - return -EINVAL; - val = map4Source[val]; - break; - /* 8 source chips */ - case 0x1869: - case 0x1879: - if (val > 7) - return -EINVAL; - break; - default: + + if (val > 7) return -EINVAL; - } - return (snd_es18xx_mixer_bits(chip, 0x1c, 0x07, val) != val) || retVal; + return snd_es18xx_mixer_bits(chip, 0x1c, 0x07, val) != val; } static int snd_es18xx_info_spatializer_enable(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) @@ -1290,22 +1191,19 @@ static int snd_es18xx_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e return change; } -/* Mixer controls - * These arrays contain setup data for mixer controls. - * - * The controls that are universal to all chipsets are fully initialized - * here. - */ static struct snd_kcontrol_new snd_es18xx_base_controls[] = { ES18XX_DOUBLE("Master Playback Volume", 0, 0x60, 0x62, 0, 0, 63, 0), ES18XX_DOUBLE("Master Playback Switch", 0, 0x60, 0x62, 6, 6, 1, 1), ES18XX_DOUBLE("Line Playback Volume", 0, 0x3e, 0x3e, 4, 0, 15, 0), ES18XX_DOUBLE("CD Playback Volume", 0, 0x38, 0x38, 4, 0, 15, 0), ES18XX_DOUBLE("FM Playback Volume", 0, 0x36, 0x36, 4, 0, 15, 0), +ES18XX_DOUBLE("Mono Playback Volume", 0, 0x6d, 0x6d, 4, 0, 15, 0), ES18XX_DOUBLE("Mic Playback Volume", 0, 0x1a, 0x1a, 4, 0, 15, 0), ES18XX_DOUBLE("Aux Playback Volume", 0, 0x3a, 0x3a, 4, 0, 15, 0), +ES18XX_SINGLE("PC Speaker Playback Volume", 0, 0x3c, 0, 7, 0), ES18XX_SINGLE("Record Monitor", 0, 0xa8, 3, 1, 0), ES18XX_DOUBLE("Capture Volume", 0, 0xb4, 0xb4, 4, 0, 15, 0), +ES18XX_SINGLE("Capture Switch", 0, 0x1c, 4, 1, 1), { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "Capture Source", @@ -1315,37 +1213,19 @@ ES18XX_DOUBLE("Capture Volume", 0, 0xb4, 0xb4, 4, 0, 15, 0), } }; +static struct snd_kcontrol_new snd_es18xx_mono_in_control = +ES18XX_DOUBLE("Mono Input Playback Volume", 0, 0x6d, 0x6d, 4, 0, 15, 0); + static struct snd_kcontrol_new snd_es18xx_recmix_controls[] = { ES18XX_DOUBLE("PCM Capture Volume", 0, 0x69, 0x69, 4, 0, 15, 0), ES18XX_DOUBLE("Mic Capture Volume", 0, 0x68, 0x68, 4, 0, 15, 0), ES18XX_DOUBLE("Line Capture Volume", 0, 0x6e, 0x6e, 4, 0, 15, 0), ES18XX_DOUBLE("FM Capture Volume", 0, 0x6b, 0x6b, 4, 0, 15, 0), +ES18XX_DOUBLE("Mono Capture Volume", 0, 0x6f, 0x6f, 4, 0, 15, 0), ES18XX_DOUBLE("CD Capture Volume", 0, 0x6a, 0x6a, 4, 0, 15, 0), ES18XX_DOUBLE("Aux Capture Volume", 0, 0x6c, 0x6c, 4, 0, 15, 0) }; -/* - * The chipset specific mixer controls - */ -static struct snd_kcontrol_new snd_es18xx_opt_speaker = - ES18XX_SINGLE("PC Speaker Playback Volume", 0, 0x3c, 0, 7, 0); - -static struct snd_kcontrol_new snd_es18xx_opt_1869[] = { -ES18XX_SINGLE("Capture Switch", 0, 0x1c, 4, 1, 1), -ES18XX_SINGLE("Video Playback Switch", 0, 0x7f, 0, 1, 0), -ES18XX_DOUBLE("Mono Playback Volume", 0, 0x6d, 0x6d, 4, 0, 15, 0), -ES18XX_DOUBLE("Mono Capture Volume", 0, 0x6f, 0x6f, 4, 0, 15, 0) -}; - -static struct snd_kcontrol_new snd_es18xx_opt_1878 = - ES18XX_DOUBLE("Video Playback Volume", 0, 0x68, 0x68, 4, 0, 15, 0); - -static struct snd_kcontrol_new snd_es18xx_opt_1879[] = { -ES18XX_SINGLE("Video Playback Switch", 0, 0x71, 6, 1, 0), -ES18XX_DOUBLE("Video Playback Volume", 0, 0x6d, 0x6d, 4, 0, 15, 0), -ES18XX_DOUBLE("Video Capture Volume", 0, 0x6f, 0x6f, 4, 0, 15, 0) -}; - static struct snd_kcontrol_new snd_es18xx_pcm1_controls[] = { ES18XX_DOUBLE("PCM Playback Volume", 0, 0x14, 0x14, 4, 0, 15, 0), }; @@ -1390,6 +1270,7 @@ static struct snd_kcontrol_new snd_es18xx_hw_volume_controls[] = { ES18XX_SINGLE("Hardware Master Volume Split", 0, 0x64, 7, 1, 0), }; +#if 0 static int __devinit snd_es18xx_config_read(struct snd_es18xx *chip, unsigned char reg) { int data; @@ -1400,6 +1281,7 @@ static int __devinit snd_es18xx_config_read(struct snd_es18xx *chip, unsigned ch spin_unlock_irqrestore(&chip->ctrl_lock, flags); return data; } +#endif static void __devinit snd_es18xx_config_write(struct snd_es18xx *chip, unsigned char reg, unsigned char data) @@ -1545,17 +1427,6 @@ static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip) snd_es18xx_mixer_write(chip, 0x58, 0x94); snd_es18xx_mixer_write(chip, 0x5a, 0x80); } - /* Flip the "enable I2S" bits for those chipsets that need it */ - switch (chip->version) { - case 0x1879: - //Leaving I2S enabled on the 1879 screws up the PCM playback (rate effected somehow) - //so a Switch control has been added to toggle this 0x71 bit on/off: - //snd_es18xx_mixer_bits(chip, 0x71, 0x40, 0x40); - /* Note: we fall through on purpose here. */ - case 0x1878: - snd_es18xx_config_write(chip, 0x29, snd_es18xx_config_read(chip, 0x29) | 0x40); - break; - } /* Mute input source */ if (chip->caps & ES18XX_MUTEREC) mask = 0x10; @@ -1605,14 +1476,11 @@ static int __devinit snd_es18xx_identify(struct snd_es18xx *chip) } outb(0x40, chip->port + 0x04); - udelay(10); hi = inb(chip->port + 0x05); - udelay(10); lo = inb(chip->port + 0x05); if (hi != lo) { chip->version = hi << 8 | lo; chip->ctrl_port = inb(chip->port + 0x05) << 8; - udelay(10); chip->ctrl_port += inb(chip->port + 0x05); if ((chip->res_ctrl_port = request_region(chip->ctrl_port, 8, "ES18xx - CTRL")) == NULL) { @@ -1651,22 +1519,22 @@ static int __devinit snd_es18xx_probe(struct snd_es18xx *chip) switch (chip->version) { case 0x1868: - chip->caps = ES18XX_DUPLEX_MONO | ES18XX_DUPLEX_SAME | ES18XX_CONTROL; + chip->caps = ES18XX_DUPLEX_MONO | ES18XX_DUPLEX_SAME | ES18XX_CONTROL | ES18XX_HWV; break; case 0x1869: chip->caps = ES18XX_PCM2 | ES18XX_SPATIALIZER | ES18XX_RECMIX | ES18XX_NEW_RATE | ES18XX_AUXB | ES18XX_MONO | ES18XX_MUTEREC | ES18XX_CONTROL | ES18XX_HWV; break; case 0x1878: - chip->caps = ES18XX_DUPLEX_MONO | ES18XX_DUPLEX_SAME | ES18XX_I2S | ES18XX_CONTROL; + chip->caps = ES18XX_DUPLEX_MONO | ES18XX_DUPLEX_SAME | ES18XX_I2S | ES18XX_CONTROL | ES18XX_HWV; break; case 0x1879: chip->caps = ES18XX_PCM2 | ES18XX_SPATIALIZER | ES18XX_RECMIX | ES18XX_NEW_RATE | ES18XX_AUXB | ES18XX_I2S | ES18XX_CONTROL | ES18XX_HWV; break; case 0x1887: - chip->caps = ES18XX_PCM2 | ES18XX_RECMIX | ES18XX_AUXB | ES18XX_DUPLEX_SAME; + chip->caps = ES18XX_PCM2 | ES18XX_RECMIX | ES18XX_AUXB | ES18XX_DUPLEX_SAME | ES18XX_HWV; break; case 0x1888: - chip->caps = ES18XX_PCM2 | ES18XX_RECMIX | ES18XX_AUXB | ES18XX_DUPLEX_SAME; + chip->caps = ES18XX_PCM2 | ES18XX_RECMIX | ES18XX_AUXB | ES18XX_DUPLEX_SAME | ES18XX_HWV; break; default: snd_printk(KERN_ERR "[0x%lx] unsupported chip ES%x\n", @@ -1837,7 +1705,7 @@ static int __devinit snd_es18xx_new_device(struct snd_card *card, return -EBUSY; } - if (request_irq(irq, snd_es18xx_interrupt, IRQF_DISABLED, "ES18xx", (void *) chip)) { + if (request_irq(irq, snd_es18xx_interrupt, SA_INTERRUPT, "ES18xx", (void *) chip)) { snd_es18xx_free(chip); snd_printk(KERN_ERR PFX "unable to grap IRQ %d\n", irq); return -EBUSY; @@ -1910,6 +1778,10 @@ static int __devinit snd_es18xx_mixer(struct snd_es18xx *chip) } } + if (chip->caps & ES18XX_MONO) { + if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_es18xx_mono_in_control, chip))) < 0) + return err; + } if (chip->caps & ES18XX_RECMIX) { for (idx = 0; idx < ARRAY_SIZE(snd_es18xx_recmix_controls); idx++) { if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_es18xx_recmix_controls[idx], chip))) < 0) @@ -1947,36 +1819,6 @@ static int __devinit snd_es18xx_mixer(struct snd_es18xx *chip) } } - /* finish initializing other chipset specific controls - */ - if (chip->version != 0x1868) { - err = snd_ctl_add(card, snd_ctl_new1(&snd_es18xx_opt_speaker, - chip)); - if (err < 0) - return err; - } - if (chip->version == 0x1869) { - for (idx = 0; idx < ARRAY_SIZE(snd_es18xx_opt_1869); idx++) { - err = snd_ctl_add(card, - snd_ctl_new1(&snd_es18xx_opt_1869[idx], - chip)); - if (err < 0) - return err; - } - } else if (chip->version == 0x1878) { - err = snd_ctl_add(card, snd_ctl_new1(&snd_es18xx_opt_1878, - chip)); - if (err < 0) - return err; - } else if (chip->version == 0x1879) { - for (idx = 0; idx < ARRAY_SIZE(snd_es18xx_opt_1879); idx++) { - err = snd_ctl_add(card, - snd_ctl_new1(&snd_es18xx_opt_1879[idx], - chip)); - if (err < 0) - return err; - } - } return 0; } @@ -2088,8 +1930,7 @@ static int __devinit snd_audiodrive_pnp(int dev, struct snd_audiodrive *acard, kfree(cfg); return -EAGAIN; } - snd_printdd("pnp: port=0x%llx\n", - (unsigned long long)pnp_port_start(acard->devc, 0)); + snd_printdd("pnp: port=0x%lx\n", pnp_port_start(acard->devc, 0)); /* PnP initialization */ pdev = acard->dev; pnp_init_resource_table(cfg); @@ -2207,7 +2048,7 @@ static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev) return snd_card_register(card); } -static int __devinit snd_es18xx_nonpnp_probe1(int dev, struct platform_device *devptr) +static int __init snd_es18xx_nonpnp_probe1(int dev, struct platform_device *devptr) { struct snd_card *card; int err; @@ -2224,7 +2065,7 @@ static int __devinit snd_es18xx_nonpnp_probe1(int dev, struct platform_device *d return 0; } -static int __devinit snd_es18xx_nonpnp_probe(struct platform_device *pdev) +static int __init snd_es18xx_nonpnp_probe(struct platform_device *pdev) { int dev = pdev->id; int err; @@ -2300,8 +2141,6 @@ static struct platform_driver snd_es18xx_nonpnp_driver = { #ifdef CONFIG_PNP -static unsigned int __devinitdata es18xx_pnp_devices; - static int __devinit snd_audiodrive_pnp_detect(struct pnp_card_link *pcard, const struct pnp_card_device_id *pid) { @@ -2332,7 +2171,6 @@ static int __devinit snd_audiodrive_pnp_detect(struct pnp_card_link *pcard, pnp_set_card_drvdata(pcard, card); dev++; - es18xx_pnp_devices++; return 0; } @@ -2388,27 +2226,25 @@ static int __init alsa_card_es18xx_init(void) if ((err = platform_driver_register(&snd_es18xx_nonpnp_driver)) < 0) return err; - for (i = 0; i < SNDRV_CARDS; i++) { + for (i = 0; i < SNDRV_CARDS && enable[i]; i++) { struct platform_device *device; - if (! enable[i] || is_isapnp_selected(i)) + if (is_isapnp_selected(i)) continue; device = platform_device_register_simple(ES18XX_DRIVER, i, NULL, 0); - if (IS_ERR(device)) - continue; - if (!platform_get_drvdata(device)) { - platform_device_unregister(device); - continue; + if (IS_ERR(device)) { + err = PTR_ERR(device); + goto errout; } platform_devices[i] = device; cards++; } #ifdef CONFIG_PNP - err = pnp_register_card_driver(&es18xx_pnpc_driver); - if (!err) { + i = pnp_register_card_driver(&es18xx_pnpc_driver); + if (i >= 0) { pnp_registered = 1; - cards += es18xx_pnp_devices; + cards += i; } #endif @@ -2416,10 +2252,14 @@ static int __init alsa_card_es18xx_init(void) #ifdef MODULE snd_printk(KERN_ERR "ESS AudioDrive ES18xx soundcard not found or device busy\n"); #endif - snd_es18xx_unregister_all(); - return -ENODEV; + err = -ENODEV; + goto errout; } return 0; + + errout: + snd_es18xx_unregister_all(); + return err; } static void __exit alsa_card_es18xx_exit(void)