Changeset 88 for GPL/trunk/alsa-kernel/pci/intel8x0.c

Timestamp:

Jan 25, 2007, 7:00:54 PM (19 years ago)

Author:

vladest

Message:

Added AD HDA updates
Fix TRAP in Intel chips

File:

• GPL/trunk/alsa-kernel/pci/intel8x0.c (modified) (8 diffs)

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

@@ -2090 +2090 @@
     unsigned int glob_sta = 0;
     ac97_bus_ops_t *ops;
-    static ac97_bus_ops_t standard_bus_ops = {
-        0,snd_intel8x0_codec_write,
-        snd_intel8x0_codec_read,0,0
+    static struct snd_ac97_bus_ops standard_bus_ops = {
+        .write = snd_intel8x0_codec_write,
+        .read = snd_intel8x0_codec_read,
     };
-    static ac97_bus_ops_t ali_bus_ops = {
-        0,snd_intel8x0_ali_codec_write,
-        snd_intel8x0_ali_codec_read,0,0
+    static struct snd_ac97_bus_ops ali_bus_ops = {
+        .write = snd_intel8x0_ali_codec_write,
+        .read = snd_intel8x0_ali_codec_read,
     };
+
     chip->spdif_idx = -1; /* use PCMOUT (or disabled) */
     switch (chip->device_type) {
@@ -3008 +3009 @@
         return err;
     }
-
+#ifdef DEBUG
+    dprintf(("snd_intel8x0_create. cp1"));
+#endif
     if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
         snd_intel8x0_free(chip);
@@ -3015 +3018 @@
 
     *r_intel8x0 = chip;
+#ifdef DEBUG
+    dprintf(("snd_intel8x0_create. cp2"));
+#endif
     return 0;
 }
@@ -3112 +3118 @@
         return err;
     }
+#ifdef DEBUG
+    dprintf(("snd_intel8x0_mixer passed"));
+#endif
     if ((err = snd_intel8x0_pcm(chip)) < 0) {
         snd_card_free(card);
@@ -3118 +3127 @@
     }
 
+#ifdef DEBUG
+    dprintf(("snd_intel8x0_pcm passed"));
+#endif
     if (mpu_port[dev] == 0x300 || mpu_port[dev] == 0x330) {
         if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_INTEL8X0,
@@ -3129 +3141 @@
 
     snd_intel8x0_proc_init(chip);
+#ifdef DEBUG
+    dprintf(("snd_intel8x0_proc_init passed"));
+#endif
 
     sprintf(card->longname, "%s at 0x%lx, irq %i",
@@ -3135 +3150 @@
     if (! ac97_clock[dev])
         intel8x0_measure_ac97_clock(chip);
+#ifdef DEBUG
+    dprintf(("intel8x0_measure_ac97_clock passed"));
+#endif
 
     if ((err = snd_card_register(card)) < 0) {
@@ -3141 +3159 @@
         return err;
     }
+#ifdef DEBUG
+    dprintf(("snd_card_register passed"));
+#endif
     pci_set_drvdata(pci, card);
     dev++;