[zaptel-commits] mattf: trunk r2210 - in /trunk: ./ wct4xxp/base.c

[zaptel-commits at lists.digium.com]

Author: mattf
Date: Wed Feb 21 11:30:09 2007
New Revision: 2210

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2210
Log:
Merged revisions 2209 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r2209 | mattf | 2007-02-21 11:27:59 -0600 (Wed, 21 Feb 2007) | 10 lines

Merged revisions 2208 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r2208 | mattf | 2007-02-21 11:26:05 -0600 (Wed, 21 Feb 2007) | 2 lines

Make sure we do the IRQ fix in the gen1 interrupt handler as well.

........

................

Modified:
    trunk/   (props changed)
    trunk/wct4xxp/base.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp/base.c?view=diff&rev=2210&r1=2209&r2=2210
==============================================================================
--- trunk/wct4xxp/base.c (original)
+++ trunk/wct4xxp/base.c Wed Feb 21 11:30:09 2007
@@ -2732,8 +2732,6 @@
 	inirq = 1;
 	/* Make sure it's really for us */
 	status = t4_pci_in(wc, WC_INTR);
-	t4_pci_out(wc, WC_INTR, 0);
-
 	/* Process framer interrupts */
 	status2 = t4_framer_in(wc, 0, FRMR_CIS);
 	if (status2 & 0x0f) {
@@ -2752,6 +2750,8 @@
 #else
 		return;
 #endif		
+
+	t4_pci_out(wc, WC_INTR, 0);
 
 	if (!wc->spansstarted) {
 		printk("Not prepped yet!\n");