Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / sound / pci / emu10k1 / irq.c

diff --git a/sound/pci/emu10k1/irq.c b/sound/pci/emu10k1/irq.c
index b81a7ca..a8b3128 100644 (file)
--- a/sound/pci/emu10k1/irq.c
+++ b/sound/pci/emu10k1/irq.c
@@ -32,16 +32,16 @@
 
 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;
 
        while ((status = inl(emu->port + IPR)) != 0) {
-               // printk("irq - status = 0x%x\n", status);
+               //printk("emu10k1 irq - status = 0x%x\n", status);
                orig_status = status;
                handled = 1;
                if (status & IPR_PCIERROR) {
-                       snd_printk("interrupt: PCI error\n");
+                       snd_printk(KERN_ERR "interrupt: PCI error\n");
                        snd_emu10k1_intr_disable(emu, INTE_PCIERRORENABLE);
                        status &= ~IPR_PCIERROR;
                }
@@ -56,7 +56,7 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                        int voice;
                        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);
                        for (voice = 0; voice <= voice_max; voice++) {
@@ -147,9 +147,36 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                                snd_emu10k1_intr_disable(emu, INTE_FXDSPENABLE);
                        status &= ~IPR_FXDSP;
                }
+               if (status & IPR_P16V) {
+                       while ((status2 = inl(emu->port + IPR2)) != 0) {
+                               u32 mask = INTE2_PLAYBACK_CH_0_LOOP;  /* Full Loop */
+                               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);
+                               orig_status2 = status2;
+                               if(status2 & mask) {
+                                       if(pvoice->use) {
+                                               snd_pcm_period_elapsed(pvoice->epcm->substream);
+                                       } else { 
+                                               snd_printk(KERN_ERR "p16v: status: 0x%08x, mask=0x%08x, pvoice=%p, use=%d\n", status2, mask, pvoice, pvoice->use);
+                                       }
+                               }
+                               if(status2 & 0x110000) {
+                                       //printk(KERN_INFO "capture int found\n");
+                                       if(cvoice->use) {
+                                               //printk(KERN_INFO "capture period_elapsed\n");
+                                               snd_pcm_period_elapsed(cvoice->epcm->substream);
+                                       }
+                               }
+                               outl(orig_status2, emu->port + IPR2); /* ack all */
+                       }
+                       status &= ~IPR_P16V;
+               }
+
                if (status) {
                        unsigned int bits;
-                       //snd_printk(KERN_ERR "emu10k1: unhandled interrupt: 0x%08x\n", status);
+                       snd_printk(KERN_ERR "emu10k1: unhandled interrupt: 0x%08x\n", status);
                        //make sure any interrupts we don't handle are disabled:
                        bits = INTE_FXDSPENABLE |
                                INTE_PCIERRORENABLE |
@@ -170,20 +197,5 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                }
                outl(orig_status, emu->port + IPR); /* ack all */
        }
-       if (emu->audigy && emu->revision == 4) { /* P16V */     
-               while ((status2 = inl(emu->port + IPR2)) != 0) {
-                       u32 mask = INTE2_PLAYBACK_CH_0_LOOP;  /* Full Loop */
-                       emu10k1_voice_t *pvoice = &(emu->p16v_voices[0]);
-                       orig_status2 = status2;
-                       if(status2 & mask) {
-                               if(pvoice->use) {
-                                       snd_pcm_period_elapsed(pvoice->epcm->substream);
-                               } else { 
-                                       snd_printk(KERN_ERR "p16v: status: 0x%08x, mask=0x%08x, pvoice=%p, use=%d\n", status2, mask, pvoice, pvoice->use);
-                               }
-                       }
-                       outl(orig_status2, emu->port + IPR2); /* ack all */
-               }
-       }
        return IRQ_RETVAL(handled);
 }