Changeset 612 for GPL/branches/uniaud32-linux-3.2.102/alsa-kernel/pci/ens1370.c

Timestamp:

May 16, 2020, 10:05:07 AM (5 years ago)

Author:

Paul Smedley

Message:

Commit 3..102 changes from trunk

File:

• GPL/branches/uniaud32-linux-3.2.102/alsa-kernel/pci/ens1370.c (modified) (16 diffs)

GPL/branches/uniaud32-linux-3.2.102/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
  */
+
+#ifdef TARGET_OS2
+#define KBUILD_MODNAME "ens1370"
+#endif
 
 #include <asm/io.h>
@@ -34 +38 @@
 #include <linux/slab.h>
 #include <linux/gameport.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/mutex.h>
 
@@ -230 +234 @@
 #define   ES_1371_CODEC_RDY        (1<<31)      /* codec ready */
 #define   ES_1371_CODEC_WIP        (1<<30)      /* codec register access in progress */
+#define   EV_1938_CODEC_MAGIC      (1<<26)
 #define   ES_1371_CODEC_PIRD       (1<<23)      /* codec read/write select register */
 #define   ES_1371_CODEC_WRITE(a,d) ((((a)&0x7f)<<16)|(((d)&0xffff)<<0))
@@ -468 +473 @@
         {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 +479 @@
 static struct snd_ratnum es1370_clock = {
         .num = ES_1370_SRCLOCK,
-        .den_min = 29,
+        .den_min = 29, 
         .den_max = 353,
         .den_step = 1,
@@ -495 +500 @@
 static struct snd_ratnum es1371_adc_clock = {
         .num = 48000 << 15,
-        .den_min = 32768,
+        .den_min = 32768, 
         .den_max = 393216,
         .den_step = 1,
@@ -604 +609 @@
 #ifdef CHIP1371
 
+static inline bool is_ev1938(struct ensoniq *ensoniq)
+{
+        return ensoniq->pci->device == 0x8938;
+}
+
 static void snd_es1371_codec_write(struct snd_ac97 *ac97,
                                    unsigned short reg, unsigned short val)
 {
         struct ensoniq *ensoniq = ac97->private_data;
-        unsigned int t, x;
-
+        unsigned int t, x, flag;
+
+        flag = is_ev1938(ensoniq) ? EV_1938_CODEC_MAGIC : 0;
         mutex_lock(&ensoniq->src_mutex);
         for (t = 0; t < POLL_COUNT; t++) {
@@ -631 +642 @@
                                         break;
                         }
-                        outl(ES_1371_CODEC_WRITE(reg, val), ES_REG(ensoniq, 1371_CODEC));
+                        outl(ES_1371_CODEC_WRITE(reg, val) | flag,
+                             ES_REG(ensoniq, 1371_CODEC));
                         /* restore SRC reg */
                         snd_es1371_wait_src_ready(ensoniq);
@@ -648 +660 @@
 {
         struct ensoniq *ensoniq = ac97->private_data;
-        unsigned int t, x, fail = 0;
-
+        unsigned int t, x, flag, fail = 0;
+
+        flag = is_ev1938(ensoniq) ? EV_1938_CODEC_MAGIC : 0;
       __again:
         mutex_lock(&ensoniq->src_mutex);
@@ -672 +685 @@
                                         break;
                         }
-                        outl(ES_1371_CODEC_READS(reg), ES_REG(ensoniq, 1371_CODEC));
+                        outl(ES_1371_CODEC_READS(reg) | flag,
+                             ES_REG(ensoniq, 1371_CODEC));
                         /* restore SRC reg */
                         snd_es1371_wait_src_ready(ensoniq);
@@ -684 +698 @@
                         for (t = 0; t < POLL_COUNT; t++) {
                                 if ((x = inl(ES_REG(ensoniq, 1371_CODEC))) & ES_1371_CODEC_RDY) {
+                                        if (is_ev1938(ensoniq)) {
+                                                for (t = 0; t < 100; t++)
+                                                        inl(ES_REG(ensoniq, CONTROL));
+                                                x = inl(ES_REG(ensoniq, 1371_CODEC));
+                                        }
                                         mutex_unlock(&ensoniq->src_mutex);
                                         return ES_1371_CODEC_READ(x);
@@ -1055 +1074 @@
 #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 +1093 @@
         .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 +1885 @@
  */
 
-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)
 {
@@ -2106 +2125 @@
         ensoniq->port = pci_resource_start(pci, 0);
         if (request_irq(pci->irq, snd_audiopci_interrupt, IRQF_SHARED,
-                        "Ensoniq AudioPCI", ensoniq)) {
+                        KBUILD_MODNAME, ensoniq)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_ensoniq_free(ensoniq);
@@ -2479 +2498 @@
 
 static struct pci_driver driver = {
-        .name = DRIVER_NAME,
+        .name = KBUILD_MODNAME,
         .id_table = snd_audiopci_ids,
         .probe = snd_audiopci_probe,