Changeset 695 for GPL/trunk/alsa-kernel/pci/trident

Timestamp:

Aug 21, 2021, 3:35:34 AM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/trident/trident.c (modified) (1 diff)
• alsa-kernel/pci/trident/trident_main.c (modified) (3 diffs)

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

@@ -22 +22 @@
 MODULE_DESCRIPTION("Trident 4D-WaveDX/NX & SiS SI7018");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{Trident,4DWave DX},"
-                "{Trident,4DWave NX},"
-                "{SiS,SI7018 PCI Audio},"
-                "{Best Union,Miss Melody 4DWave PCI},"
-                "{HIS,4DWave PCI},"
-                "{Warpspeed,ONSpeed 4DWave PCI},"
-                "{Aztech Systems,PCI 64-Q3D},"
-                "{Addonics,SV 750},"
-                "{CHIC,True Sound 4Dwave},"
-                "{Shark,Predator4D-PCI},"
-                "{Jaton,SonicWave 4D},"
-                "{Hoontech,SoundTrack Digital 4DWave NX}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */

GPL/trunk/alsa-kernel/pci/trident/trident_main.c

@@ -683 +683 @@
                 delta = 0x1000;
         else
+#ifndef TARGET_OS2
+                delta = DIV_ROUND_CLOSEST(rate << 12, 48000) & 0x0000ffff;
+#else
                 delta = (((rate << 12) + 24000) / 48000) & 0x0000ffff;
+#endif
         return delta;
 }
@@ -1039 +1043 @@
 
         // Set channel sample rate, 4.12 format
+#ifndef TARGET_OS2
+        val = DIV_ROUND_CLOSEST(48000U << 12, runtime->rate);
+#else
         val = (((unsigned int) 48000L << 12) + (runtime->rate/2)) / runtime->rate;
+#endif
         outw(val, TRID_REG(trident, T4D_SBDELTA_DELTA_R));
 
@@ -3502 +3510 @@
                 return err;
         /* check, if we can restrict PCI DMA transfers to 30 bits */
-        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(30)) < 0 ||
-            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(30)) < 0) {
+        if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(30))) {
                 dev_err(card->dev,
                         "architecture does not support 30bit PCI busmaster DMA\n");