[zaptel-commits] mattf: trunk r2859 - in /trunk: ./ wctdm24xxp/base.c

[SVN commits to the Zaptel project]

Author: mattf
Date: Thu Aug 16 15:06:19 2007
New Revision: 2859

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

................
r2858 | mattf | 2007-08-16 15:04:27 -0500 (Thu, 16 Aug 2007) | 9 lines

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

........
r2857 | mattf | 2007-08-16 15:02:58 -0500 (Thu, 16 Aug 2007) | 1 line

Fix for when voicebus based cards stop taking interrupts on some systems
........

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

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

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

Modified: trunk/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm24xxp/base.c?view=diff&rev=2859&r1=2858&r2=2859
==============================================================================
--- trunk/wctdm24xxp/base.c (original)
+++ trunk/wctdm24xxp/base.c Thu Aug 16 15:06:19 2007
@@ -1671,6 +1671,15 @@
 		wctdm_setctl(wc, 0x0008, 0x00000000);
 #endif
 	}
+
+	if (ints & 0x0000a3ae) {
+		/* This will allow us to recover if interrupts are held for a long period of time */
+		if (debug & DEBUG_CARD)
+			printk("Abnormal interrupt %08x detected\n", ints);
+		wctdm_setctl(wc, 0x0008, 0x00000000);
+		wctdm_setctl(wc, 0x0010, 0x00000000);
+	}
+
 #ifdef LINUX26
 	return IRQ_RETVAL(1);
 #endif		
@@ -3799,8 +3808,8 @@
 	for (x=0;x<10;x++) 
 		schluffen(&wc->regq);
 	printk("After resetting the modules...\n");
-	/* Switch to caring only about receive interrupts */
-	wctdm_setintmask(wc, 0x00010040);
+	
+	wctdm_setintmask(wc, 0x0001f7fe);
 	
 	/* Make sure all units go into daisy chain mode */
 	spin_lock_irqsave(&wc->reglock, flags);