Changeset 612 for GPL/branches/uniaud32-linux-3.2.102/alsa-kernel/pci/cmipci.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/cmipci.c (modified) (17 diffs)

GPL/branches/uniaud32-linux-3.2.102/alsa-kernel/pci/cmipci.c

@@ -17 +17 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
-
+ 
 /* Does not work. Warning may block system in capture mode */
 /* #define USE_VAR48KRATE */
+
+#ifdef TARGET_OS2
+#define KBUILD_MODNAME "cmipci"
+#endif
 
 #include <asm/io.h>
@@ -28 +32 @@
 #include <linux/slab.h>
 #include <linux/gameport.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/mutex.h>
 #include <sound/core.h>
@@ -79 +83 @@
 MODULE_PARM_DESC(fm_port, "FM port.");
 module_param_array(soft_ac3, bool, NULL, 0444);
-MODULE_PARM_DESC(soft_ac3, "Sofware-conversion of raw SPDIF packets (model 033 only).");
+MODULE_PARM_DESC(soft_ac3, "Software-conversion of raw SPDIF packets (model 033 only).");
 #ifdef SUPPORT_JOYSTICK
 module_param_array(joystick_port, int, NULL, 0444);
@@ -662 +666 @@
 
 /*
- * Program pll register bits, I assume that the 8 registers 0xf8 upto 0xff
- * are mapped onto the 8 ADC/DAC sampling frequency which can be choosen
+ * Program pll register bits, I assume that the 8 registers 0xf8 up to 0xff
+ * are mapped onto the 8 ADC/DAC sampling frequency which can be chosen
  * at the register CM_REG_FUNCTRL1 (0x04).
  * Problem: other ways are also possible (any information about that?)
@@ -672 +676 @@
         /*
          * Guess that this programs at reg. 0x04 the pos 15:13/12:10
-         * for DSFC/ASFC (000 upto 111).
+         * for DSFC/ASFC (000 up to 111).
          */
 
@@ -957 +961 @@
                 if (rem < rec->dma_size)
                         goto ok;
-        }
+        } 
         printk(KERN_ERR "cmipci: invalid PCM pointer: %#x\n", rem);
         return SNDRV_PCM_POS_XRUN;
@@ -1308 +1312 @@
                     substream->runtime->format == SNDRV_PCM_FORMAT_S16_LE &&
                     substream->runtime->channels == 2);
-        if (do_spdif && cm->can_ac3_hw)
+        if (do_spdif && cm->can_ac3_hw) 
                 do_ac3 = cm->dig_pcm_status & IEC958_AES0_NONAUDIO;
         if ((err = setup_spdif_playback(cm, substream, do_spdif, do_ac3)) < 0)
@@ -1321 +1325 @@
         int err, do_ac3;
 
-        if (cm->can_ac3_hw)
+        if (cm->can_ac3_hw) 
                 do_ac3 = cm->dig_pcm_status & IEC958_AES0_NONAUDIO;
         else
@@ -2044 +2048 @@
         return 0;
 }
-
+ 
 static int snd_cmipci_get_volume(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol)
@@ -2126 +2130 @@
         return 0;
 }
-
+ 
 static int snd_cmipci_get_input_sw(struct snd_kcontrol *kcontrol,
                                    struct snd_ctl_elem_value *ucontrol)
@@ -2394 +2398 @@
         else
                 val = snd_cmipci_read(cm, args->reg);
-        change = (val & args->mask) != (ucontrol->value.integer.value[0] ?
+        change = (val & args->mask) != (ucontrol->value.integer.value[0] ? 
                         args->mask_on : (args->mask & ~args->mask_on));
         if (change) {
@@ -2590 +2594 @@
         /* same bit as spdi_phase */
         spin_lock_irq(&cm->reg_lock);
-        ucontrol->value.enumerated.item[0] =
+        ucontrol->value.enumerated.item[0] = 
                 (snd_cmipci_read_b(cm, CM_REG_MISC) & CM_SPDIF_INVERSE) ? 1 : 0;
         spin_unlock_irq(&cm->reg_lock);
@@ -2784 +2788 @@
 
 #ifdef CONFIG_PROC_FS
-static void snd_cmipci_proc_read(struct snd_info_entry *entry,
+static void snd_cmipci_proc_read(struct snd_info_entry *entry, 
                                  struct snd_info_buffer *buffer)
 {
@@ -3070 +3074 @@
 
         if (request_irq(pci->irq, snd_cmipci_interrupt,
-                        IRQF_SHARED, card->driver, cm)) {
+                        IRQF_SHARED, KBUILD_MODNAME, cm)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_cmipci_free(cm);
@@ -3133 +3137 @@
         case PCI_DEVICE_ID_CMEDIA_CM8738:
         case PCI_DEVICE_ID_CMEDIA_CM8738B:
-                if (!pci_dev_present(intel_82437vx))
+                if (!pci_dev_present(intel_82437vx)) 
                         snd_cmipci_set_bit(cm, CM_REG_MISC_CTRL, CM_TXVX);
                 break;
@@ -3245 +3249 @@
                                                iomidi,
                                                (integrated_midi ?
-                                                MPU401_INFO_INTEGRATED : 0),
-                                               cm->irq, 0, &cm->rmidi)) < 0) {
+                                                MPU401_INFO_INTEGRATED : 0) |
+                                               MPU401_INFO_IRQ_HOOK,
+                                               -1, &cm->rmidi)) < 0) {
                         printk(KERN_ERR "cmipci: no UART401 device at 0x%lx\n", iomidi);
                 }
@@ -3415 +3420 @@
 
 static struct pci_driver driver = {
-        .name = "C-Media PCI",
+        .name = KBUILD_MODNAME,
         .id_table = snd_cmipci_ids,
         .probe = snd_cmipci_probe,