vserver 2.0 rc7

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

diff --git a/sound/pci/emu10k1/irq.c b/sound/pci/emu10k1/irq.c
index 70f4020..b81a7ca 100644 (file)
--- a/sound/pci/emu10k1/irq.c
+++ b/sound/pci/emu10k1/irq.c
@@ -33,7 +33,7 @@
 irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
        emu10k1_t *emu = dev_id;
-       unsigned int status, orig_status;
+       unsigned int status, status2, orig_status, orig_status2;
        int handled = 0;
 
        while ((status = inl(emu->port + IPR)) != 0) {
@@ -73,6 +73,21 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                                val >>= 1;
                                pvoice++;
                        }
+                       val = snd_emu10k1_ptr_read(emu, HLIPL, 0);
+                       for (voice = 0; voice <= voice_max; voice++) {
+                               if (voice == 0x20)
+                                       val = snd_emu10k1_ptr_read(emu, HLIPH, 0);
+                               if (val & 1) {
+                                       if (pvoice->use && pvoice->interrupt != NULL) {
+                                               pvoice->interrupt(emu, pvoice);
+                                               snd_emu10k1_voice_half_loop_intr_ack(emu, voice);
+                                       } else {
+                                               snd_emu10k1_voice_half_loop_intr_disable(emu, voice);
+                                       }
+                               }
+                               val >>= 1;
+                               pvoice++;
+                       }
                        status &= ~IPR_CHANNELLOOP;
                }
                status &= ~IPR_CHANNELNUMBERMASK;
@@ -134,7 +149,7 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                }
                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 |
@@ -155,5 +170,20 @@ 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);
 }