#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/gameport.h>
+#include <linux/moduleparam.h>
+#include <linux/delay.h>
#include <sound/core.h>
#include <sound/control.h>
#include <sound/pcm.h>
#include <sound/opl3.h>
#include <sound/mpu401.h>
-#define SNDRV_GET_ID
#include <sound/initval.h>
#include <asm/io.h>
-#define chip_t es1938_t
-
MODULE_AUTHOR("Jaromir Koutek <miri@punknet.cz>");
MODULE_DESCRIPTION("ESS Solo-1");
MODULE_LICENSE("GPL");
-MODULE_CLASSES("{sound}");
-MODULE_DEVICES("{{ESS,ES1938},"
+MODULE_SUPPORTED_DEVICE("{{ESS,ES1938},"
"{ESS,ES1946},"
"{ESS,ES1969},"
"{TerraTec,128i PCI}}");
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
-MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+module_param_array(index, int, NULL, 0444);
MODULE_PARM_DESC(index, "Index value for ESS Solo-1 soundcard.");
-MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
-MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+module_param_array(id, charp, NULL, 0444);
MODULE_PARM_DESC(id, "ID string for ESS Solo-1 soundcard.");
-MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
-MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+module_param_array(enable, bool, NULL, 0444);
MODULE_PARM_DESC(enable, "Enable ESS Solo-1 soundcard.");
-MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
#define SLIO_REG(chip, x) ((chip)->io_port + ESSIO_REG_##x)
typedef struct _snd_es1938 es1938_t;
+#define SAVED_REG_SIZE 32 /* max. number of registers to save */
+
struct _snd_es1938 {
int irq;
unsigned long io_port;
- struct resource *res_io_port;
unsigned long sb_port;
- struct resource *res_sb_port;
unsigned long vc_port;
- struct resource *res_vc_port;
unsigned long mpu_port;
- struct resource *res_mpu_port;
unsigned long game_port;
- struct resource *res_game_port;
unsigned long ddma_port;
unsigned char irqmask;
struct pci_dev *pci;
snd_card_t *card;
+ snd_pcm_t *pcm;
snd_pcm_substream_t *capture_substream;
snd_pcm_substream_t *playback1_substream;
snd_pcm_substream_t *playback2_substream;
#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
struct gameport gameport;
#endif
+#ifdef CONFIG_PM
+ unsigned char saved_regs[SAVED_REG_SIZE];
+#endif
};
static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id, struct pt_regs *regs);
case SNDRV_PCM_TRIGGER_START:
/* According to the documentation this should be:
0x13 but that value may randomly swap stereo channels */
+ snd_es1938_mixer_write(chip, ESSSB_IREG_AUDIO2CONTROL1, 0x92);
+ udelay(10);
snd_es1938_mixer_write(chip, ESSSB_IREG_AUDIO2CONTROL1, 0x93);
+ /* This two stage init gives the FIFO -> DAC connection time to
+ * settle before first data from DMA flows in. This should ensure
+ * no swapping of stereo channels. Report a bug if otherwise :-) */
outb(0x0a, SLIO_REG(chip, AUDIO2MODE));
chip->active |= DAC2;
break;
chip->dma2_shift = 2 - mono - is8;
+ snd_es1938_reset_fifo(chip);
+
/* set clock and counters */
snd_es1938_rate_set(chip, substream, DAC2);
static int snd_es1938_capture_copy(snd_pcm_substream_t *substream,
int channel,
snd_pcm_uframes_t pos,
- void *dst,
+ void __user *dst,
snd_pcm_uframes_t count)
{
snd_pcm_runtime_t *runtime = substream->runtime;
} else {
if (copy_to_user(dst, runtime->dma_area + pos + 1, count - 1))
return -EFAULT;
- if (put_user(runtime->dma_area[0], ((unsigned char *)dst) + count - 1))
+ if (put_user(runtime->dma_area[0], ((unsigned char __user *)dst) + count - 1))
return -EFAULT;
}
return 0;
.rate_max = 48000,
.channels_min = 1,
.channels_max = 2,
- .buffer_bytes_max = 65536,
+ .buffer_bytes_max = 0x8000, /* DMA controller screws on higher values */
.period_bytes_min = 64,
- .period_bytes_max = 65536,
+ .period_bytes_max = 0x8000,
.periods_min = 1,
.periods_max = 1024,
.fifo_size = 256,
.rate_max = 48000,
.channels_min = 1,
.channels_max = 2,
- .buffer_bytes_max = 65536,
+ .buffer_bytes_max = 0x8000, /* DMA controller screws on higher values */
.period_bytes_min = 64,
- .period_bytes_max = 65536,
+ .period_bytes_max = 0x8000,
.periods_min = 1,
.periods_max = 1024,
.fifo_size = 256,
snd_pcm_lib_preallocate_free_for_all(pcm);
}
-static int __devinit snd_es1938_new_pcm(es1938_t *chip, int device, snd_pcm_t ** rpcm)
+static int __devinit snd_es1938_new_pcm(es1938_t *chip, int device)
{
snd_pcm_t *pcm;
int err;
- if (rpcm)
- *rpcm = NULL;
if ((err = snd_pcm_new(chip->card, "es-1938-1946", device, 2, 1, &pcm)) < 0)
return err;
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_es1938_playback_ops);
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
snd_dma_pci_data(chip->pci), 64*1024, 64*1024);
- if (rpcm)
- *rpcm = pcm;
+ chip->pcm = pcm;
return 0;
}
static void snd_es1938_hwv_free(snd_kcontrol_t *kcontrol)
{
- es1938_t *chip = snd_magic_cast(es1938_t, _snd_kcontrol_chip(kcontrol), return);
+ es1938_t *chip = snd_kcontrol_chip(kcontrol);
chip->master_volume = NULL;
chip->master_switch = NULL;
chip->hw_volume = NULL;
/* ---------------------------------------------------------------------------- */
/* ---------------------------------------------------------------------------- */
+/*
+ * initialize the chip - used by resume callback, too
+ */
+static void snd_es1938_chip_init(es1938_t *chip)
+{
+ /* reset chip */
+ snd_es1938_reset(chip);
+
+ /* configure native mode */
+
+ /* enable bus master */
+ pci_set_master(chip->pci);
+
+ /* disable legacy audio */
+ pci_write_config_word(chip->pci, SL_PCI_LEGACYCONTROL, 0x805f);
+
+ /* set DDMA base */
+ pci_write_config_word(chip->pci, SL_PCI_DDMACONTROL, chip->ddma_port | 1);
+
+ /* set DMA/IRQ policy */
+ pci_write_config_dword(chip->pci, SL_PCI_CONFIG, 0);
+
+ /* enable Audio 1, Audio 2, MPU401 IRQ and HW volume IRQ*/
+ outb(0xf0, SLIO_REG(chip, IRQCONTROL));
+
+ /* reset DMA */
+ outb(0, SLDM_REG(chip, DMACLEAR));
+}
+
+#ifdef CONFIG_PM
+/*
+ * PM support
+ */
+
+static unsigned char saved_regs[SAVED_REG_SIZE+1] = {
+ 0x14, 0x1a, 0x1c, 0x3a, 0x3c, 0x3e, 0x36, 0x38,
+ 0x50, 0x52, 0x60, 0x61, 0x62, 0x63, 0x64, 0x68,
+ 0x69, 0x6a, 0x6b, 0x6d, 0x6e, 0x6f, 0x7c, 0x7d,
+ 0xa8, 0xb4,
+};
+
+
+static int es1938_suspend(snd_card_t *card, unsigned int state)
+{
+ es1938_t *chip = card->pm_private_data;
+ unsigned char *s, *d;
+
+ snd_pcm_suspend_all(chip->pcm);
+
+ /* save mixer-related registers */
+ for (s = saved_regs, d = chip->saved_regs; *s; s++, d++)
+ *d = snd_es1938_reg_read(chip, *s);
+
+ outb(0x00, SLIO_REG(chip, IRQCONTROL)); /* disable irqs */
+
+ pci_disable_device(chip->pci);
+ return 0;
+}
+
+static int es1938_resume(snd_card_t *card, unsigned int state)
+{
+ es1938_t *chip = card->pm_private_data;
+ unsigned char *s, *d;
+
+ pci_enable_device(chip->pci);
+ snd_es1938_chip_init(chip);
+
+ /* restore mixer-related registers */
+ for (s = saved_regs, d = chip->saved_regs; *s; s++, d++) {
+ if (*s < 0xa0)
+ snd_es1938_mixer_write(chip, *s, *d);
+ else
+ snd_es1938_write(chip, *s, *d);
+ }
+
+ return 0;
+}
+#endif /* CONFIG_PM */
+
static int snd_es1938_free(es1938_t *chip)
{
- /*if (chip->rmidi)
- snd_es1938_mixer_bits(chip, ESSSB_IREG_MPU401CONTROL, 0x40, 0);*/
+ /* disable irqs */
+ outb(0x00, SLIO_REG(chip, IRQCONTROL));
+ if (chip->rmidi)
+ snd_es1938_mixer_bits(chip, ESSSB_IREG_MPU401CONTROL, 0x40, 0);
+
#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
if (chip->gameport.io)
gameport_unregister_port(&chip->gameport);
#endif
- if (chip->res_io_port) {
- release_resource(chip->res_io_port);
- kfree_nocheck(chip->res_io_port);
- }
- if (chip->res_sb_port) {
- release_resource(chip->res_sb_port);
- kfree_nocheck(chip->res_sb_port);
- }
- if (chip->res_vc_port) {
- release_resource(chip->res_vc_port);
- kfree_nocheck(chip->res_vc_port);
- }
- if (chip->res_mpu_port) {
- release_resource(chip->res_mpu_port);
- kfree_nocheck(chip->res_mpu_port);
- }
- if (chip->res_game_port) {
- release_resource(chip->res_game_port);
- kfree_nocheck(chip->res_game_port);
- }
if (chip->irq >= 0)
free_irq(chip->irq, (void *)chip);
- snd_magic_kfree(chip);
+ pci_release_regions(chip->pci);
+ pci_disable_device(chip->pci);
+ kfree(chip);
return 0;
}
static int snd_es1938_dev_free(snd_device_t *device)
{
- es1938_t *chip = snd_magic_cast(es1938_t, device->device_data, return -ENXIO);
+ es1938_t *chip = device->device_data;
return snd_es1938_free(chip);
}
if (pci_set_dma_mask(pci, 0x00ffffff) < 0 ||
pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) {
snd_printk("architecture does not support 24bit PCI busmaster DMA\n");
+ pci_disable_device(pci);
return -ENXIO;
}
- chip = snd_magic_kcalloc(es1938_t, 0, GFP_KERNEL);
- if (chip == NULL)
+ chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
+ if (chip == NULL) {
+ pci_disable_device(pci);
return -ENOMEM;
+ }
spin_lock_init(&chip->reg_lock);
spin_lock_init(&chip->mixer_lock);
chip->card = card;
chip->pci = pci;
- chip->io_port = pci_resource_start(pci, 0);
- if ((chip->res_io_port = request_region(chip->io_port, 8, "ESS Solo-1")) == NULL) {
- snd_printk("unable to grab region 0x%lx-0x%lx\n", chip->io_port, chip->io_port + 8 - 1);
- snd_es1938_free(chip);
- return -EBUSY;
+ if ((err = pci_request_regions(pci, "ESS Solo-1")) < 0) {
+ kfree(chip);
+ pci_disable_device(pci);
+ return err;
}
+ chip->io_port = pci_resource_start(pci, 0);
chip->sb_port = pci_resource_start(pci, 1);
- if ((chip->res_sb_port = request_region(chip->sb_port, 0x10, "ESS Solo-1 SB")) == NULL) {
- snd_printk("unable to grab SB region 0x%lx-0x%lx\n", chip->sb_port, chip->sb_port + 0x10 - 1);
- snd_es1938_free(chip);
- return -EBUSY;
- }
chip->vc_port = pci_resource_start(pci, 2);
- if ((chip->res_vc_port = request_region(chip->vc_port, 0x10, "ESS Solo-1 VC (DMA)")) == NULL) {
- snd_printk("unable to grab VC (DMA) region 0x%lx-0x%lx\n", chip->vc_port, chip->vc_port + 0x10 - 1);
- snd_es1938_free(chip);
- return -EBUSY;
- }
chip->mpu_port = pci_resource_start(pci, 3);
- if ((chip->res_mpu_port = request_region(chip->mpu_port, 4, "ESS Solo-1 MIDI")) == NULL) {
- snd_printk("unable to grab MIDI region 0x%lx-0x%lx\n", chip->mpu_port, chip->mpu_port + 4 - 1);
- snd_es1938_free(chip);
- return -EBUSY;
- }
chip->game_port = pci_resource_start(pci, 4);
- if ((chip->res_game_port = request_region(chip->game_port, 4, "ESS Solo-1 GAME")) == NULL) {
- snd_printk("unable to grab GAME region 0x%lx-0x%lx\n", chip->game_port, chip->game_port + 4 - 1);
- snd_es1938_free(chip);
- return -EBUSY;
- }
if (request_irq(pci->irq, snd_es1938_interrupt, SA_INTERRUPT|SA_SHIRQ, "ES1938", (void *)chip)) {
snd_printk("unable to grab IRQ %d\n", pci->irq);
snd_es1938_free(chip);
snd_printk("create: io: 0x%lx, sb: 0x%lx, vc: 0x%lx, mpu: 0x%lx, game: 0x%lx\n",
chip->io_port, chip->sb_port, chip->vc_port, chip->mpu_port, chip->game_port);
#endif
- /* reset chip */
- snd_es1938_reset(chip);
-
- /* configure native mode */
-
- /* enable bus master */
- pci_set_master(pci);
-
- /* disable legacy audio */
- pci_write_config_word(pci, SL_PCI_LEGACYCONTROL, 0x805f);
- /* set DDMA base */
chip->ddma_port = chip->vc_port + 0x00; /* fix from Thomas Sailer */
- pci_write_config_word(pci, SL_PCI_DDMACONTROL, chip->ddma_port | 1);
-
- /* set DMA/IRQ policy */
- pci_write_config_dword(pci, SL_PCI_CONFIG, 0);
- /* enable Audio 1, Audio 2, MPU401 IRQ and HW volume IRQ*/
- outb(0xf0, SLIO_REG(chip, IRQCONTROL));
-
- /* reset DMA */
- outb(0, SLDM_REG(chip, DMACLEAR));
+ snd_es1938_chip_init(chip);
- /* enable bus mastering */
- pci_set_master(pci);
+ snd_card_set_pm_callback(card, es1938_suspend, es1938_resume, chip);
if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
snd_es1938_free(chip);
* -------------------------------------------------------------------- */
static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{
- es1938_t *chip = snd_magic_cast(es1938_t, dev_id, return IRQ_NONE);
+ es1938_t *chip = dev_id;
unsigned char status, audiostatus;
int handled = 0;
/* 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@flying-snail.de
// snd_es1938_mixer_bits(chip, ESSSB_IREG_MPU401CONTROL, 0x40, 0); /* ack? */
if (chip->rmidi) {
handled = 1;
#define ES1938_DMA_SIZE 64
-static int __devinit snd_es1938_mixer(snd_pcm_t *pcm)
+static int __devinit snd_es1938_mixer(es1938_t *chip)
{
snd_card_t *card;
- es1938_t *chip;
unsigned int idx;
int err;
- snd_assert(pcm != NULL && pcm->card != NULL, return -EINVAL);
+ card = chip->card;
- card = pcm->card;
- chip = snd_pcm_chip(pcm);
-
- strcpy(card->mixername, pcm->name);
+ strcpy(card->mixername, "ESS Solo-1");
for (idx = 0; idx < ARRAY_SIZE(snd_es1938_controls); idx++) {
snd_kcontrol_t *kctl;
static int dev;
snd_card_t *card;
es1938_t *chip;
- snd_pcm_t *pcm;
opl3_t *opl3;
int idx, err;
chip->revision,
chip->irq);
- if ((err = snd_es1938_new_pcm(chip, 0, &pcm)) < 0) {
+ if ((err = snd_es1938_new_pcm(chip, 0)) < 0) {
snd_card_free(card);
return err;
}
- if ((err = snd_es1938_mixer(pcm)) < 0) {
+ if ((err = snd_es1938_mixer(chip)) < 0) {
snd_card_free(card);
return err;
}
if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
chip->mpu_port, 1, chip->irq, 0, &chip->rmidi) < 0) {
printk(KERN_ERR "es1938: unable to initialize MPU-401\n");
- } /*else
- snd_es1938_mixer_bits(chip, ESSSB_IREG_MPU401CONTROL, 0x40, 0x40);*/
+ } else {
+ // this line is vital for MIDI interrupt handling on ess-solo1
+ // andreas@flying-snail.de
+ snd_es1938_mixer_bits(chip, ESSSB_IREG_MPU401CONTROL, 0x40, 0x40);
+ }
#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
chip->gameport.io = chip->game_port;
.id_table = snd_es1938_ids,
.probe = snd_es1938_probe,
.remove = __devexit_p(snd_es1938_remove),
+ SND_PCI_PM_CALLBACKS
};
static int __init alsa_card_es1938_init(void)
{
- int err;
-
- if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
- printk(KERN_ERR "ESS Solo-1 soundcard not found or device busy\n");
-#endif
- return err;
- }
- return 0;
+ return pci_module_init(&driver);
}
static void __exit alsa_card_es1938_exit(void)
module_init(alsa_card_es1938_init)
module_exit(alsa_card_es1938_exit)
-
-#ifndef MODULE
-
-/* format is: snd-es1938=enable,index,id */
-
-static int __init alsa_card_es1938_setup(char *str)
-{
- static unsigned __initdata nr_dev = 0;
-
- if (nr_dev >= SNDRV_CARDS)
- return 0;
- (void)(get_option(&str,&enable[nr_dev]) == 2 &&
- get_option(&str,&index[nr_dev]) == 2 &&
- get_id(&str,&id[nr_dev]) == 2);
- nr_dev++;
- return 1;
-}
-
-__setup("snd-es1938=", alsa_card_es1938_setup);
-
-#endif /* ifndef MODULE */
git://git.onelab.eu / linux-2.6.git / blobdiff