Changeset 358 for GPL/branches/uniaud32-2.0/alsa-kernel/pci/maestro3.c

Timestamp:

Jul 16, 2008, 11:53:49 AM (17 years ago)

Author:

Paul Smedley

Message:

Update uniaud32-2.0 branch to ALSA 1.0.17

File:

• GPL/branches/uniaud32-2.0/alsa-kernel/pci/maestro3.c (modified) (11 diffs)

GPL/branches/uniaud32-2.0/alsa-kernel/pci/maestro3.c

@@ -2073 +2073 @@
         struct snd_ac97_bus *pbus;
         struct snd_ac97_template ac97;
-        struct snd_ctl_elem_id id;
+        struct snd_ctl_elem_id elem_id;
         int err;
         static struct snd_ac97_bus_ops ops = {
@@ -2093 +2093 @@
         snd_ac97_write(chip->ac97, AC97_PCM, 0);
 
-        memset(&id, 0, sizeof(id));
-        id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-        strcpy(id.name, "Master Playback Switch");
-        chip->master_switch = snd_ctl_find_id(chip->card, &id);
-        memset(&id, 0, sizeof(id));
-        id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-        strcpy(id.name, "Master Playback Volume");
-        chip->master_volume = snd_ctl_find_id(chip->card, &id);
+        memset(&elem_id, 0, sizeof(elem_id));
+        elem_id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
+        strcpy(elem_id.name, "Master Playback Switch");
+        chip->master_switch = snd_ctl_find_id(chip->card, &elem_id);
+        memset(&elem_id, 0, sizeof(elem_id));
+        elem_id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
+        strcpy(elem_id.name, "Master Playback Volume");
+        chip->master_volume = snd_ctl_find_id(chip->card, &elem_id);
 
         return 0;
@@ -2432 +2432 @@
 }
 
+static void
+snd_m3_hv_init(struct snd_m3 *chip)
+{
+        unsigned long io = chip->iobase;
+        u16 val = GPI_VOL_DOWN | GPI_VOL_UP;
+
+        if (!chip->is_omnibook)
+                return;
+
+        /*
+         * Volume buttons on some HP OmniBook laptops
+         * require some GPIO magic to work correctly.
+         */
+        outw(0xffff, io + GPIO_MASK);
+        outw(0x0000, io + GPIO_DATA);
+
+        outw(~val, io + GPIO_MASK);
+        outw(inw(io + GPIO_DIRECTION) & ~val, io + GPIO_DIRECTION);
+        outw(val, io + GPIO_MASK);
+
+        outw(0xffff, io + GPIO_MASK);
+}
+
 static int
 snd_m3_chip_init(struct snd_m3 *chip)
@@ -2447 +2470 @@
         pci_write_config_word(pcidev, PCI_LEGACY_AUDIO_CTRL, w);
 
-        if (chip->is_omnibook) {
-                /*
-                 * Volume buttons on some HP OmniBook laptops don't work
-                 * correctly. This makes them work for the most part.
-                 *
-                 * Volume up and down buttons on the laptop side work.
-                 * Fn+cursor_up (volme up) works.
-                 * Fn+cursor_down (volume down) doesn't work.
-                 * Fn+F7 (mute) works acts as volume up.
-                 */
-                outw(~(GPI_VOL_DOWN|GPI_VOL_UP), io + GPIO_MASK);
-                outw(inw(io + GPIO_DIRECTION) & ~(GPI_VOL_DOWN|GPI_VOL_UP), io + GPIO_DIRECTION);
-                outw((GPI_VOL_DOWN|GPI_VOL_UP), io + GPIO_DATA);
-                outw(0xffff, io + GPIO_MASK);
-        }
         pci_read_config_dword(pcidev, PCI_ALLEGRO_CONFIG, &n);
         n &= ~(HV_CTRL_ENABLE | REDUCED_DEBOUNCE | HV_BUTTON_FROM_GD);
@@ -2547 +2555 @@
 #endif
 
-        if (chip->irq >= 0) {
-                synchronize_irq(chip->irq);
+        if (chip->irq >= 0)
                 free_irq(chip->irq, chip);
-        }
 
         if (chip->iobase)
@@ -2574 +2580 @@
         struct snd_card *card = pci_get_drvdata(pci);
         struct snd_m3 *chip = card->private_data;
-        int i, index;
+        int i, dsp_index;
 
         if (chip->suspend_mem == NULL)
@@ -2588 +2594 @@
 
         /* save dsp image */
-        index = 0;
+        dsp_index = 0;
         for (i = REV_B_CODE_MEMORY_BEGIN; i <= REV_B_CODE_MEMORY_END; i++)
-                chip->suspend_mem[index++] = 
+                chip->suspend_mem[dsp_index++] =
                         snd_m3_assp_read(chip, MEMTYPE_INTERNAL_CODE, i);
         for (i = REV_B_DATA_MEMORY_BEGIN ; i <= REV_B_DATA_MEMORY_END; i++)
-                chip->suspend_mem[index++] = 
+                chip->suspend_mem[dsp_index++] =
                         snd_m3_assp_read(chip, MEMTYPE_INTERNAL_DATA, i);
 
@@ -2606 +2612 @@
         struct snd_card *card = pci_get_drvdata(pci);
         struct snd_m3 *chip = card->private_data;
-        int i, index;
+        int i, dsp_index;
 
         if (chip->suspend_mem == NULL)
@@ -2630 +2636 @@
 
         /* restore dsp image */
-        index = 0;
+        dsp_index = 0;
         for (i = REV_B_CODE_MEMORY_BEGIN; i <= REV_B_CODE_MEMORY_END; i++)
                 snd_m3_assp_write(chip, MEMTYPE_INTERNAL_CODE, i, 
-                                  chip->suspend_mem[index++]);
+                                  chip->suspend_mem[dsp_index++]);
         for (i = REV_B_DATA_MEMORY_BEGIN ; i <= REV_B_DATA_MEMORY_END; i++)
                 snd_m3_assp_write(chip, MEMTYPE_INTERNAL_DATA, i, 
-                                  chip->suspend_mem[index++]);
+                                  chip->suspend_mem[dsp_index++]);
 
         /* tell the dma engine to restart itself */
@@ -2648 +2654 @@
         snd_m3_enable_ints(chip);
         snd_m3_amp_enable(chip, 1);
+
+        snd_m3_hv_init(chip);
 
         snd_power_change_state(card, SNDRV_CTL_POWER_D0);
@@ -2792 +2800 @@
         snd_m3_amp_enable(chip, 1);
 
+        snd_m3_hv_init(chip);
+
         tasklet_init(&chip->hwvol_tq, snd_m3_update_hw_volume, (unsigned long)chip);