Changeset 224 for GPL/branches/alsa-resync1/alsa-kernel/pci/sonicvibes.c

Timestamp:

Jul 26, 2007, 7:21:09 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to Alsa 0.9.1

File:

• GPL/branches/alsa-resync1/alsa-kernel/pci/sonicvibes.c (modified) (10 diffs)

GPL/branches/alsa-resync1/alsa-kernel/pci/sonicvibes.c

@@ -24 +24 @@
 
 #include <sound/driver.h>
-#include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
+#include <linux/gameport.h>
+
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -37 +39 @@
 #define SNDRV_GET_ID
 #include <sound/initval.h>
-#ifndef LINUX_2_2
-#include <linux/gameport.h>
-#endif
+
+#include <asm/io.h>
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
@@ -252 +253 @@
 
         spinlock_t reg_lock;
-        snd_info_entry_t *proc_entry;
 
         unsigned int p_dma_size;
@@ -260 +260 @@
         snd_kcontrol_t *master_volume;
 
-#ifndef LINUX_2_2
+#if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
         struct gameport gameport;
 #endif
@@ -272 +272 @@
 MODULE_DEVICE_TABLE(pci, snd_sonic_ids);
 
-#ifdef TARGET_OS2
 static ratden_t sonicvibes_adc_clock = {
-        4000 * 65536,
-        48000UL * 65536,
-        1,
-        65536,
+        .num_min = 4000 * 65536,
+        .num_max = 48000UL * 65536,
+        .num_step = 1,
+        .den = 65536,
 };
 static snd_pcm_hw_constraint_ratdens_t snd_sonicvibes_hw_constraints_adc_clock = {
-        1,
-        &sonicvibes_adc_clock,
+        .nrats = 1,
+        .rats = &sonicvibes_adc_clock,
 };
-#else
-static ratden_t sonicvibes_adc_clock = {
-        num_min: 4000 * 65536,
-        num_max: 48000UL * 65536,
-        num_step: 1,
-        den: 65536,
-};
-static snd_pcm_hw_constraint_ratdens_t snd_sonicvibes_hw_constraints_adc_clock = {
-        nrats: 1,
-        rats: &sonicvibes_adc_clock,
-};
-#endif
 
 /*
@@ -1137 +1124 @@
         snd_card_t *card;
         snd_kcontrol_t *kctl;
-        int idx, err;
+        unsigned int idx;
+        int err;
 
         snd_assert(sonic != NULL && sonic->card != NULL, return -EINVAL);
@@ -1192 +1180 @@
         snd_info_entry_t *entry;
 
-        if ((entry = snd_info_create_card_entry(sonic->card, "sonicvibes", sonic->card->proc_root)) != NULL) {
-                entry->content = SNDRV_INFO_CONTENT_TEXT;
-                entry->private_data = sonic;
-                entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
-                entry->c.text.read_size = 256;
-                entry->c.text.read = snd_sonicvibes_proc_read;
-                if (snd_info_register(entry) < 0) {
-                        snd_info_free_entry(entry);
-                        entry = NULL;
-                }
-        }
-        sonic->proc_entry = entry;
-}
-
-static void snd_sonicvibes_proc_done(sonicvibes_t * sonic)
-{
-        if (sonic->proc_entry) {
-                snd_info_unregister(sonic->proc_entry);
-                sonic->proc_entry = NULL;
-        }
+        if (! snd_card_proc_new(sonic->card, "sonicvibes", &entry))
+                snd_info_set_text_ops(entry, sonic, snd_sonicvibes_proc_read);
 }
 
@@ -1223 +1193 @@
 static int snd_sonicvibes_free(sonicvibes_t *sonic)
 {
-#ifndef LINUX_2_2
+#if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
         if (sonic->gameport.io)
                 gameport_unregister_port(&sonic->gameport);
 #endif
-        snd_sonicvibes_proc_done(sonic);
         pci_write_config_dword(sonic->pci, 0x40, sonic->dmaa_port);
         pci_write_config_dword(sonic->pci, 0x48, sonic->dmac_port);
@@ -1455 +1424 @@
         snd_card_t *card = sonic->card;
         snd_rawmidi_str_t *dir;
-        int idx, err;
+        unsigned int idx;
+        int err;
 
         mpu->private_data = sonic;
@@ -1527 +1497 @@
                 return err;
         }
-#ifndef LINUX_2_2
+#if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
         sonic->gameport.io = sonic->game_port;
         gameport_register_port(&sonic->gameport);