Changeset 35

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

Files:

• alsa-kernel/core/pcm_native.c (modified) (2 diffs)
• alsa-kernel/pci/intel8x0.c (modified) (77 diffs)
• alsa-kernel/pci/ymfpci/ymfpci.c (modified) (2 diffs)
• alsa-kernel/pci/ymfpci/ymfpci_main.c (modified) (7 diffs)
• lib32/pci.c (modified) (1 diff)

GPL/trunk/alsa-kernel/core/pcm_native.c

@@ -31 +31 @@
  *  Compatibility
  */
+//#define RULES_DEBUG
 //#define DEBUG_PK
 //#define static
@@ -125 +126 @@
 char *snd_pcm_hw_param_names[] = {
     HW_PARAM(ACCESS),
+    HW_PARAM(FORMAT),
 #ifdef TARGET_OS2
     HW_PARAM(RATE_MASK),
 #endif
-    HW_PARAM(FORMAT),
     HW_PARAM(SUBFORMAT),
     HW_PARAM(SAMPLE_BITS),

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

@@ -389 +389 @@
 enum { ALID_PCMIN, ALID_PCMOUT, ALID_MIC, ALID_AC97SPDIFOUT, ALID_SPDIFIN, ALID_SPDIFOUT, ALID_LAST = ALID_SPDIFOUT };
 
-#define get_ichdev(substream) (ichdev_t *)(substream->runtime->private_data)
-
-typedef struct {
+#define get_ichdev(substream) (struct ichdev *)(substream->runtime->private_data)
+
+typedef struct ichdev {
     unsigned int ichd;                  /* ich device number */
     unsigned long reg_offset;           /* offset to bmaddr */
@@ -418 +418 @@
     unsigned int page_attr_changed: 1;
     unsigned int suspended: 1;
-} ichdev_t;
-
-typedef struct _snd_intel8x0 intel8x0_t;
-#define chip_t intel8x0_t
-
-struct _snd_intel8x0 {
+};
+
+struct intel8x0 {
     unsigned int device_type;
 
@@ -440 +437 @@
     int pcm_devs;
     snd_pcm_t *pcm[6];
-    ichdev_t ichd[6];
+    struct ichdev ichd[6];
 
     int multi4: 1,
@@ -504 +501 @@
  */
 
-static u8 igetbyte(intel8x0_t *chip, u32 offset)
+static u8 igetbyte(struct intel8x0 *chip, u32 offset)
 {
     if (chip->bm_mmio)
@@ -512 +509 @@
 }
 
-static u16 igetword(intel8x0_t *chip, u32 offset)
+static u16 igetword(struct intel8x0 *chip, u32 offset)
 {
     if (chip->bm_mmio)
@@ -520 +517 @@
 }
 
-static u32 igetdword(intel8x0_t *chip, u32 offset)
+static u32 igetdword(struct intel8x0 *chip, u32 offset)
 {
     if (chip->bm_mmio)
@@ -528 +525 @@
 }
 
-static void iputbyte(intel8x0_t *chip, u32 offset, u8 val)
+static void iputbyte(struct intel8x0 *chip, u32 offset, u8 val)
 {
     if (chip->bm_mmio)
@@ -536 +533 @@
 }
 
-static void iputword(intel8x0_t *chip, u32 offset, u16 val)
+static void iputword(struct intel8x0 *chip, u32 offset, u16 val)
 {
     if (chip->bm_mmio)
@@ -544 +541 @@
 }
 
-static void iputdword(intel8x0_t *chip, u32 offset, u32 val)
+static void iputdword(struct intel8x0 *chip, u32 offset, u32 val)
 {
     if (chip->bm_mmio)
@@ -556 +553 @@
  */
 
-static u16 iagetword(intel8x0_t *chip, u32 offset)
+static u16 iagetword(struct intel8x0 *chip, u32 offset)
 {
     if (chip->mmio)
@@ -564 +561 @@
 }
 
-static void iaputword(intel8x0_t *chip, u32 offset, u16 val)
+static void iaputword(struct intel8x0 *chip, u32 offset, u16 val)
 {
     if (chip->mmio)
@@ -581 +578 @@
 
 /* return the GLOB_STA bit for the corresponding codec */
-static unsigned int get_ich_codec_bit(intel8x0_t *chip, unsigned int codec)
+static unsigned int get_ich_codec_bit(struct intel8x0 *chip, unsigned int codec)
 {
     static unsigned int codec_bit[3] = {
@@ -593 +590 @@
 }
 
-static int snd_intel8x0_codec_semaphore(intel8x0_t *chip, unsigned int codec)
+static int snd_intel8x0_codec_semaphore(struct intel8x0 *chip, unsigned int codec)
 {
     int time;
@@ -633 +630 @@
                                      unsigned short val)
 {
-    intel8x0_t *chip = ac97->private_data;
+    struct intel8x0 *chip = ac97->private_data;
 
     if (snd_intel8x0_codec_semaphore(chip, ac97->num) < 0) {
@@ -645 +642 @@
                                               unsigned short reg)
 {
-    intel8x0_t *chip = ac97->private_data;
+    struct intel8x0 *chip = ac97->private_data;
     unsigned short res;
     unsigned int tmp;
@@ -666 +663 @@
 }
 
-static void snd_intel8x0_codec_read_test(intel8x0_t *chip, unsigned int codec)
+static void snd_intel8x0_codec_read_test(struct intel8x0 *chip, unsigned int codec)
 {
     unsigned int tmp;
@@ -682 +679 @@
  * access to AC97 for Ali5455
  */
-static int snd_intel8x0_ali_codec_ready(intel8x0_t *chip, int mask)
+static int snd_intel8x0_ali_codec_ready(struct intel8x0 *chip, int mask)
 {
     int count = 0;
@@ -695 +692 @@
 }
 
-static int snd_intel8x0_ali_codec_semaphore(intel8x0_t *chip)
+static int snd_intel8x0_ali_codec_semaphore(struct intel8x0 *chip)
 {
     int time = 100;
@@ -709 +706 @@
 static unsigned short snd_intel8x0_ali_codec_read(ac97_t *ac97, unsigned short reg)
 {
-    intel8x0_t *chip = ac97->private_data;
+    struct intel8x0 *chip = ac97->private_data;
     unsigned short data = 0xffff;
 
@@ -727 +724 @@
 static void snd_intel8x0_ali_codec_write(ac97_t *ac97, unsigned short reg, unsigned short val)
 {
-    intel8x0_t *chip = ac97->private_data;
+    struct intel8x0 *chip = ac97->private_data;
 
     if (snd_intel8x0_ali_codec_semaphore(chip))
@@ -742 +739 @@
  * DMA I/O
  */
-static void snd_intel8x0_setup_periods(intel8x0_t *chip, ichdev_t *ichdev)
+static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ichdev)
 {
     int idx;
@@ -789 +786 @@
  */
 
-static inline void snd_intel8x0_update(intel8x0_t *chip, ichdev_t *ichdev)
+static inline void snd_intel8x0_update(struct intel8x0 *chip, struct ichdev *ichdev)
 {
     unsigned long port = ichdev->reg_offset;
@@ -839 +836 @@
 static irqreturn_t snd_intel8x0_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
-    intel8x0_t *chip = dev_id;
-    ichdev_t *ichdev;
+    struct intel8x0 *chip = dev_id;
+    struct ichdev *ichdev;
     unsigned int status;
-#ifdef TARGET_OS2
-    int fOurIrq = FALSE;
-#endif
     unsigned int i;
 
@@ -868 +862 @@
         return IRQ_RETVAL(status);
     }
-#ifdef TARGET_OS2
-    fOurIrq = TRUE;
-#endif
 
     for (i = 0; i < chip->bdbars_count; i++) {
@@ -881 +872 @@
     iputdword(chip, chip->int_sta_reg, status & chip->int_sta_mask);
 
-#ifdef TARGET_OS2
-    if (fOurIrq) {
-        eoi_irq(irq);
-    }
-#endif //TARGET_OS2
-
     return IRQ_HANDLED;
 }
@@ -896 +881 @@
 static int snd_intel8x0_pcm_trigger(snd_pcm_substream_t *substream, int cmd)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
-    ichdev_t *ichdev = get_ichdev(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
+    struct ichdev *ichdev = get_ichdev(substream);
     unsigned char val = 0;
     unsigned long port = ichdev->reg_offset;
@@ -935 +920 @@
 static int snd_intel8x0_ali_trigger(snd_pcm_substream_t *substream, int cmd)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
-    ichdev_t *ichdev = get_ichdev(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
+    struct ichdev *ichdev = get_ichdev(substream);
     unsigned long port = ichdev->reg_offset;
     static int fiforeg[] = { ICHREG(ALI_FIFOCR1), ICHREG(ALI_FIFOCR2), ICHREG(ALI_FIFOCR3) };
@@ -986 +971 @@
                                   snd_pcm_hw_params_t * hw_params)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
-    ichdev_t *ichdev = get_ichdev(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
+    struct ichdev *ichdev = get_ichdev(substream);
     int dbl = params_rate(hw_params) > 48000;
     int err;
@@ -1012 +997 @@
 static int snd_intel8x0_hw_free(snd_pcm_substream_t * substream)
 {
-    ichdev_t *ichdev = get_ichdev(substream);
+    struct ichdev *ichdev = get_ichdev(substream);
 
     if (ichdev->pcm_open_flag) {
@@ -1021 +1006 @@
 }
 
-static void snd_intel8x0_setup_pcm_out(intel8x0_t *chip,
+static void snd_intel8x0_setup_pcm_out(struct intel8x0 *chip,
                                        snd_pcm_runtime_t *runtime)
 {
@@ -1077 +1062 @@
 static int snd_intel8x0_pcm_prepare(snd_pcm_substream_t * substream)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
     snd_pcm_runtime_t *runtime = substream->runtime;
-    ichdev_t *ichdev = get_ichdev(substream);
+    struct ichdev *ichdev = get_ichdev(substream);
 
     ichdev->physbuf = runtime->dma_addr;
@@ -1096 +1081 @@
 static snd_pcm_uframes_t snd_intel8x0_pcm_pointer(snd_pcm_substream_t * substream)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
-    ichdev_t *ichdev = get_ichdev(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
+    struct ichdev *ichdev = get_ichdev(substream);
     size_t ptr1, ptr;
     int civ, timeout = 100;
@@ -1165 +1150 @@
 };
 
-static int snd_intel8x0_pcm_open(snd_pcm_substream_t * substream, ichdev_t *ichdev)
-{
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
+static int snd_intel8x0_pcm_open(snd_pcm_substream_t * substream, struct ichdev *ichdev)
+{
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
     snd_pcm_runtime_t *runtime = substream->runtime;
     int err;
@@ -1190 +1175 @@
 static int snd_intel8x0_playback_open(snd_pcm_substream_t * substream)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
     snd_pcm_runtime_t *runtime = substream->runtime;
     int err;
@@ -1214 +1199 @@
 static int snd_intel8x0_playback_close(snd_pcm_substream_t * substream)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
 
     chip->ichd[ICHD_PCMOUT].substream = NULL;
@@ -1222 +1207 @@
 static int snd_intel8x0_capture_open(snd_pcm_substream_t * substream)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
 
     return snd_intel8x0_pcm_open(substream, &chip->ichd[ICHD_PCMIN]);
@@ -1229 +1214 @@
 static int snd_intel8x0_capture_close(snd_pcm_substream_t * substream)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
 
     chip->ichd[ICHD_PCMIN].substream = NULL;
@@ -1237 +1222 @@
 static int snd_intel8x0_mic_open(snd_pcm_substream_t * substream)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
 
     return snd_intel8x0_pcm_open(substream, &chip->ichd[ICHD_MIC]);
@@ -1244 +1229 @@
 static int snd_intel8x0_mic_close(snd_pcm_substream_t * substream)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
 
     chip->ichd[ICHD_MIC].substream = NULL;
@@ -1252 +1237 @@
 static int snd_intel8x0_mic2_open(snd_pcm_substream_t * substream)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
 
     return snd_intel8x0_pcm_open(substream, &chip->ichd[ICHD_MIC2]);
@@ -1259 +1244 @@
 static int snd_intel8x0_mic2_close(snd_pcm_substream_t * substream)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
 
     chip->ichd[ICHD_MIC2].substream = NULL;
@@ -1267 +1252 @@
 static int snd_intel8x0_capture2_open(snd_pcm_substream_t * substream)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
 
     return snd_intel8x0_pcm_open(substream, &chip->ichd[ICHD_PCM2IN]);
@@ -1274 +1259 @@
 static int snd_intel8x0_capture2_close(snd_pcm_substream_t * substream)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
 
     chip->ichd[ICHD_PCM2IN].substream = NULL;
@@ -1282 +1267 @@
 static int snd_intel8x0_spdif_open(snd_pcm_substream_t * substream)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
     int idx = chip->device_type == DEVICE_NFORCE ? NVD_SPBAR : ICHD_SPBAR;
 
@@ -1290 +1275 @@
 static int snd_intel8x0_spdif_close(snd_pcm_substream_t * substream)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
     int idx = chip->device_type == DEVICE_NFORCE ? NVD_SPBAR : ICHD_SPBAR;
 
@@ -1299 +1284 @@
 static int snd_intel8x0_ali_ac97spdifout_open(snd_pcm_substream_t * substream)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
     unsigned int val;
 
@@ -1314 +1299 @@
 static int snd_intel8x0_ali_ac97spdifout_close(snd_pcm_substream_t * substream)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
     unsigned int val;
 
@@ -1329 +1314 @@
 static int snd_intel8x0_ali_spdifin_open(snd_pcm_substream_t * substream)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
 
     return snd_intel8x0_pcm_open(substream, &chip->ichd[ALID_SPDIFIN]);
@@ -1336 +1321 @@
 static int snd_intel8x0_ali_spdifin_close(snd_pcm_substream_t * substream)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
 
     chip->ichd[ALID_SPDIFIN].substream = NULL;
@@ -1345 +1330 @@
 static int snd_intel8x0_ali_spdifout_open(snd_pcm_substream_t * substream)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
 
     return snd_intel8x0_pcm_open(substream, &chip->ichd[ALID_SPDIFOUT]);
@@ -1352 +1337 @@
 static int snd_intel8x0_ali_spdifout_close(snd_pcm_substream_t * substream)
 {
-    intel8x0_t *chip = snd_pcm_substream_chip(substream);
+    struct intel8x0 *chip = snd_pcm_substream_chip(substream);
 
     chip->ichd[ALID_SPDIFOUT].substream = NULL;
@@ -1503 +1488 @@
 };
 
-static int __devinit snd_intel8x0_pcm1(intel8x0_t *chip, int device, struct ich_pcm_table *rec)
+static int __devinit snd_intel8x0_pcm1(struct intel8x0 *chip, int device, struct ich_pcm_table *rec)
 {
         snd_pcm_t *pcm;
@@ -1631 +1616 @@
 
 
-static int __devinit snd_intel8x0_pcm(intel8x0_t *chip)
+static int __devinit snd_intel8x0_pcm(struct intel8x0 *chip)
 {
     int i, tblsize, device, err;
@@ -1681 +1666 @@
 static void snd_intel8x0_mixer_free_ac97_bus(ac97_bus_t *bus)
 {
-    intel8x0_t *chip = bus->private_data;
+    struct intel8x0 *chip = bus->private_data;
     chip->ac97_bus = NULL;
 }
@@ -1687 +1672 @@
 static void snd_intel8x0_mixer_free_ac97(ac97_t *ac97)
 {
-    intel8x0_t *chip = ac97->private_data;
+    struct intel8x0 *chip = ac97->private_data;
     chip->ac97[ac97->num] = NULL;
 }
@@ -1891 +1876 @@
         },
         {
-                .subvendor = 0x103c,
+            .subvendor = 0x103c,
+            .subdevice = 0x0938,
+            .name = "HP nc4200",
+            .type = AC97_TUNE_HP_MUTE_LED
+        },
+        {
+            .subvendor = 0x103c,
+            .subdevice = 0x099c,
+            .name = "HP nc6120",
+            .type = AC97_TUNE_HP_MUTE_LED
+        },
+        {
+            .subvendor = 0x103c,
+            .subdevice = 0x0944,
+            .name = "HP nc6220",
+            .type = AC97_TUNE_HP_MUTE_LED
+        },
+        {
+            .subvendor = 0x103c,
+            .subdevice = 0x0934,
+            .name = "HP nc8220",
+            .type = AC97_TUNE_HP_MUTE_LED
+        },
+        {
+            .subvendor = 0x103c,
                 .subdevice = 0x12f1,
                 .name = "HP xw8200",    /* AD1981B*/
@@ -1945 +1954 @@
         },
         {
+            .subvendor = 0x10cf,
+            .subdevice = 0x12f2,
+            .name = "Fujitsu-Siemens Celsius H320",
+            .type = AC97_TUNE_SWAP_HP
+        },
+        {
                 .subvendor = 0x10f1,
                 .subdevice = 0x2665,
@@ -2038 +2053 @@
 };
 
-static int __devinit snd_intel8x0_mixer(intel8x0_t *chip, int ac97_clock, char *quirk_override)
+static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, char *quirk_override)
 {
     ac97_bus_t *pbus;
@@ -2225 +2240 @@
  */
 
-static void do_ali_reset(intel8x0_t *chip)
+static void do_ali_reset(struct intel8x0 *chip)
 {
     iputdword(chip, ICHREG(ALI_SCR), ICH_ALI_SC_RESET);
@@ -2242 +2257 @@
     } while (0)
 
-static int snd_intel8x0_ich_chip_init(intel8x0_t *chip, int probing)
+static int snd_intel8x0_ich_chip_init(struct intel8x0 *chip, int probing)
 {
     unsigned long end_time;
@@ -2371 +2386 @@
 }
 
-static int snd_intel8x0_ali_chip_init(intel8x0_t *chip, int probing)
+static int snd_intel8x0_ali_chip_init(struct intel8x0 *chip, int probing)
 {
     u32 reg;
@@ -2406 +2421 @@
 }
 
-static int snd_intel8x0_chip_init(intel8x0_t *chip, int probing)
+static int snd_intel8x0_chip_init(struct intel8x0 *chip, int probing)
 {
     unsigned int i;
@@ -2432 +2447 @@
 }
 
-static int snd_intel8x0_free(intel8x0_t *chip)
+static int snd_intel8x0_free(struct intel8x0 *chip)
 {
     unsigned int i;
@@ -2471 +2486 @@
  * power management
  */
-static int intel8x0_suspend(snd_card_t *card, unsigned int state)
-{
-    intel8x0_t *chip = card->pm_private_data;
-#ifdef TARGET_OS2
+static int intel8x0_suspend(struct pci_dev *pci, pm_message_t state)
+{
+    struct snd_card *card = pci_get_drvdata(pci);
+    struct intel8x0 *chip = card->private_data;
     int i;
-#endif
-
-#ifdef TARGET_OS2
-    for (i = 0; i < 3; i++)
-        if (chip->ac97[i])
-            snd_ac97_suspend(chip->ac97[i]);
-#endif
+
+    snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+
     for (i = 0; i < chip->pcm_devs; i++)
         snd_pcm_suspend_all(chip->pcm[i]);
+
     for (i = 0; i < 3; i++)
-        if (chip->ac97[i])
-            snd_ac97_suspend(chip->ac97[i]);
+        snd_ac97_suspend(chip->ac97[i]);
     if (chip->device_type == DEVICE_INTEL_ICH4 ||
         chip->device_type == DEVICE_INTEL_ICH5)
@@ -2494 +2505 @@
     if (chip->irq >= 0)
         free_irq(chip->irq, (void *)chip);
-    pci_disable_device(chip->pci);
+    pci_disable_device(pci);
+    pci_save_state(pci);
     return 0;
 }
 
-static int intel8x0_resume(snd_card_t *card, unsigned int state)
-{
-    intel8x0_t *chip = card->pm_private_data;
+static int intel8x0_resume(struct pci_dev *pci)
+{
+    struct snd_card *card = pci_get_drvdata(pci);
+    struct intel8x0 *chip = card->private_data;
     int i;
 
-    pci_enable_device(chip->pci);
-    pci_set_master(chip->pci);
-    request_irq(chip->irq, snd_intel8x0_interrupt, SA_INTERRUPT|SA_SHIRQ, card->shortname, (void *)chip);
+    pci_restore_state(pci);
+    pci_enable_device(pci);
+    pci_set_master(pci);
+    request_irq(pci->irq, snd_intel8x0_interrupt, SA_INTERRUPT|SA_SHIRQ,
+                card->shortname, (void *)chip);
+    chip->irq = pci->irq;
     synchronize_irq(chip->irq);
     snd_intel8x0_chip_init(chip, 1);
@@ -2520 +2536 @@
 
     for (i = 0; i < 3; i++)
-        if (chip->ac97[i])
-            snd_ac97_resume(chip->ac97[i]);
+        snd_ac97_resume(chip->ac97[i]);
     /* resume status */
     for (i = 0; i < chip->bdbars_count; i++) {
-        ichdev_t *ichdev = &chip->ichd[i];
+        struct ichdev *ichdev = &chip->ichd[i];
         unsigned long port = ichdev->reg_offset;
         if (! ichdev->substream || ! ichdev->suspended)
@@ -2535 +2550 @@
         iputbyte(chip, port + ichdev->roff_sr, ICH_FIFOE | ICH_BCIS | ICH_LVBCI);
     }
+    snd_power_change_state(card, SNDRV_CTL_POWER_D0);
     return 0;
 }
@@ -2542 +2558 @@
 #define INTEL8X0_TESTBUF_SIZE   32768   /* enough large for one shot */
 
-static void __devinit intel8x0_measure_ac97_clock(intel8x0_t *chip)
+static void __devinit intel8x0_measure_ac97_clock(struct intel8x0 *chip)
 {
     snd_pcm_substream_t *subs;
-    ichdev_t *ichdev;
+    struct ichdev *ichdev;
     unsigned long port;
     unsigned long pos, t;
@@ -2621 +2637 @@
 }
 
+#ifdef CONFIG_PROC_FS
 static void snd_intel8x0_proc_read(snd_info_entry_t * entry,
                                    snd_info_buffer_t * buffer)
 {
-    intel8x0_t *chip = entry->private_data;
+    struct intel8x0 *chip = entry->private_data;
     unsigned int tmp;
 
@@ -2649 +2666 @@
 }
 
-static void __devinit snd_intel8x0_proc_init(intel8x0_t * chip)
+static void __devinit snd_intel8x0_proc_init(struct intel8x0 * chip)
 {
     snd_info_entry_t *entry;
@@ -2656 +2673 @@
         snd_info_set_text_ops(entry, chip, 1024, snd_intel8x0_proc_read);
 }
-
+#else
+#define snd_intel8x0_proc_init(x)
+#endif
 
 static int snd_intel8x0_dev_free(snd_device_t *device)
 {
-    intel8x0_t *chip = device->device_data;
+    struct intel8x0 *chip = device->device_data;
     return snd_intel8x0_free(chip);
 }
@@ -2673 +2692 @@
                                          struct pci_dev *pci,
                                          unsigned long device_type,
-                                         intel8x0_t ** r_intel8x0)
-{
-    intel8x0_t *chip;
+                                         struct intel8x0 ** r_intel8x0)
+{
+    struct intel8x0 *chip;
     int err;
     unsigned int i,pci_dword;
@@ -2682 +2701 @@
     unsigned char pci_byte;
 
-    ichdev_t *ichdev;
+    struct ichdev *ichdev;
 #ifdef TARGET_OS2
     static snd_device_ops_t ops = {
@@ -2913 +2932 @@
     }
 
-    snd_card_set_pm_callback(card, intel8x0_suspend, intel8x0_resume, chip);
-
     if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
         snd_intel8x0_free(chip);
@@ -2958 +2975 @@
     static int dev;
     snd_card_t *card;
-    intel8x0_t *chip;
+    struct intel8x0 *chip;
     int err;
     struct shortname_table *name;
@@ -3010 +3027 @@
         return err;
     }
+
+    card->private_data = chip;
+
     if ((err = snd_intel8x0_mixer(chip, ac97_clock[dev], ac97_quirk[dev])) < 0){
         snd_card_free(card);
@@ -3059 +3079 @@
         .id_table = snd_intel8x0_ids,
         .probe = snd_intel8x0_probe,
-        .remove = snd_intel8x0_remove,
-        SND_PCI_PM_CALLBACKS
+        .remove = snd_intel8x0_remove,
+#ifdef CONFIG_PM
+        .suspend = intel8x0_suspend,
+        .resume = intel8x0_resume,
+#endif
 };
 

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);
 

GPL/trunk/lib32/pci.c

@@ -894 +894 @@
 }
 
+struct pci_driver_mapping {
+    struct pci_dev *dev;
+    struct pci_driver *drv;
+    unsigned long dma_mask;
+    void *driver_data;
+    u32 saved_config[16];
+};
+
+#define PCI_MAX_MAPPINGS 64
+static struct pci_driver_mapping drvmap [PCI_MAX_MAPPINGS] = { { NULL, } , };
+
+
+static struct pci_driver_mapping *get_pci_driver_mapping(struct pci_dev *dev)
+{
+    int i;
+
+    for (i = 0; i < PCI_MAX_MAPPINGS; i++)
+        if (drvmap[i].dev == dev)
+            return &drvmap[i];
+    return NULL;
+}
+
+struct pci_driver *snd_pci_compat_get_pci_driver(struct pci_dev *dev)
+{
+    struct pci_driver_mapping *map = get_pci_driver_mapping(dev);
+    if (map)
+        return map->drv;
+    return NULL;
+}
+#if 0
+void * pci_get_drvdata (struct pci_dev *dev)
+{
+    struct pci_driver_mapping *map = get_pci_driver_mapping(dev);
+    if (map)
+        return map->driver_data;
+    return NULL;
+}
+
+
+void pci_set_drvdata (struct pci_dev *dev, void *driver_data)
+{
+    struct pci_driver_mapping *map = get_pci_driver_mapping(dev);
+    if (map)
+        map->driver_data = driver_data;
+}
+#endif