MODULE_AUTHOR("Andreas Mohr <hw7oshyuv3001@sneakemail.com>");
MODULE_DESCRIPTION("Aztech AZF3328 (PCI168)");
MODULE_LICENSE("GPL");
-MODULE_CLASSES("{sound}");
-MODULE_DEVICES("{{Aztech,AZF3328}}");
+MODULE_SUPPORTED_DEVICE("{{Aztech,AZF3328}}");
#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
#define SUPPORT_JOYSTICK 1
module_param_array(index, int, boot_devs, 0444);
MODULE_PARM_DESC(index, "Index value for AZF3328 soundcard.");
-MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
module_param_array(id, charp, boot_devs, 0444);
MODULE_PARM_DESC(id, "ID string for AZF3328 soundcard.");
-MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
module_param_array(enable, bool, boot_devs, 0444);
MODULE_PARM_DESC(enable, "Enable AZF3328 soundcard.");
-MODULE_PARM_SYNTAX(enable, SNDRV_INDEX_DESC);
#ifdef SUPPORT_JOYSTICK
module_param_array(joystick, bool, boot_devs, 0444);
MODULE_PARM_DESC(joystick, "Enable joystick for AZF3328 soundcard.");
-MODULE_PARM_SYNTAX(joystick, SNDRV_BOOLEAN_FALSE_DESC);
#endif
typedef struct _snd_azf3328 azf3328_t;
-#define chip_t azf3328_t
struct _snd_azf3328 {
int irq;
unsigned long codec_port;
- struct resource *res_codec_port;
unsigned long io2_port;
- struct resource *res_io2_port;
unsigned long mpu_port;
- struct resource *res_mpu_port;
unsigned long synth_port;
- struct resource *res_synth_port;
unsigned long mixer_port;
- struct resource *res_mixer_port;
#ifdef SUPPORT_JOYSTICK
struct gameport gameport;
return (nreg != oreg);
}
-#define NUM_CONTROLS(ary) (sizeof(ary) / sizeof(snd_kcontrol_new_t))
-
static snd_kcontrol_new_t snd_azf3328_mixer_controls[] __devinitdata = {
AZF3328_MIXER_SWITCH("Master Playback Switch", IDX_MIXER_PLAY_MASTER, 15, 1),
AZF3328_MIXER_VOL_STEREO("Master Playback Volume", IDX_MIXER_PLAY_MASTER, 0x1f, 1),
/* add mixer controls */
sw = snd_azf3328_mixer_controls;
- for (idx = 0; idx < NUM_CONTROLS(snd_azf3328_mixer_controls); idx++, sw++) {
+ for (idx = 0; idx < ARRAY_SIZE(snd_azf3328_mixer_controls); idx++, sw++) {
if ((err = snd_ctl_add(chip->card, snd_ctl_new1(sw, chip))) < 0)
return err;
}
static int snd_azf3328_playback_trigger(snd_pcm_substream_t * substream, int cmd)
{
- unsigned long flags;
azf3328_t *chip = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime;
int result = 0;
snd_azf3328_setfmt(chip, IDX_IO_PLAY_SOUNDFORMAT, runtime->rate, snd_pcm_format_width(runtime->format), runtime->channels);
- spin_lock_irqsave(&chip->reg_lock, flags);
+ spin_lock(&chip->reg_lock);
/* stop playback */
status1 = inw(chip->codec_port+IDX_IO_PLAY_FLAGS);
status1 &= ~DMA_RESUME;
/* FIXME: clear interrupts or what??? */
outw(0xffff, chip->codec_port+IDX_IO_PLAY_IRQMASK);
- spin_unlock_irqrestore(&chip->reg_lock, flags);
+ spin_unlock(&chip->reg_lock);
snd_azf3328_setdmaa(chip, runtime->dma_addr, snd_pcm_lib_period_bytes(substream), snd_pcm_lib_buffer_bytes(substream), 0);
- spin_lock_irqsave(&chip->reg_lock, flags);
+ spin_lock(&chip->reg_lock);
#ifdef WIN9X
/* FIXME: enable playback/recording??? */
status1 |= DMA_PLAY_SOMETHING1 | DMA_PLAY_SOMETHING2;
outw(DMA_PLAY_SOMETHING1|DMA_PLAY_SOMETHING2, chip->codec_port+IDX_IO_PLAY_FLAGS);
outw(DMA_RESUME|SOMETHING_ALMOST_ALWAYS_SET|DMA_EPILOGUE_SOMETHING|DMA_SOMETHING_ELSE, chip->codec_port+IDX_IO_PLAY_FLAGS);
#endif
- spin_unlock_irqrestore(&chip->reg_lock, flags);
+ spin_unlock(&chip->reg_lock);
/* now unmute WaveOut */
snd_azf3328_mixer_set_mute(chip, IDX_MIXER_WAVEOUT, 0);
/* mute WaveOut */
snd_azf3328_mixer_set_mute(chip, IDX_MIXER_WAVEOUT, 1);
- spin_lock_irqsave(&chip->reg_lock, flags);
+ spin_lock(&chip->reg_lock);
/* stop playback */
status1 = inw(chip->codec_port+IDX_IO_PLAY_FLAGS);
status1 &= ~DMA_PLAY_SOMETHING1;
outw(status1, chip->codec_port+IDX_IO_PLAY_FLAGS);
- spin_unlock_irqrestore(&chip->reg_lock, flags);
+ spin_unlock(&chip->reg_lock);
/* now unmute WaveOut */
snd_azf3328_mixer_set_mute(chip, IDX_MIXER_WAVEOUT, 0);
* should actually be triggered like that */
static int snd_azf3328_capture_trigger(snd_pcm_substream_t * substream, int cmd)
{
- unsigned long flags;
azf3328_t *chip = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime;
int result = 0;
snd_azf3328_setfmt(chip, IDX_IO_REC_SOUNDFORMAT, runtime->rate, snd_pcm_format_width(runtime->format), runtime->channels);
- spin_lock_irqsave(&chip->reg_lock, flags);
+ spin_lock(&chip->reg_lock);
/* stop recording */
status1 = inw(chip->codec_port+IDX_IO_REC_FLAGS);
status1 &= ~DMA_RESUME;
/* FIXME: clear interrupts or what??? */
outw(0xffff, chip->codec_port+IDX_IO_REC_IRQMASK);
- spin_unlock_irqrestore(&chip->reg_lock, flags);
+ spin_unlock(&chip->reg_lock);
snd_azf3328_setdmaa(chip, runtime->dma_addr, snd_pcm_lib_period_bytes(substream), snd_pcm_lib_buffer_bytes(substream), 1);
- spin_lock_irqsave(&chip->reg_lock, flags);
+ spin_lock(&chip->reg_lock);
#ifdef WIN9X
/* FIXME: enable playback/recording??? */
status1 |= DMA_PLAY_SOMETHING1 | DMA_PLAY_SOMETHING2;
outw(DMA_PLAY_SOMETHING1|DMA_PLAY_SOMETHING2, chip->codec_port+IDX_IO_REC_FLAGS);
outw(DMA_RESUME|SOMETHING_ALMOST_ALWAYS_SET|DMA_EPILOGUE_SOMETHING|DMA_SOMETHING_ELSE, chip->codec_port+IDX_IO_REC_FLAGS);
#endif
- spin_unlock_irqrestore(&chip->reg_lock, flags);
+ spin_unlock(&chip->reg_lock);
snd_azf3328_dbgio(chip, "trigger2");
chip->is_playing = 1;
break;
case SNDRV_PCM_TRIGGER_STOP:
- spin_lock_irqsave(&chip->reg_lock, flags);
+ spin_lock(&chip->reg_lock);
/* stop recording */
status1 = inw(chip->codec_port+IDX_IO_REC_FLAGS);
status1 &= ~DMA_PLAY_SOMETHING1;
outw(status1, chip->codec_port+IDX_IO_REC_FLAGS);
- spin_unlock_irqrestore(&chip->reg_lock, flags);
+ spin_unlock(&chip->reg_lock);
chip->is_playing = 0;
break;
unsigned long bufptr, playptr;
unsigned long result;
snd_pcm_uframes_t frmres;
- unsigned long flags;
- spin_lock_irqsave(&chip->reg_lock, flags);
#ifdef QUERY_HARDWARE
bufptr = inl(chip->codec_port+IDX_IO_PLAY_DMA_START_1);
#else
bufptr = substream->runtime->dma_addr;
#endif
playptr = inl(chip->codec_port+IDX_IO_PLAY_DMA_CURRPOS);
- spin_unlock_irqrestore(&chip->reg_lock, flags);
result = playptr - bufptr;
frmres = bytes_to_frames( substream->runtime, result );
unsigned long bufptr, recptr;
unsigned long result;
snd_pcm_uframes_t frmres;
- unsigned long flags;
- spin_lock_irqsave(&chip->reg_lock, flags);
#ifdef QUERY_HARDWARE
bufptr = inl(chip->codec_port+IDX_IO_REC_DMA_START_1);
#else
bufptr = substream->runtime->dma_addr;
#endif
recptr = inl(chip->codec_port+IDX_IO_REC_DMA_CURRPOS);
- spin_unlock_irqrestore(&chip->reg_lock, flags);
result = recptr - bufptr;
frmres = bytes_to_frames( substream->runtime, result );
static irqreturn_t snd_azf3328_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{
- azf3328_t *chip = snd_magic_cast(azf3328_t, dev_id, return IRQ_NONE);
+ azf3328_t *chip = dev_id;
unsigned int status, which;
static unsigned long count;
static void snd_azf3328_pcm_free(snd_pcm_t *pcm)
{
- azf3328_t *chip = snd_magic_cast(azf3328_t, pcm->private_data, return);
+ azf3328_t *chip = pcm->private_data;
chip->pcm = NULL;
snd_pcm_lib_preallocate_free_for_all(pcm);
}
kfree_nocheck(chip->res_joystick);
}
#endif
- if (chip->res_codec_port) {
- release_resource(chip->res_codec_port);
- kfree_nocheck(chip->res_codec_port);
- }
- if (chip->res_io2_port) {
- release_resource(chip->res_io2_port);
- kfree_nocheck(chip->res_io2_port);
- }
- if (chip->res_mpu_port) {
- release_resource(chip->res_mpu_port);
- kfree_nocheck(chip->res_mpu_port);
- }
- if (chip->res_synth_port) {
- release_resource(chip->res_synth_port);
- kfree_nocheck(chip->res_synth_port);
- }
- if (chip->res_mixer_port) {
- release_resource(chip->res_mixer_port);
- kfree_nocheck(chip->res_mixer_port);
- }
if (chip->irq >= 0)
free_irq(chip->irq, (void *)chip);
+ pci_release_regions(chip->pci);
- snd_magic_kfree(chip);
+ kfree(chip);
return 0;
}
static int snd_azf3328_dev_free(snd_device_t *device)
{
- azf3328_t *chip = snd_magic_cast(azf3328_t, device->device_data, return -ENXIO);
+ azf3328_t *chip = device->device_data;
return snd_azf3328_free(chip);
}
unsigned long device_type,
azf3328_t ** rchip)
{
- unsigned long flags;
azf3328_t *chip;
int err;
static snd_device_ops_t ops = {
if ((err = pci_enable_device(pci)) < 0)
return err;
- chip = snd_magic_kcalloc(azf3328_t, 0, GFP_KERNEL);
+ chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
if (chip == NULL)
return -ENOMEM;
spin_lock_init(&chip->reg_lock);
return -ENXIO;
}
- chip->codec_port = pci_resource_start(pci, 0);
- if ((chip->res_codec_port = request_region(chip->codec_port, 0x80, "Aztech AZF3328 I/O")) == NULL) {
- snd_printk("unable to grab I/O port at 0x%lx-0x%lx\n", chip->codec_port, chip->codec_port + 0x80 - 1);
- snd_azf3328_free(chip);
- return -EBUSY;
+ if ((err = pci_request_regions(pci, "Aztech AZF3328")) < 0) {
+ kfree(chip);
+ return err;
}
+
+ chip->codec_port = pci_resource_start(pci, 0);
chip->io2_port = pci_resource_start(pci, 1);
- if ((chip->res_io2_port = request_region(chip->io2_port, 0x08, "Aztech AZF3328 I/O 2")) == NULL) {
- snd_printk("unable to grab I/O 2 port at 0x%lx-0x%lx\n", chip->io2_port, chip->io2_port + 0x08 - 1);
- snd_azf3328_free(chip);
- return -EBUSY;
- }
chip->mpu_port = pci_resource_start(pci, 2);
- if ((chip->res_mpu_port = request_region(chip->mpu_port, 0x04, "Aztech AZF3328 MPU401")) == NULL) {
- snd_printk("unable to grab MPU401 port at 0x%lx-0x%lx\n", chip->mpu_port, chip->mpu_port + 0x04 - 1);
- snd_azf3328_free(chip);
- return -EBUSY;
- }
chip->synth_port = pci_resource_start(pci, 3);
- if ((chip->res_synth_port = request_region(chip->synth_port, 0x08, "Aztech AZF3328 OPL3")) == NULL) {
- snd_printk("unable to grab OPL3 port at 0x%lx-0x%lx\n", chip->synth_port, chip->synth_port + 0x08 - 1);
- snd_azf3328_free(chip);
- return -EBUSY;
- }
chip->mixer_port = pci_resource_start(pci, 4);
- if ((chip->res_mixer_port = request_region(chip->mixer_port, 0x40, "Aztech AZF3328 Mixer")) == NULL) {
- snd_printk("unable to grab mixer port at 0x%lx-0x%lx\n", chip->mixer_port, chip->mixer_port + 0x40 - 1);
- snd_azf3328_free(chip);
- return -EBUSY;
- }
if (request_irq(pci->irq, snd_azf3328_interrupt, SA_INTERRUPT|SA_SHIRQ, card->shortname, (void *)chip)) {
snd_printk("unable to grab IRQ %d\n", pci->irq);
#endif
/* standard chip init stuff */
- spin_lock_irqsave(&chip->reg_lock, flags);
+ spin_lock_irq(&chip->reg_lock);
outb(DMA_PLAY_SOMETHING2|DMA_EPILOGUE_SOMETHING|DMA_SOMETHING_ELSE, chip->codec_port + IDX_IO_PLAY_FLAGS);
outb(DMA_PLAY_SOMETHING2|DMA_EPILOGUE_SOMETHING|DMA_SOMETHING_ELSE, chip->codec_port + IDX_IO_SOMETHING_FLAGS);
outb(DMA_PLAY_SOMETHING2|DMA_EPILOGUE_SOMETHING|DMA_SOMETHING_ELSE, chip->codec_port + IDX_IO_REC_FLAGS);
outb(0x0, chip->codec_port + IDX_IO_IRQ63H);
- spin_unlock_irqrestore(&chip->reg_lock, flags);
+ spin_unlock_irq(&chip->reg_lock);
snd_card_set_dev(card, &pci->dev);
git://git.onelab.eu / linux-2.6.git / blobdiff