Changeset 607 for GPL/trunk/alsa-kernel/pci/ens1370.c

Timestamp:

Nov 17, 2018, 4:23:38 AM (7 years ago)

Author:

David Azarewicz

Message:

Removed broken/unusable forcecard option.
Fixed Ensoniq driver selection.

File:

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

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

@@ -23 +23 @@
  * for ens1371 only ( FIXME )
  * derived from cs4281.c, atiixp.c and via82xx.c
- * using http://www.alsa-project.org/~tiwai/writing-an-alsa-driver/ 
+ * using http://www.alsa-project.org/~tiwai/writing-an-alsa-driver/
  * by Kurt J. Bosch
  */
@@ -468 +468 @@
         {5512, 11025, 22050, 44100};
 static struct snd_pcm_hw_constraint_list snd_es1370_hw_constraints_rates = {
-        .count = 4, 
+        .count = 4,
         .list = snd_es1370_fixed_rates,
         .mask = 0,
@@ -474 +474 @@
 static struct snd_ratnum es1370_clock = {
         .num = ES_1370_SRCLOCK,
-        .den_min = 29, 
+        .den_min = 29,
         .den_max = 353,
         .den_step = 1,
@@ -495 +495 @@
 static struct snd_ratnum es1371_adc_clock = {
         .num = 48000 << 15,
-        .den_min = 32768, 
+        .den_min = 32768,
         .den_max = 393216,
         .den_step = 1,
@@ -1055 +1055 @@
 #else
                                 (SNDRV_PCM_RATE_KNOT |  /* 5512Hz rate */
-                                 SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_22050 | 
+                                 SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_22050 |
                                  SNDRV_PCM_RATE_44100),
 #endif
@@ -1074 +1074 @@
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
                                  SNDRV_PCM_INFO_BLOCK_TRANSFER |
-                                 SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE | 
+                                 SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE |
                                  SNDRV_PCM_INFO_SYNC_START),
         .formats =              SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
@@ -1866 +1866 @@
  */
 
-static void snd_ensoniq_proc_read(struct snd_info_entry *entry, 
+static void snd_ensoniq_proc_read(struct snd_info_entry *entry,
                                   struct snd_info_buffer *buffer)
 {
@@ -2489 +2489 @@
 };
         
-static int __init alsa_card_ens137x_init(void)
+#ifdef CHIP1370
+static int __init alsa_card_ens1370_init(void)
 {
         return pci_register_driver(&driver);
 }
 
-static void __exit alsa_card_ens137x_exit(void)
+static void __exit alsa_card_ens1370_exit(void)
 {
         pci_unregister_driver(&driver);
 }
-
-module_init(alsa_card_ens137x_init)
-module_exit(alsa_card_ens137x_exit)
+module_init(alsa_card_ens1370_init)
+module_exit(alsa_card_ens1370_exit)
+#endif
+
+#ifdef CHIP1371
+static int __init alsa_card_ens1371_init(void)
+{
+        return pci_register_driver(&driver);
+}
+
+static void __exit alsa_card_ens1371_exit(void)
+{
+        pci_unregister_driver(&driver);
+}
+module_init(alsa_card_ens1371_init)
+module_exit(alsa_card_ens1371_exit)
+#endif
+
+