Changeset 34 for GPL/trunk/alsa-kernel/pci/emu10k1/irq.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/emu10k1/irq.c (modified) (4 diffs)

GPL/trunk/alsa-kernel/pci/emu10k1/irq.c

@@ -34 +34 @@
 irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
-    emu10k1_t *emu = dev_id;
+    struct snd_emu10k1 *emu = dev_id;
     unsigned int status, status2, orig_status, orig_status2;
     int handled = 0;
@@ -76 +76 @@
             int voice_max = status & IPR_CHANNELNUMBERMASK;
             u32 val;
-            emu10k1_voice_t *pvoice = emu->voices;
+            struct snd_emu10k1_voice *pvoice = emu->voices;
 
             val = snd_emu10k1_ptr_read(emu, CLIPL, 0);
@@ -170 +170 @@
             while ((status2 = inl(emu->port + IPR2)) != 0) {
                 u32 mask = INTE2_PLAYBACK_CH_0_LOOP;  /* Full Loop */
-                emu10k1_voice_t *pvoice = &(emu->p16v_voices[0]);
-                emu10k1_voice_t *cvoice = &(emu->p16v_capture_voice);
+                struct snd_emu10k1_voice *pvoice = &(emu->p16v_voices[0]);
+                struct snd_emu10k1_voice *cvoice = &(emu->p16v_capture_voice);
 
                 //printk(KERN_INFO "status2=0x%x\n", status2);
@@ -219 +219 @@
 
     }
-
-#ifdef TARGET_OS2
-        if (fOurIrq) {
-            eoi_irq(irq);
-        }
-#endif //TARGET_OS2
-
     return IRQ_RETVAL(handled);
 }