mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 12:10:52 -04:00
Merge branch 'topic/misc' into for-linus
This commit is contained in:
Takashi Iwai
commit
5e8aa85253
75 changed files with 24893 additions and 5152 deletions
|
|
@ -128,26 +128,14 @@ config SND_CS4236
|
|||
To compile this driver as a module, choose M here: the module
|
||||
will be called snd-cs4236.
|
||||
|
||||
config SND_ES968
|
||||
tristate "Generic ESS ES968 driver"
|
||||
depends on PNP
|
||||
select ISAPNP
|
||||
select SND_MPU401_UART
|
||||
select SND_SB8_DSP
|
||||
help
|
||||
Say Y here to include support for ESS AudioDrive ES968 chips.
|
||||
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called snd-es968.
|
||||
|
||||
config SND_ES1688
|
||||
tristate "Generic ESS ES688/ES1688 driver"
|
||||
tristate "Generic ESS ES688/ES1688 and ES968 PnP driver"
|
||||
select SND_OPL3_LIB
|
||||
select SND_MPU401_UART
|
||||
select SND_PCM
|
||||
help
|
||||
Say Y here to include support for ESS AudioDrive ES688 or
|
||||
ES1688 chips.
|
||||
ES1688 chips. Also, this module support cards with ES968 PnP chip.
|
||||
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called snd-es1688.
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/err.h>
|
||||
#include <linux/isa.h>
|
||||
#include <linux/isapnp.h>
|
||||
#include <linux/time.h>
|
||||
#include <linux/wait.h>
|
||||
#include <linux/moduleparam.h>
|
||||
|
|
@ -45,8 +46,13 @@ MODULE_SUPPORTED_DEVICE("{{ESS,ES688 PnP AudioDrive,pnp:ESS0100},"
|
|||
"{ESS,ES688 AudioDrive,pnp:ESS6881},"
|
||||
"{ESS,ES1688 AudioDrive,pnp:ESS1681}}");
|
||||
|
||||
MODULE_ALIAS("snd_es968");
|
||||
|
||||
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
|
||||
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
|
||||
#ifdef CONFIG_PNP
|
||||
static int isapnp[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;
|
||||
#endif
|
||||
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable this card */
|
||||
static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x220,0x240,0x260 */
|
||||
static long fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* Usually 0x388 */
|
||||
|
|
@ -60,6 +66,10 @@ MODULE_PARM_DESC(index, "Index value for " CRD_NAME " soundcard.");
|
|||
module_param_array(id, charp, NULL, 0444);
|
||||
MODULE_PARM_DESC(id, "ID string for " CRD_NAME " soundcard.");
|
||||
module_param_array(enable, bool, NULL, 0444);
|
||||
#ifdef CONFIG_PNP
|
||||
module_param_array(isapnp, bool, NULL, 0444);
|
||||
MODULE_PARM_DESC(isapnp, "PnP detection for specified soundcard.");
|
||||
#endif
|
||||
MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");
|
||||
module_param_array(port, long, NULL, 0444);
|
||||
MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");
|
||||
|
|
@ -74,14 +84,21 @@ MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for " CRD_NAME " driver.");
|
|||
module_param_array(dma8, int, NULL, 0444);
|
||||
MODULE_PARM_DESC(dma8, "8-bit DMA # for " CRD_NAME " driver.");
|
||||
|
||||
#ifdef CONFIG_PNP
|
||||
#define is_isapnp_selected(dev) isapnp[dev]
|
||||
#else
|
||||
#define is_isapnp_selected(dev) 0
|
||||
#endif
|
||||
|
||||
static int __devinit snd_es1688_match(struct device *dev, unsigned int n)
|
||||
{
|
||||
return enable[n];
|
||||
return enable[n] && !is_isapnp_selected(n);
|
||||
}
|
||||
|
||||
static int __devinit snd_es1688_legacy_create(struct snd_card *card,
|
||||
struct device *dev, unsigned int n, struct snd_es1688 **rchip)
|
||||
static int __devinit snd_es1688_legacy_create(struct snd_card *card,
|
||||
struct device *dev, unsigned int n)
|
||||
{
|
||||
struct snd_es1688 *chip = card->private_data;
|
||||
static long possible_ports[] = {0x220, 0x240, 0x260};
|
||||
static int possible_irqs[] = {5, 9, 10, 7, -1};
|
||||
static int possible_dmas[] = {1, 3, 0, -1};
|
||||
|
|
@ -104,47 +121,39 @@ static int __devinit snd_es1688_legacy_create(struct snd_card *card,
|
|||
}
|
||||
|
||||
if (port[n] != SNDRV_AUTO_PORT)
|
||||
return snd_es1688_create(card, port[n], mpu_port[n], irq[n],
|
||||
mpu_irq[n], dma8[n], ES1688_HW_AUTO, rchip);
|
||||
return snd_es1688_create(card, chip, port[n], mpu_port[n],
|
||||
irq[n], mpu_irq[n], dma8[n], ES1688_HW_AUTO);
|
||||
|
||||
i = 0;
|
||||
do {
|
||||
port[n] = possible_ports[i];
|
||||
error = snd_es1688_create(card, port[n], mpu_port[n], irq[n],
|
||||
mpu_irq[n], dma8[n], ES1688_HW_AUTO, rchip);
|
||||
error = snd_es1688_create(card, chip, port[n], mpu_port[n],
|
||||
irq[n], mpu_irq[n], dma8[n], ES1688_HW_AUTO);
|
||||
} while (error < 0 && ++i < ARRAY_SIZE(possible_ports));
|
||||
|
||||
return error;
|
||||
}
|
||||
|
||||
static int __devinit snd_es1688_probe(struct device *dev, unsigned int n)
|
||||
static int __devinit snd_es1688_probe(struct snd_card *card, unsigned int n)
|
||||
{
|
||||
struct snd_card *card;
|
||||
struct snd_es1688 *chip;
|
||||
struct snd_es1688 *chip = card->private_data;
|
||||
struct snd_opl3 *opl3;
|
||||
struct snd_pcm *pcm;
|
||||
int error;
|
||||
|
||||
error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card);
|
||||
error = snd_es1688_pcm(card, chip, 0, &pcm);
|
||||
if (error < 0)
|
||||
return error;
|
||||
|
||||
error = snd_es1688_legacy_create(card, dev, n, &chip);
|
||||
error = snd_es1688_mixer(card, chip);
|
||||
if (error < 0)
|
||||
goto out;
|
||||
return error;
|
||||
|
||||
error = snd_es1688_pcm(chip, 0, &pcm);
|
||||
if (error < 0)
|
||||
goto out;
|
||||
|
||||
error = snd_es1688_mixer(chip);
|
||||
if (error < 0)
|
||||
goto out;
|
||||
|
||||
strcpy(card->driver, "ES1688");
|
||||
strcpy(card->shortname, pcm->name);
|
||||
sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i", pcm->name,
|
||||
chip->port, chip->irq, chip->dma8);
|
||||
strlcpy(card->driver, "ES1688", sizeof(card->driver));
|
||||
strlcpy(card->shortname, pcm->name, sizeof(card->shortname));
|
||||
snprintf(card->longname, sizeof(card->longname),
|
||||
"%s at 0x%lx, irq %i, dma %i", pcm->name, chip->port,
|
||||
chip->irq, chip->dma8);
|
||||
|
||||
if (fm_port[n] == SNDRV_AUTO_PORT)
|
||||
fm_port[n] = port[n]; /* share the same port */
|
||||
|
|
@ -152,12 +161,12 @@ static int __devinit snd_es1688_probe(struct device *dev, unsigned int n)
|
|||
if (fm_port[n] > 0) {
|
||||
if (snd_opl3_create(card, fm_port[n], fm_port[n] + 2,
|
||||
OPL3_HW_OPL3, 0, &opl3) < 0)
|
||||
dev_warn(dev,
|
||||
dev_warn(card->dev,
|
||||
"opl3 not detected at 0x%lx\n", fm_port[n]);
|
||||
else {
|
||||
error = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
|
||||
if (error < 0)
|
||||
goto out;
|
||||
return error;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -167,23 +176,41 @@ static int __devinit snd_es1688_probe(struct device *dev, unsigned int n)
|
|||
chip->mpu_port, 0,
|
||||
mpu_irq[n], IRQF_DISABLED, NULL);
|
||||
if (error < 0)
|
||||
goto out;
|
||||
return error;
|
||||
}
|
||||
|
||||
return snd_card_register(card);
|
||||
}
|
||||
|
||||
static int __devinit snd_es1688_isa_probe(struct device *dev, unsigned int n)
|
||||
{
|
||||
struct snd_card *card;
|
||||
int error;
|
||||
|
||||
error = snd_card_create(index[n], id[n], THIS_MODULE,
|
||||
sizeof(struct snd_es1688), &card);
|
||||
if (error < 0)
|
||||
return error;
|
||||
|
||||
error = snd_es1688_legacy_create(card, dev, n);
|
||||
if (error < 0)
|
||||
goto out;
|
||||
|
||||
snd_card_set_dev(card, dev);
|
||||
|
||||
error = snd_card_register(card);
|
||||
error = snd_es1688_probe(card, n);
|
||||
if (error < 0)
|
||||
goto out;
|
||||
|
||||
dev_set_drvdata(dev, card);
|
||||
return 0;
|
||||
|
||||
out: snd_card_free(card);
|
||||
return 0;
|
||||
out:
|
||||
snd_card_free(card);
|
||||
return error;
|
||||
}
|
||||
|
||||
static int __devexit snd_es1688_remove(struct device *dev, unsigned int n)
|
||||
static int __devexit snd_es1688_isa_remove(struct device *dev, unsigned int n)
|
||||
{
|
||||
snd_card_free(dev_get_drvdata(dev));
|
||||
dev_set_drvdata(dev, NULL);
|
||||
|
|
@ -192,8 +219,8 @@ static int __devexit snd_es1688_remove(struct device *dev, unsigned int n)
|
|||
|
||||
static struct isa_driver snd_es1688_driver = {
|
||||
.match = snd_es1688_match,
|
||||
.probe = snd_es1688_probe,
|
||||
.remove = __devexit_p(snd_es1688_remove),
|
||||
.probe = snd_es1688_isa_probe,
|
||||
.remove = __devexit_p(snd_es1688_isa_remove),
|
||||
#if 0 /* FIXME */
|
||||
.suspend = snd_es1688_suspend,
|
||||
.resume = snd_es1688_resume,
|
||||
|
|
@ -203,14 +230,142 @@ static struct isa_driver snd_es1688_driver = {
|
|||
}
|
||||
};
|
||||
|
||||
static int snd_es968_pnp_is_probed;
|
||||
|
||||
#ifdef CONFIG_PNP
|
||||
static int __devinit snd_card_es968_pnp(struct snd_card *card, unsigned int n,
|
||||
struct pnp_card_link *pcard,
|
||||
const struct pnp_card_device_id *pid)
|
||||
{
|
||||
struct snd_es1688 *chip = card->private_data;
|
||||
struct pnp_dev *pdev;
|
||||
int error;
|
||||
|
||||
pdev = pnp_request_card_device(pcard, pid->devs[0].id, NULL);
|
||||
if (pdev == NULL)
|
||||
return -ENODEV;
|
||||
|
||||
error = pnp_activate_dev(pdev);
|
||||
if (error < 0) {
|
||||
snd_printk(KERN_ERR "ES968 pnp configure failure\n");
|
||||
return error;
|
||||
}
|
||||
port[n] = pnp_port_start(pdev, 0);
|
||||
dma8[n] = pnp_dma(pdev, 0);
|
||||
irq[n] = pnp_irq(pdev, 0);
|
||||
|
||||
return snd_es1688_create(card, chip, port[n], mpu_port[n], irq[n],
|
||||
mpu_irq[n], dma8[n], ES1688_HW_AUTO);
|
||||
}
|
||||
|
||||
static int __devinit snd_es968_pnp_detect(struct pnp_card_link *pcard,
|
||||
const struct pnp_card_device_id *pid)
|
||||
{
|
||||
struct snd_card *card;
|
||||
static unsigned int dev;
|
||||
int error;
|
||||
struct snd_es1688 *chip;
|
||||
|
||||
if (snd_es968_pnp_is_probed)
|
||||
return -EBUSY;
|
||||
for ( ; dev < SNDRV_CARDS; dev++) {
|
||||
if (enable[dev] && isapnp[dev])
|
||||
break;
|
||||
}
|
||||
if (dev == SNDRV_CARDS)
|
||||
return -ENODEV;
|
||||
|
||||
error = snd_card_create(index[dev], id[dev], THIS_MODULE,
|
||||
sizeof(struct snd_es1688), &card);
|
||||
if (error < 0)
|
||||
return error;
|
||||
chip = card->private_data;
|
||||
|
||||
error = snd_card_es968_pnp(card, dev, pcard, pid);
|
||||
if (error < 0) {
|
||||
snd_card_free(card);
|
||||
return error;
|
||||
}
|
||||
snd_card_set_dev(card, &pcard->card->dev);
|
||||
error = snd_es1688_probe(card, dev);
|
||||
if (error < 0)
|
||||
return error;
|
||||
pnp_set_card_drvdata(pcard, card);
|
||||
snd_es968_pnp_is_probed = 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __devexit snd_es968_pnp_remove(struct pnp_card_link * pcard)
|
||||
{
|
||||
snd_card_free(pnp_get_card_drvdata(pcard));
|
||||
pnp_set_card_drvdata(pcard, NULL);
|
||||
snd_es968_pnp_is_probed = 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int snd_es968_pnp_suspend(struct pnp_card_link *pcard,
|
||||
pm_message_t state)
|
||||
{
|
||||
struct snd_card *card = pnp_get_card_drvdata(pcard);
|
||||
struct snd_es1688 *chip = card->private_data;
|
||||
|
||||
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
|
||||
snd_pcm_suspend_all(chip->pcm);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int snd_es968_pnp_resume(struct pnp_card_link *pcard)
|
||||
{
|
||||
struct snd_card *card = pnp_get_card_drvdata(pcard);
|
||||
struct snd_es1688 *chip = card->private_data;
|
||||
|
||||
snd_es1688_reset(chip);
|
||||
snd_power_change_state(card, SNDRV_CTL_POWER_D0);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static struct pnp_card_device_id snd_es968_pnpids[] = {
|
||||
{ .id = "ESS0968", .devs = { { "@@@0968" }, } },
|
||||
{ .id = "ESS0968", .devs = { { "ESS0968" }, } },
|
||||
{ .id = "", } /* end */
|
||||
};
|
||||
|
||||
MODULE_DEVICE_TABLE(pnp_card, snd_es968_pnpids);
|
||||
|
||||
static struct pnp_card_driver es968_pnpc_driver = {
|
||||
.flags = PNP_DRIVER_RES_DISABLE,
|
||||
.name = DEV_NAME " PnP",
|
||||
.id_table = snd_es968_pnpids,
|
||||
.probe = snd_es968_pnp_detect,
|
||||
.remove = __devexit_p(snd_es968_pnp_remove),
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = snd_es968_pnp_suspend,
|
||||
.resume = snd_es968_pnp_resume,
|
||||
#endif
|
||||
};
|
||||
#endif
|
||||
|
||||
static int __init alsa_card_es1688_init(void)
|
||||
{
|
||||
#ifdef CONFIG_PNP
|
||||
pnp_register_card_driver(&es968_pnpc_driver);
|
||||
if (snd_es968_pnp_is_probed)
|
||||
return 0;
|
||||
pnp_unregister_card_driver(&es968_pnpc_driver);
|
||||
#endif
|
||||
return isa_register_driver(&snd_es1688_driver, SNDRV_CARDS);
|
||||
}
|
||||
|
||||
static void __exit alsa_card_es1688_exit(void)
|
||||
{
|
||||
isa_unregister_driver(&snd_es1688_driver);
|
||||
if (!snd_es968_pnp_is_probed) {
|
||||
isa_unregister_driver(&snd_es1688_driver);
|
||||
return;
|
||||
}
|
||||
#ifdef CONFIG_PNP
|
||||
pnp_unregister_card_driver(&es968_pnpc_driver);
|
||||
#endif
|
||||
}
|
||||
|
||||
module_init(alsa_card_es1688_init);
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ static unsigned char snd_es1688_mixer_read(struct snd_es1688 *chip, unsigned cha
|
|||
return result;
|
||||
}
|
||||
|
||||
static int snd_es1688_reset(struct snd_es1688 *chip)
|
||||
int snd_es1688_reset(struct snd_es1688 *chip)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
@ -115,6 +115,7 @@ static int snd_es1688_reset(struct snd_es1688 *chip)
|
|||
snd_es1688_dsp_command(chip, 0xc6); /* enable extended mode */
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(snd_es1688_reset);
|
||||
|
||||
static int snd_es1688_probe(struct snd_es1688 *chip)
|
||||
{
|
||||
|
|
@ -620,7 +621,6 @@ static int snd_es1688_free(struct snd_es1688 *chip)
|
|||
disable_dma(chip->dma8);
|
||||
free_dma(chip->dma8);
|
||||
}
|
||||
kfree(chip);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -638,23 +638,20 @@ static const char *snd_es1688_chip_id(struct snd_es1688 *chip)
|
|||
}
|
||||
|
||||
int snd_es1688_create(struct snd_card *card,
|
||||
struct snd_es1688 *chip,
|
||||
unsigned long port,
|
||||
unsigned long mpu_port,
|
||||
int irq,
|
||||
int mpu_irq,
|
||||
int dma8,
|
||||
unsigned short hardware,
|
||||
struct snd_es1688 **rchip)
|
||||
unsigned short hardware)
|
||||
{
|
||||
static struct snd_device_ops ops = {
|
||||
.dev_free = snd_es1688_dev_free,
|
||||
};
|
||||
|
||||
struct snd_es1688 *chip;
|
||||
int err;
|
||||
|
||||
*rchip = NULL;
|
||||
chip = kzalloc(sizeof(*chip), GFP_KERNEL);
|
||||
if (chip == NULL)
|
||||
return -ENOMEM;
|
||||
chip->irq = -1;
|
||||
|
|
@ -662,25 +659,21 @@ int snd_es1688_create(struct snd_card *card,
|
|||
|
||||
if ((chip->res_port = request_region(port + 4, 12, "ES1688")) == NULL) {
|
||||
snd_printk(KERN_ERR "es1688: can't grab port 0x%lx\n", port + 4);
|
||||
snd_es1688_free(chip);
|
||||
return -EBUSY;
|
||||
}
|
||||
if (request_irq(irq, snd_es1688_interrupt, IRQF_DISABLED, "ES1688", (void *) chip)) {
|
||||
snd_printk(KERN_ERR "es1688: can't grab IRQ %d\n", irq);
|
||||
snd_es1688_free(chip);
|
||||
return -EBUSY;
|
||||
}
|
||||
chip->irq = irq;
|
||||
if (request_dma(dma8, "ES1688")) {
|
||||
snd_printk(KERN_ERR "es1688: can't grab DMA8 %d\n", dma8);
|
||||
snd_es1688_free(chip);
|
||||
return -EBUSY;
|
||||
}
|
||||
chip->dma8 = dma8;
|
||||
|
||||
spin_lock_init(&chip->reg_lock);
|
||||
spin_lock_init(&chip->mixer_lock);
|
||||
chip->card = card;
|
||||
chip->port = port;
|
||||
mpu_port &= ~0x000f;
|
||||
if (mpu_port < 0x300 || mpu_port > 0x330)
|
||||
|
|
@ -689,23 +682,16 @@ int snd_es1688_create(struct snd_card *card,
|
|||
chip->mpu_irq = mpu_irq;
|
||||
chip->hardware = hardware;
|
||||
|
||||
if ((err = snd_es1688_probe(chip)) < 0) {
|
||||
snd_es1688_free(chip);
|
||||
err = snd_es1688_probe(chip);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
if ((err = snd_es1688_init(chip, 1)) < 0) {
|
||||
snd_es1688_free(chip);
|
||||
|
||||
err = snd_es1688_init(chip, 1);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
|
||||
/* Register device */
|
||||
if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
|
||||
snd_es1688_free(chip);
|
||||
return err;
|
||||
}
|
||||
|
||||
*rchip = chip;
|
||||
return 0;
|
||||
return snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
|
||||
}
|
||||
|
||||
static struct snd_pcm_ops snd_es1688_playback_ops = {
|
||||
|
|
@ -730,12 +716,14 @@ static struct snd_pcm_ops snd_es1688_capture_ops = {
|
|||
.pointer = snd_es1688_capture_pointer,
|
||||
};
|
||||
|
||||
int snd_es1688_pcm(struct snd_es1688 * chip, int device, struct snd_pcm ** rpcm)
|
||||
int snd_es1688_pcm(struct snd_card *card, struct snd_es1688 *chip,
|
||||
int device, struct snd_pcm **rpcm)
|
||||
{
|
||||
struct snd_pcm *pcm;
|
||||
int err;
|
||||
|
||||
if ((err = snd_pcm_new(chip->card, "ESx688", device, 1, 1, &pcm)) < 0)
|
||||
err = snd_pcm_new(card, "ESx688", device, 1, 1, &pcm);
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_es1688_playback_ops);
|
||||
|
|
@ -1009,18 +997,15 @@ static unsigned char snd_es1688_init_table[][2] = {
|
|||
{ ES1688_REC_DEV, 0x17 }
|
||||
};
|
||||
|
||||
int snd_es1688_mixer(struct snd_es1688 *chip)
|
||||
int snd_es1688_mixer(struct snd_card *card, struct snd_es1688 *chip)
|
||||
{
|
||||
struct snd_card *card;
|
||||
unsigned int idx;
|
||||
int err;
|
||||
unsigned char reg, val;
|
||||
|
||||
if (snd_BUG_ON(!chip || !chip->card))
|
||||
if (snd_BUG_ON(!chip || !card))
|
||||
return -EINVAL;
|
||||
|
||||
card = chip->card;
|
||||
|
||||
strcpy(card->mixername, snd_es1688_chip_id(chip));
|
||||
|
||||
for (idx = 0; idx < ARRAY_SIZE(snd_es1688_controls); idx++) {
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ static int __devinit snd_gusextreme_match(struct device *dev, unsigned int n)
|
|||
}
|
||||
|
||||
static int __devinit snd_gusextreme_es1688_create(struct snd_card *card,
|
||||
struct device *dev, unsigned int n, struct snd_es1688 **rchip)
|
||||
struct snd_es1688 *chip, struct device *dev, unsigned int n)
|
||||
{
|
||||
static long possible_ports[] = {0x220, 0x240, 0x260};
|
||||
static int possible_irqs[] = {5, 9, 10, 7, -1};
|
||||
|
|
@ -119,14 +119,14 @@ static int __devinit snd_gusextreme_es1688_create(struct snd_card *card,
|
|||
}
|
||||
|
||||
if (port[n] != SNDRV_AUTO_PORT)
|
||||
return snd_es1688_create(card, port[n], mpu_port[n], irq[n],
|
||||
mpu_irq[n], dma8[n], ES1688_HW_1688, rchip);
|
||||
return snd_es1688_create(card, chip, port[n], mpu_port[n],
|
||||
irq[n], mpu_irq[n], dma8[n], ES1688_HW_1688);
|
||||
|
||||
i = 0;
|
||||
do {
|
||||
port[n] = possible_ports[i];
|
||||
error = snd_es1688_create(card, port[n], mpu_port[n], irq[n],
|
||||
mpu_irq[n], dma8[n], ES1688_HW_1688, rchip);
|
||||
error = snd_es1688_create(card, chip, port[n], mpu_port[n],
|
||||
irq[n], mpu_irq[n], dma8[n], ES1688_HW_1688);
|
||||
} while (error < 0 && ++i < ARRAY_SIZE(possible_ports));
|
||||
|
||||
return error;
|
||||
|
|
@ -206,9 +206,8 @@ static int __devinit snd_gusextreme_detect(struct snd_gus_card *gus,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit snd_gusextreme_mixer(struct snd_es1688 *chip)
|
||||
static int __devinit snd_gusextreme_mixer(struct snd_card *card)
|
||||
{
|
||||
struct snd_card *card = chip->card;
|
||||
struct snd_ctl_elem_id id1, id2;
|
||||
int error;
|
||||
|
||||
|
|
@ -241,17 +240,20 @@ static int __devinit snd_gusextreme_probe(struct device *dev, unsigned int n)
|
|||
struct snd_opl3 *opl3;
|
||||
int error;
|
||||
|
||||
error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card);
|
||||
error = snd_card_create(index[n], id[n], THIS_MODULE,
|
||||
sizeof(struct snd_es1688), &card);
|
||||
if (error < 0)
|
||||
return error;
|
||||
|
||||
es1688 = card->private_data;
|
||||
|
||||
if (mpu_port[n] == SNDRV_AUTO_PORT)
|
||||
mpu_port[n] = 0;
|
||||
|
||||
if (mpu_irq[n] > 15)
|
||||
mpu_irq[n] = -1;
|
||||
|
||||
error = snd_gusextreme_es1688_create(card, dev, n, &es1688);
|
||||
error = snd_gusextreme_es1688_create(card, es1688, dev, n);
|
||||
if (error < 0)
|
||||
goto out;
|
||||
|
||||
|
|
@ -280,11 +282,11 @@ static int __devinit snd_gusextreme_probe(struct device *dev, unsigned int n)
|
|||
}
|
||||
gus->codec_flag = 1;
|
||||
|
||||
error = snd_es1688_pcm(es1688, 0, NULL);
|
||||
error = snd_es1688_pcm(card, es1688, 0, NULL);
|
||||
if (error < 0)
|
||||
goto out;
|
||||
|
||||
error = snd_es1688_mixer(es1688);
|
||||
error = snd_es1688_mixer(card, es1688);
|
||||
if (error < 0)
|
||||
goto out;
|
||||
|
||||
|
|
@ -300,7 +302,7 @@ static int __devinit snd_gusextreme_probe(struct device *dev, unsigned int n)
|
|||
if (error < 0)
|
||||
goto out;
|
||||
|
||||
error = snd_gusextreme_mixer(es1688);
|
||||
error = snd_gusextreme_mixer(card);
|
||||
if (error < 0)
|
||||
goto out;
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ snd-sb8-objs := sb8.o
|
|||
snd-sb16-objs := sb16.o
|
||||
snd-sbawe-objs := sbawe.o emu8000.o
|
||||
snd-emu8000-synth-objs := emu8000_synth.o emu8000_callback.o emu8000_patch.o emu8000_pcm.o
|
||||
snd-es968-objs := es968.o
|
||||
snd-jazz16-objs := jazz16.o
|
||||
|
||||
# Toplevel Module Dependency
|
||||
|
|
@ -21,7 +20,6 @@ obj-$(CONFIG_SND_SB8_DSP) += snd-sb8-dsp.o
|
|||
obj-$(CONFIG_SND_SB8) += snd-sb8.o
|
||||
obj-$(CONFIG_SND_SB16) += snd-sb16.o
|
||||
obj-$(CONFIG_SND_SBAWE) += snd-sbawe.o
|
||||
obj-$(CONFIG_SND_ES968) += snd-es968.o
|
||||
obj-$(CONFIG_SND_JAZZ16) += snd-jazz16.o
|
||||
ifeq ($(CONFIG_SND_SB16_CSP),y)
|
||||
obj-$(CONFIG_SND_SB16) += snd-sb16-csp.o
|
||||
|
|
|
|||
|
|
@ -1,248 +0,0 @@
|
|||
|
||||
/*
|
||||
card-es968.c - driver for ESS AudioDrive ES968 based soundcards.
|
||||
Copyright (C) 1999 by Massimo Piccioni <dafastidio@libero.it>
|
||||
|
||||
Thanks to Pierfrancesco 'qM2' Passerini.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include <linux/init.h>
|
||||
#include <linux/time.h>
|
||||
#include <linux/pnp.h>
|
||||
#include <linux/moduleparam.h>
|
||||
#include <sound/core.h>
|
||||
#include <sound/initval.h>
|
||||
#include <sound/sb.h>
|
||||
|
||||
#define PFX "es968: "
|
||||
|
||||
MODULE_AUTHOR("Massimo Piccioni <[email protected]>");
|
||||
MODULE_DESCRIPTION("ESS AudioDrive ES968");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_SUPPORTED_DEVICE("{{ESS,AudioDrive ES968}}");
|
||||
|
||||
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
|
||||
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
|
||||
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */
|
||||
static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
|
||||
static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* Pnp setup */
|
||||
static int dma8[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* PnP setup */
|
||||
|
||||
module_param_array(index, int, NULL, 0444);
|
||||
MODULE_PARM_DESC(index, "Index value for es968 based soundcard.");
|
||||
module_param_array(id, charp, NULL, 0444);
|
||||
MODULE_PARM_DESC(id, "ID string for es968 based soundcard.");
|
||||
module_param_array(enable, bool, NULL, 0444);
|
||||
MODULE_PARM_DESC(enable, "Enable es968 based soundcard.");
|
||||
|
||||
struct snd_card_es968 {
|
||||
struct pnp_dev *dev;
|
||||
struct snd_sb *chip;
|
||||
};
|
||||
|
||||
static struct pnp_card_device_id snd_es968_pnpids[] = {
|
||||
{ .id = "ESS0968", .devs = { { "@@@0968" }, } },
|
||||
{ .id = "", } /* end */
|
||||
};
|
||||
|
||||
MODULE_DEVICE_TABLE(pnp_card, snd_es968_pnpids);
|
||||
|
||||
#define DRIVER_NAME "snd-card-es968"
|
||||
|
||||
static irqreturn_t snd_card_es968_interrupt(int irq, void *dev_id)
|
||||
{
|
||||
struct snd_sb *chip = dev_id;
|
||||
|
||||
if (chip->open & SB_OPEN_PCM) {
|
||||
return snd_sb8dsp_interrupt(chip);
|
||||
} else {
|
||||
return snd_sb8dsp_midi_interrupt(chip);
|
||||
}
|
||||
}
|
||||
|
||||
static int __devinit snd_card_es968_pnp(int dev, struct snd_card_es968 *acard,
|
||||
struct pnp_card_link *card,
|
||||
const struct pnp_card_device_id *id)
|
||||
{
|
||||
struct pnp_dev *pdev;
|
||||
int err;
|
||||
|
||||
acard->dev = pnp_request_card_device(card, id->devs[0].id, NULL);
|
||||
if (acard->dev == NULL)
|
||||
return -ENODEV;
|
||||
|
||||
pdev = acard->dev;
|
||||
|
||||
err = pnp_activate_dev(pdev);
|
||||
if (err < 0) {
|
||||
snd_printk(KERN_ERR PFX "AUDIO pnp configure failure\n");
|
||||
return err;
|
||||
}
|
||||
port[dev] = pnp_port_start(pdev, 0);
|
||||
dma8[dev] = pnp_dma(pdev, 0);
|
||||
irq[dev] = pnp_irq(pdev, 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit snd_card_es968_probe(int dev,
|
||||
struct pnp_card_link *pcard,
|
||||
const struct pnp_card_device_id *pid)
|
||||
{
|
||||
int error;
|
||||
struct snd_sb *chip;
|
||||
struct snd_card *card;
|
||||
struct snd_card_es968 *acard;
|
||||
|
||||
error = snd_card_create(index[dev], id[dev], THIS_MODULE,
|
||||
sizeof(struct snd_card_es968), &card);
|
||||
if (error < 0)
|
||||
return error;
|
||||
acard = card->private_data;
|
||||
if ((error = snd_card_es968_pnp(dev, acard, pcard, pid))) {
|
||||
snd_card_free(card);
|
||||
return error;
|
||||
}
|
||||
snd_card_set_dev(card, &pcard->card->dev);
|
||||
|
||||
if ((error = snd_sbdsp_create(card, port[dev],
|
||||
irq[dev],
|
||||
snd_card_es968_interrupt,
|
||||
dma8[dev],
|
||||
-1,
|
||||
SB_HW_AUTO, &chip)) < 0) {
|
||||
snd_card_free(card);
|
||||
return error;
|
||||
}
|
||||
acard->chip = chip;
|
||||
|
||||
if ((error = snd_sb8dsp_pcm(chip, 0, NULL)) < 0) {
|
||||
snd_card_free(card);
|
||||
return error;
|
||||
}
|
||||
|
||||
if ((error = snd_sbmixer_new(chip)) < 0) {
|
||||
snd_card_free(card);
|
||||
return error;
|
||||
}
|
||||
|
||||
if ((error = snd_sb8dsp_midi(chip, 0, NULL)) < 0) {
|
||||
snd_card_free(card);
|
||||
return error;
|
||||
}
|
||||
|
||||
strcpy(card->driver, "ES968");
|
||||
strcpy(card->shortname, "ESS ES968");
|
||||
sprintf(card->longname, "%s soundcard, %s at 0x%lx, irq %d, dma %d",
|
||||
card->shortname, chip->name, chip->port, irq[dev], dma8[dev]);
|
||||
|
||||
if ((error = snd_card_register(card)) < 0) {
|
||||
snd_card_free(card);
|
||||
return error;
|
||||
}
|
||||
pnp_set_card_drvdata(pcard, card);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static unsigned int __devinitdata es968_devices;
|
||||
|
||||
static int __devinit snd_es968_pnp_detect(struct pnp_card_link *card,
|
||||
const struct pnp_card_device_id *id)
|
||||
{
|
||||
static int dev;
|
||||
int res;
|
||||
|
||||
for ( ; dev < SNDRV_CARDS; dev++) {
|
||||
if (!enable[dev])
|
||||
continue;
|
||||
res = snd_card_es968_probe(dev, card, id);
|
||||
if (res < 0)
|
||||
return res;
|
||||
dev++;
|
||||
es968_devices++;
|
||||
return 0;
|
||||
}
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
static void __devexit snd_es968_pnp_remove(struct pnp_card_link * pcard)
|
||||
{
|
||||
snd_card_free(pnp_get_card_drvdata(pcard));
|
||||
pnp_set_card_drvdata(pcard, NULL);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int snd_es968_pnp_suspend(struct pnp_card_link *pcard, pm_message_t state)
|
||||
{
|
||||
struct snd_card *card = pnp_get_card_drvdata(pcard);
|
||||
struct snd_card_es968 *acard = card->private_data;
|
||||
struct snd_sb *chip = acard->chip;
|
||||
|
||||
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
|
||||
snd_pcm_suspend_all(chip->pcm);
|
||||
snd_sbmixer_suspend(chip);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int snd_es968_pnp_resume(struct pnp_card_link *pcard)
|
||||
{
|
||||
struct snd_card *card = pnp_get_card_drvdata(pcard);
|
||||
struct snd_card_es968 *acard = card->private_data;
|
||||
struct snd_sb *chip = acard->chip;
|
||||
|
||||
snd_sbdsp_reset(chip);
|
||||
snd_sbmixer_resume(chip);
|
||||
snd_power_change_state(card, SNDRV_CTL_POWER_D0);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static struct pnp_card_driver es968_pnpc_driver = {
|
||||
.flags = PNP_DRIVER_RES_DISABLE,
|
||||
.name = "es968",
|
||||
.id_table = snd_es968_pnpids,
|
||||
.probe = snd_es968_pnp_detect,
|
||||
.remove = __devexit_p(snd_es968_pnp_remove),
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = snd_es968_pnp_suspend,
|
||||
.resume = snd_es968_pnp_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
static int __init alsa_card_es968_init(void)
|
||||
{
|
||||
int err = pnp_register_card_driver(&es968_pnpc_driver);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
if (!es968_devices) {
|
||||
pnp_unregister_card_driver(&es968_pnpc_driver);
|
||||
#ifdef MODULE
|
||||
snd_printk(KERN_ERR "no ES968 based soundcards found\n");
|
||||
#endif
|
||||
return -ENODEV;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __exit alsa_card_es968_exit(void)
|
||||
{
|
||||
pnp_unregister_card_driver(&es968_pnpc_driver);
|
||||
}
|
||||
|
||||
module_init(alsa_card_es968_init)
|
||||
module_exit(alsa_card_es968_exit)
|
||||
Loading…
Reference in a new issue