MODULE_AUTHOR("Matt Wu <Matt_Wu@acersoftech.com.cn>");
MODULE_DESCRIPTION("ALI M5451");
MODULE_LICENSE("GPL");
-MODULE_CLASSES("{sound}");
-MODULE_DEVICES("{{ALI,M5451,pci},{ALI,M5451}}");
+MODULE_SUPPORTED_DEVICE("{{ALI,M5451,pci},{ALI,M5451}}");
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
module_param_array(index, int, boot_devs, 0444);
MODULE_PARM_DESC(index, "Index value for ALI M5451 PCI Audio.");
-MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
module_param_array(id, charp, boot_devs, 0444);
MODULE_PARM_DESC(id, "ID string for ALI M5451 PCI Audio.");
-MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
module_param_array(enable, bool, boot_devs, 0444);
MODULE_PARM_DESC(enable, "Enable ALI 5451 PCI Audio.");
-MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
module_param_array(pcm_channels, int, boot_devs, 0444);
MODULE_PARM_DESC(pcm_channels, "PCM Channels");
-MODULE_PARM_SYNTAX(pcm_channels, SNDRV_ENABLED ",default:32,allows:{{1,32}}");
module_param_array(spdif, bool, boot_devs, 0444);
MODULE_PARM_DESC(spdif, "Support SPDIF I/O");
-MODULE_PARM_SYNTAX(spdif, SNDRV_ENABLED "," SNDRV_BOOLEAN_FALSE_DESC);
/*
* Debug part definitions
typedef struct snd_stru_ali ali_t;
typedef struct snd_ali_stru_voice snd_ali_voice_t;
-#define chip_t ali_t
typedef struct snd_ali_channel_control {
// register data
unsigned int hw_initialized: 1;
unsigned int spdif_support: 1;
- struct resource *res_port;
struct pci_dev *pci;
struct pci_dev *pci_m1533;
unsigned short reg,
unsigned short val )
{
- ali_t *codec = snd_magic_cast(ali_t, ac97->private_data, return);
+ ali_t *codec = ac97->private_data;
snd_ali_printk("codec_write: reg=%xh data=%xh.\n", reg, val);
snd_ali_codec_poke(codec, 0, reg, val);
static unsigned short snd_ali_codec_read(ac97_t *ac97, unsigned short reg)
{
- ali_t *codec = snd_magic_cast(ali_t, ac97->private_data, return -ENXIO);
+ ali_t *codec = ac97->private_data;
snd_ali_printk("codec_read reg=%xh.\n", reg);
return (snd_ali_codec_peek(codec, 0, reg));
void *dev_id,
struct pt_regs *regs)
{
- ali_t *codec = snd_magic_cast(ali_t, dev_id, return IRQ_NONE);
+ ali_t *codec = dev_id;
if (codec == NULL)
return IRQ_NONE;
what = whati = capture_flag = 0;
snd_pcm_group_for_each(pos, substream) {
s = snd_pcm_group_substream_entry(pos);
- if ((ali_t *) _snd_pcm_chip(s->pcm) == codec) {
+ if ((ali_t *) snd_pcm_substream_chip(s) == codec) {
pvoice = (snd_ali_voice_t *) s->runtime->private_data;
evoice = pvoice->extra;
what |= 1 << (pvoice->number & 0x1f);
snd_pcm_runtime_t *runtime = substream->runtime;
snd_ali_voice_t *pvoice = (snd_ali_voice_t *) runtime->private_data;
unsigned int cso;
- unsigned long flags;
- spin_lock_irqsave(&codec->reg_lock, flags);
+ spin_lock(&codec->reg_lock);
if (!pvoice->running) {
- spin_unlock_irqrestore(&codec->reg_lock, flags);
+ spin_unlock(&codec->reg_lock);
return 0;
}
outb(pvoice->number, ALI_REG(codec, ALI_GC_CIR));
cso = inw(ALI_REG(codec, ALI_CSO_ALPHA_FMS + 2));
- spin_unlock_irqrestore(&codec->reg_lock, flags);
+ spin_unlock(&codec->reg_lock);
snd_ali_printk("playback pointer returned cso=%xh.\n", cso);
return cso;
static void snd_ali_pcm_free(snd_pcm_t *pcm)
{
- ali_t *codec = snd_magic_cast(ali_t, pcm->private_data, return);
+ ali_t *codec = pcm->private_data;
codec->pcm = NULL;
}
static int snd_ali5451_spdif_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
{
unsigned long flags;
- ali_t *codec = snd_magic_cast(ali_t, kcontrol->private_data, -ENXIO);
+ ali_t *codec = kcontrol->private_data;
unsigned int enable;
enable = ucontrol->value.integer.value[0] ? 1 : 0;
static int snd_ali5451_spdif_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
{
unsigned long flags;
- ali_t *codec = snd_magic_cast(ali_t, kcontrol->private_data, -ENXIO);
+ ali_t *codec = kcontrol->private_data;
unsigned int change = 0, enable = 0;
enable = ucontrol->value.integer.value[0] ? 1 : 0;
static void snd_ali_mixer_free_ac97_bus(ac97_bus_t *bus)
{
- ali_t *codec = snd_magic_cast(ali_t, bus->private_data, return);
+ ali_t *codec = bus->private_data;
codec->ac97_bus = NULL;
}
static void snd_ali_mixer_free_ac97(ac97_t *ac97)
{
- ali_t *codec = snd_magic_cast(ali_t, ac97->private_data, return);
+ ali_t *codec = ac97->private_data;
codec->ac97 = NULL;
}
static int __devinit snd_ali_mixer(ali_t * codec)
{
- ac97_bus_t bus;
- ac97_t ac97;
+ ac97_template_t ac97;
unsigned int idx;
int err;
+ static ac97_bus_ops_t ops = {
+ .write = snd_ali_codec_write,
+ .read = snd_ali_codec_read,
+ };
- memset(&bus, 0, sizeof(bus));
- bus.write = snd_ali_codec_write;
- bus.read = snd_ali_codec_read;
- bus.private_data = codec;
- bus.private_free = snd_ali_mixer_free_ac97_bus;
- if ((err = snd_ac97_bus(codec->card, &bus, &codec->ac97_bus)) < 0)
+ if ((err = snd_ac97_bus(codec->card, 0, &ops, codec, &codec->ac97_bus)) < 0)
return err;
+ codec->ac97_bus->private_free = snd_ali_mixer_free_ac97_bus;
memset(&ac97, 0, sizeof(ac97));
ac97.private_data = codec;
#ifdef CONFIG_PM
static int ali_suspend(snd_card_t *card, unsigned int state)
{
- ali_t *chip = snd_magic_cast(ali_t, card->pm_private_data, return -EINVAL);
+ ali_t *chip = card->pm_private_data;
ali_image_t *im;
int i, j;
outl(0xffffffff, ALI_REG(chip, ALI_STOP));
spin_unlock_irq(&chip->reg_lock);
+ snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
return 0;
}
static int ali_resume(snd_card_t *card, unsigned int state)
{
- ali_t *chip = snd_magic_cast(ali_t, card->pm_private_data, return -EINVAL);
+ ali_t *chip = card->pm_private_data;
ali_image_t *im;
int i, j;
spin_unlock_irq(&chip->reg_lock);
snd_ac97_resume(chip->ac97);
+ snd_power_change_state(card, SNDRV_CTL_POWER_D0);
return 0;
}
synchronize_irq(codec->irq);
free_irq(codec->irq, (void *)codec);
}
- if (codec->res_port) {
- release_resource(codec->res_port);
- kfree_nocheck(codec->res_port);
- }
+ if (codec->port)
+ pci_release_regions(codec->pci);
#ifdef CONFIG_PM
if (codec->image)
kfree(codec->image);
#endif
- snd_magic_kfree(codec);
+ kfree(codec);
return 0;
}
static int __devinit snd_ali_resources(ali_t *codec)
{
+ int err;
+
snd_ali_printk("resouces allocation ...\n");
- if ((codec->res_port = request_region(codec->port, 0x100, "ALI 5451")) == NULL) {
- snd_printk("Unalbe to request io ports.\n");
- return -EBUSY;
- }
+ if ((err = pci_request_regions(codec->pci, "ALI 5451")) < 0)
+ return err;
+ codec->port = pci_resource_start(codec->pci, 0);
if (request_irq(codec->pci->irq, snd_ali_card_interrupt, SA_INTERRUPT|SA_SHIRQ, "ALI 5451", (void *)codec)) {
snd_printk("Unable to request irq.\n");
}
static int snd_ali_dev_free(snd_device_t *device)
{
- ali_t *codec=snd_magic_cast(ali_t, device->device_data, return -ENXIO);
+ ali_t *codec=device->device_data;
snd_ali_free(codec);
return 0;
}
return -ENXIO;
}
- if ((codec = snd_magic_kcalloc(ali_t, 0, GFP_KERNEL)) == NULL)
+ if ((codec = kcalloc(1, sizeof(*codec), GFP_KERNEL)) == NULL)
return -ENOMEM;
spin_lock_init(&codec->reg_lock);
codec->card = card;
codec->pci = pci;
codec->irq = -1;
- codec->port = pci_resource_start(pci, 0);
pci_read_config_byte(pci, PCI_REVISION_ID, &codec->revision);
codec->spdif_support = spdif_support;
git://git.onelab.eu / linux-2.6.git / blobdiff