Changeset 35 for GPL/trunk/alsa-kernel/pci/ymfpci

Timestamp:

Dec 13, 2005, 9:08:20 PM (20 years ago)

Author:

vladest

Message:

Fixed UNIAUD API
Added PM support for Yamaha chipsets
Added PM support for Intel chipsets

Location:

GPL/trunk/alsa-kernel/pci/ymfpci

Files:

• ymfpci.c (modified) (2 diffs)
• ymfpci_main.c (modified) (7 diffs)

GPL/trunk/alsa-kernel/pci/ymfpci/ymfpci.c

@@ -191 +191 @@
         }
         chip->fm_res = fm_res;
-        chip->mpu_res = mpu_res;
+        chip->mpu_res = mpu_res;
+        card->private_data = chip;
+
         strcpy(card->driver, str);
         sprintf(card->shortname, "Yamaha DS-XG (%s)", str);
@@ -270 +272 @@
 
 static struct pci_driver driver = {
-        0,0,0,"Yamaha DS-XG PCI",
-        snd_ymfpci_ids,
-        snd_card_ymfpci_probe,
-        snd_card_ymfpci_remove,
-        SND_PCI_PM_CALLBACKS
+    .name = "Yamaha DS-1 PCI",
+    .id_table = snd_ymfpci_ids,
+    .probe = snd_card_ymfpci_probe,
+    .remove = snd_card_ymfpci_remove,
+#ifdef CONFIG_PM
+    .suspend = snd_ymfpci_suspend,
+    .resume = snd_ymfpci_resume,
+#endif
 };
+
 
 static int __init alsa_card_ymfpci_init(void)

GPL/trunk/alsa-kernel/pci/ymfpci/ymfpci_main.c

@@ -728 +728 @@
     u32 status, nvoice, mode;
     ymfpci_voice_t *voice;
-#ifdef TARGET_OS2
-    int fOurIrq = FALSE;
-#endif
 
     status = snd_ymfpci_readl(chip, YDSXGR_STATUS);
     if (status & 0x80000000) {
-#ifdef TARGET_OS2
-        fOurIrq = TRUE;
-#endif
         chip->active_bank = snd_ymfpci_readl(chip, YDSXGR_CTRLSELECT) & 1;
         spin_lock(&chip->voice_lock);
@@ -775 +769 @@
     if (chip->rawmidi)
         snd_mpu401_uart_interrupt(irq, chip->rawmidi->private_data, regs);
-#ifdef TARGET_OS2
-    if (fOurIrq) {
-        eoi_irq(irq);
-    }
-#endif //TARGET_OS2
     return IRQ_HANDLED;
 }
@@ -2226 +2215 @@
 #define YDSXGR_NUM_SAVED_REGS   ARRAY_SIZE(saved_regs_index)
 
-static int snd_ymfpci_suspend(snd_card_t *card, unsigned int state)
-{
-    ymfpci_t *chip = card->pm_private_data;
+int snd_ymfpci_suspend(struct pci_dev *pci, pm_message_t state)
+{
+    struct snd_card *card = pci_get_drvdata(pci);
+    struct snd_ymfpci *chip = card->private_data;
     unsigned int i;
 
+    snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
     snd_pcm_suspend_all(chip->pcm);
     snd_pcm_suspend_all(chip->pcm2);
@@ -2241 +2232 @@
     snd_ymfpci_writel(chip, YDSXGR_NATIVEDACOUTVOL, 0);
     snd_ymfpci_disable_dsp(chip);
-    return 0;
-}
-
-static int snd_ymfpci_resume(snd_card_t *card, unsigned int state)
-{
-    ymfpci_t *chip = card->pm_private_data;
+    pci_disable_device(pci);
+    pci_save_state(pci);
+    return 0;
+}
+
+int snd_ymfpci_resume(struct pci_dev *pci)
+{
+    struct snd_card *card = pci_get_drvdata(pci);
+    struct snd_ymfpci *chip = card->private_data;
     unsigned int i;
 
-    pci_enable_device(chip->pci);
-    pci_set_master(chip->pci);
-    snd_ymfpci_aclink_reset(chip->pci);
+    pci_restore_state(pci);
+    pci_enable_device(pci);
+    pci_set_master(pci);
+    snd_ymfpci_aclink_reset(pci);
     snd_ymfpci_codec_ready(chip, 0);
     snd_ymfpci_download_image(chip);
@@ -2268 +2263 @@
         spin_unlock_irq(&chip->reg_lock);
     }
-    return 0;
-}
+    snd_power_change_state(card, SNDRV_CTL_POWER_D0);
+    return 0;
+}
+
 #endif /* CONFIG_PM */
 
@@ -2354 +2351 @@
         return -ENOMEM;
     }
-    snd_card_set_pm_callback(card, snd_ymfpci_suspend, snd_ymfpci_resume, chip);
 #endif
-
-    snd_ymfpci_proc_init(card, chip);
 
     if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
@@ -2364 +2358 @@
     }
 
+    snd_ymfpci_proc_init(card, chip);
+
     snd_card_set_dev(card, &pci->dev);