Commit ae596186 authored by Rene Herman's avatar Rene Herman Committed by Jaroslav Kysela

[ALSA] isa_bus: es1688

es1688: port to isa_bus infrastructure. very slight reorganization of
the auto-probe code to be a bit easier on the eye (if not the senses).
Signed-off-by: default avatarRene Herman <rene.herman@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent d63898c9
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <sound/driver.h> #include <sound/driver.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/platform_device.h> #include <linux/isa.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
...@@ -35,8 +35,11 @@ ...@@ -35,8 +35,11 @@
#define SNDRV_LEGACY_FIND_FREE_DMA #define SNDRV_LEGACY_FIND_FREE_DMA
#include <sound/initval.h> #include <sound/initval.h>
#define CRD_NAME "Generic ESS ES1688/ES688 AudioDrive"
#define DEV_NAME "es1688"
MODULE_DESCRIPTION(CRD_NAME);
MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>"); MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
MODULE_DESCRIPTION("ESS ESx688 AudioDrive");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{ESS,ES688 PnP AudioDrive,pnp:ESS0100}," MODULE_SUPPORTED_DEVICE("{{ESS,ES688 PnP AudioDrive,pnp:ESS0100},"
"{ESS,ES1688 PnP AudioDrive,pnp:ESS0102}," "{ESS,ES1688 PnP AudioDrive,pnp:ESS0102},"
...@@ -53,189 +56,143 @@ static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,10 */ ...@@ -53,189 +56,143 @@ static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,10 */
static int dma8[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3 */ static int dma8[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3 */
module_param_array(index, int, NULL, 0444); module_param_array(index, int, NULL, 0444);
MODULE_PARM_DESC(index, "Index value for ESx688 soundcard."); MODULE_PARM_DESC(index, "Index value for " CRD_NAME " soundcard.");
module_param_array(id, charp, NULL, 0444); module_param_array(id, charp, NULL, 0444);
MODULE_PARM_DESC(id, "ID string for ESx688 soundcard."); MODULE_PARM_DESC(id, "ID string for " CRD_NAME " soundcard.");
module_param_array(enable, bool, NULL, 0444); module_param_array(enable, bool, NULL, 0444);
MODULE_PARM_DESC(enable, "Enable ESx688 soundcard."); MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");
module_param_array(port, long, NULL, 0444); module_param_array(port, long, NULL, 0444);
MODULE_PARM_DESC(port, "Port # for ESx688 driver."); MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");
module_param_array(mpu_port, long, NULL, 0444); module_param_array(mpu_port, long, NULL, 0444);
MODULE_PARM_DESC(mpu_port, "MPU-401 port # for ESx688 driver."); MODULE_PARM_DESC(mpu_port, "MPU-401 port # for " CRD_NAME " driver.");
module_param_array(irq, int, NULL, 0444); module_param_array(irq, int, NULL, 0444);
MODULE_PARM_DESC(irq, "IRQ # for ESx688 driver."); MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver.");
module_param_array(mpu_irq, int, NULL, 0444); module_param_array(mpu_irq, int, NULL, 0444);
MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for ESx688 driver."); MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for " CRD_NAME " driver.");
module_param_array(dma8, int, NULL, 0444); module_param_array(dma8, int, NULL, 0444);
MODULE_PARM_DESC(dma8, "8-bit DMA # for ESx688 driver."); MODULE_PARM_DESC(dma8, "8-bit DMA # for " CRD_NAME " driver.");
static struct platform_device *devices[SNDRV_CARDS];
#define PFX "es1688: " static int __devinit snd_es1688_match(struct device *dev, unsigned int n)
{
return enable[n];
}
static int __devinit snd_es1688_probe(struct platform_device *pdev) static int __devinit snd_es1688_probe(struct device *dev, unsigned int n)
{ {
int dev = pdev->id; static unsigned long possible_ports[] = {0x220, 0x240, 0x260};
static int possible_irqs[] = {5, 9, 10, 7, -1}; static int possible_irqs[] = {5, 9, 10, 7, -1};
static int possible_dmas[] = {1, 3, 0, -1}; static int possible_dmas[] = {1, 3, 0, -1};
int xirq, xdma, xmpu_irq; int i, xirq, xdma;
struct snd_card *card; struct snd_card *card;
struct snd_es1688 *chip; struct snd_es1688 *chip;
struct snd_opl3 *opl3; struct snd_opl3 *opl3;
struct snd_pcm *pcm; struct snd_pcm *pcm;
int err; int error;
card = snd_card_new(index[n], id[n], THIS_MODULE, 0);
if (!card)
return -EINVAL;
card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); error = -EBUSY;
if (card == NULL)
return -ENOMEM;
xirq = irq[dev]; xirq = irq[n];
if (xirq == SNDRV_AUTO_IRQ) { if (xirq == SNDRV_AUTO_IRQ) {
if ((xirq = snd_legacy_find_free_irq(possible_irqs)) < 0) { xirq = snd_legacy_find_free_irq(possible_irqs);
snd_printk(KERN_ERR PFX "unable to find a free IRQ\n"); if (xirq < 0) {
err = -EBUSY; snd_printk(KERN_ERR "%s: unable to find a free IRQ\n", dev->bus_id);
goto _err; goto out;
} }
} }
xmpu_irq = mpu_irq[dev];
xdma = dma8[dev]; xdma = dma8[n];
if (xdma == SNDRV_AUTO_DMA) { if (xdma == SNDRV_AUTO_DMA) {
if ((xdma = snd_legacy_find_free_dma(possible_dmas)) < 0) { xdma = snd_legacy_find_free_dma(possible_dmas);
snd_printk(KERN_ERR PFX "unable to find a free DMA\n"); if (xdma < 0) {
err = -EBUSY; snd_printk(KERN_ERR "%s: unable to find a free DMA\n", dev->bus_id);
goto _err; goto out;
} }
} }
if (port[dev] != SNDRV_AUTO_PORT) { if (port[n] == SNDRV_AUTO_PORT)
if ((err = snd_es1688_create(card, port[dev], mpu_port[dev], for (i = 0; i < ARRAY_SIZE(possible_ports) && error < 0; i++)
xirq, xmpu_irq, xdma, error = snd_es1688_create(card, possible_ports[i], mpu_port[n],
ES1688_HW_AUTO, &chip)) < 0) xirq, mpu_irq[n], xdma, ES1688_HW_AUTO, &chip);
goto _err; else
} else { error = snd_es1688_create(card, port[n], mpu_port[n],
/* auto-probe legacy ports */ xirq, mpu_irq[n], xdma, ES1688_HW_AUTO, &chip);
static unsigned long possible_ports[] = { if (error < 0)
0x220, 0x240, 0x260, goto out;
};
int i;
for (i = 0; i < ARRAY_SIZE(possible_ports); i++) {
err = snd_es1688_create(card, possible_ports[i],
mpu_port[dev],
xirq, xmpu_irq, xdma,
ES1688_HW_AUTO, &chip);
if (err >= 0) {
port[dev] = possible_ports[i];
break;
}
}
if (i >= ARRAY_SIZE(possible_ports))
goto _err;
}
if ((err = snd_es1688_pcm(chip, 0, &pcm)) < 0) error = snd_es1688_pcm(chip, 0, &pcm);
goto _err; if (error < 0)
goto out;
if ((err = snd_es1688_mixer(chip)) < 0) error = snd_es1688_mixer(chip);
goto _err; if (error < 0)
goto out;
strcpy(card->driver, "ES1688"); strcpy(card->driver, "ES1688");
strcpy(card->shortname, pcm->name); strcpy(card->shortname, pcm->name);
sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i", pcm->name, chip->port, xirq, xdma); sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i", pcm->name, chip->port, xirq, xdma);
if ((snd_opl3_create(card, chip->port, chip->port + 2, OPL3_HW_OPL3, 0, &opl3)) < 0) { if (snd_opl3_create(card, chip->port, chip->port + 2, OPL3_HW_OPL3, 0, &opl3) < 0)
printk(KERN_WARNING PFX "opl3 not detected at 0x%lx\n", chip->port); printk(KERN_WARNING "%s: opl3 not detected at 0x%lx\n", dev->bus_id, chip->port);
} else { else {
if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) error = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
goto _err; if (error < 0)
goto out;
} }
if (xmpu_irq >= 0 && xmpu_irq != SNDRV_AUTO_IRQ && chip->mpu_port > 0) { if (mpu_irq[n] >= 0 && mpu_irq[n] != SNDRV_AUTO_IRQ && chip->mpu_port > 0) {
if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688, error = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688, chip->mpu_port,
chip->mpu_port, 0, 0, mpu_irq[n], IRQF_DISABLED, NULL);
xmpu_irq, if (error < 0)
IRQF_DISABLED, goto out;
NULL)) < 0)
goto _err;
} }
snd_card_set_dev(card, &pdev->dev); snd_card_set_dev(card, dev);
if ((err = snd_card_register(card)) < 0) error = snd_card_register(card);
goto _err; if (error < 0)
goto out;
platform_set_drvdata(pdev, card); dev_set_drvdata(dev, card);
return 0; return 0;
_err: out: snd_card_free(card);
snd_card_free(card); return error;
return err;
} }
static int __devexit snd_es1688_remove(struct platform_device *devptr) static int __devexit snd_es1688_remove(struct device *dev, unsigned int n)
{ {
snd_card_free(platform_get_drvdata(devptr)); snd_card_free(dev_get_drvdata(dev));
platform_set_drvdata(devptr, NULL); dev_set_drvdata(dev, NULL);
return 0; return 0;
} }
#define ES1688_DRIVER "snd_es1688" static struct isa_driver snd_es1688_driver = {
.match = snd_es1688_match,
static struct platform_driver snd_es1688_driver = {
.probe = snd_es1688_probe, .probe = snd_es1688_probe,
.remove = __devexit_p(snd_es1688_remove), .remove = snd_es1688_remove,
/* FIXME: suspend/resume */ #if 0 /* FIXME */
.suspend = snd_es1688_suspend,
.resume = snd_es1688_resume,
#endif
.driver = { .driver = {
.name = ES1688_DRIVER .name = DEV_NAME
}, }
}; };
static void __init_or_module snd_es1688_unregister_all(void)
{
int i;
for (i = 0; i < ARRAY_SIZE(devices); ++i)
platform_device_unregister(devices[i]);
platform_driver_unregister(&snd_es1688_driver);
}
static int __init alsa_card_es1688_init(void) static int __init alsa_card_es1688_init(void)
{ {
int i, cards, err; return isa_register_driver(&snd_es1688_driver, SNDRV_CARDS);
err = platform_driver_register(&snd_es1688_driver);
if (err < 0)
return err;
cards = 0;
for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
if (! enable[i])
continue;
device = platform_device_register_simple(ES1688_DRIVER,
i, NULL, 0);
if (IS_ERR(device))
continue;
if (!platform_get_drvdata(device)) {
platform_device_unregister(device);
continue;
}
devices[i] = device;
cards++;
}
if (!cards) {
#ifdef MODULE
printk(KERN_ERR "ESS AudioDrive ES1688 soundcard not found or device busy\n");
#endif
snd_es1688_unregister_all();
return -ENODEV;
}
return 0;
} }
static void __exit alsa_card_es1688_exit(void) static void __exit alsa_card_es1688_exit(void)
{ {
snd_es1688_unregister_all(); isa_unregister_driver(&snd_es1688_driver);
} }
module_init(alsa_card_es1688_init) module_init(alsa_card_es1688_init);
module_exit(alsa_card_es1688_exit) module_exit(alsa_card_es1688_exit);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment