Changeset 34 for GPL/trunk/alsa-kernel/pci/cs4281.c

Timestamp:

Dec 11, 2005, 5:57:39 PM (20 years ago)

Author:

vladest

Message:

Latest update from ALSA. some intial > 15 interrupts support

File:

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

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

@@ -1194 +1194 @@
         size = (long)CS4281_BA0_SIZE - pos;
     if (size > 0) {
-        if (copy_to_user_fromio(buf, chip->ba0 + pos, size))
+        if (copy_to_user_fromio(buf, (char*)chip->ba0 + pos, size))
             return -EFAULT;
     }
@@ -1211 +1211 @@
         size = (long)CS4281_BA1_SIZE - pos;
     if (size > 0) {
-        if (copy_to_user_fromio(buf, chip->ba1 + pos, size))
+        if (copy_to_user_fromio(buf, (char*)chip->ba1 + pos, size))
             return -EFAULT;
     }
@@ -1217 +1217 @@
 }
 
-#ifdef TARGET_OS2
 static struct snd_info_entry_ops snd_cs4281_proc_ops_BA0 = {
-    0, 0,
-    snd_cs4281_BA0_read,
-    0, 0, 0, 0, 0
+        .read = snd_cs4281_BA0_read,
 };
 
 static struct snd_info_entry_ops snd_cs4281_proc_ops_BA1 = {
-    0, 0,
-    snd_cs4281_BA1_read,
-    0, 0, 0, 0, 0
+        .read = snd_cs4281_BA1_read,
 };
-#else
-static struct snd_info_entry_ops snd_cs4281_proc_ops_BA0 = {
-read: snd_cs4281_BA0_read,
-};
-
-static struct snd_info_entry_ops snd_cs4281_proc_ops_BA1 = {
-read: snd_cs4281_BA1_read,
-};
-
-#endif
 
 static void __devinit snd_cs4281_proc_init(cs4281_t * chip)
@@ -1846 +1831 @@
 }
 
-#ifdef TARGET_OS2
-static snd_rawmidi_ops_t snd_cs4281_midi_output =
-{
-    /*  open:           */      snd_cs4281_midi_output_open,
-    /*  close:          */      snd_cs4281_midi_output_close,
-    /*  trigger:        */      snd_cs4281_midi_output_trigger,
+static struct snd_rawmidi_ops snd_cs4281_midi_output =
+{
+    .open =             snd_cs4281_midi_output_open,
+    .close =    snd_cs4281_midi_output_close,
+    .trigger =  snd_cs4281_midi_output_trigger,
 };
 
-static snd_rawmidi_ops_t snd_cs4281_midi_input =
-{
-    /*  open:           */      snd_cs4281_midi_input_open,
-    /*  close:          */      snd_cs4281_midi_input_close,
-    /*  trigger:        */      snd_cs4281_midi_input_trigger,
+static struct snd_rawmidi_ops snd_cs4281_midi_input =
+{
+    .open =     snd_cs4281_midi_input_open,
+    .close =    snd_cs4281_midi_input_close,
+    .trigger =  snd_cs4281_midi_input_trigger,
 };
-#else
-static snd_rawmidi_ops_t snd_cs4281_midi_output =
-{
-open:           snd_cs4281_midi_output_open,
-    close:          snd_cs4281_midi_output_close,
-    trigger:        snd_cs4281_midi_output_trigger,
-};
-
-static snd_rawmidi_ops_t snd_cs4281_midi_input =
-{
-open:           snd_cs4281_midi_input_open,
-    close:          snd_cs4281_midi_input_close,
-    trigger:        snd_cs4281_midi_input_trigger,
-};
-
-#endif
 
 static int __devinit snd_cs4281_midi(cs4281_t * chip, int device, snd_rawmidi_t **rrawmidi)
@@ -1906 +1874 @@
     unsigned int status, dma, val;
     cs4281_dma_t *cdma;
-#ifdef TARGET_OS2
-    int fOurIrq = FALSE;
-#endif
 
     if (chip == NULL)
@@ -1919 +1884 @@
 
     if (status & (BA0_HISR_DMA(0)|BA0_HISR_DMA(1)|BA0_HISR_DMA(2)|BA0_HISR_DMA(3))) {
-#ifdef TARGET_OS2
-        fOurIrq = TRUE;
-#endif
         for (dma = 0; dma < 4; dma++)
             if (status & BA0_HISR_DMA(dma)) {
@@ -1951 +1913 @@
         unsigned char c;
 
-#ifdef TARGET_OS2
-        fOurIrq = TRUE;
-#endif
-
         spin_lock(&chip->reg_lock);
         while ((snd_cs4281_peekBA0(chip, BA0_MIDSR) & BA0_MIDSR_RBE) == 0) {
@@ -1979 +1937 @@
     /* EOI to the PCI part... reenables interrupts */
     snd_cs4281_pokeBA0(chip, BA0_HICR, BA0_HICR_EOI);
-
-#ifdef TARGET_OS2
-    if (fOurIrq) {
-        eoi_irq(irq);
-    }
-#endif
     return IRQ_HANDLED;