[zaptel-commits] mattf: trunk r1938 - in /trunk: ./ wct1xxp.c wctdm.c wctdm24xxp.c wcte11xp.c

[zaptel-commits at lists.digium.com]

Author: mattf
Date: Tue Jan 23 15:52:46 2007
New Revision: 1938

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

................
r1937 | mattf | 2007-01-23 15:49:15 -0600 (Tue, 23 Jan 2007) | 11 lines

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

........
r1936 | mattf | 2007-01-23 15:28:14 -0600 (Tue, 23 Jan 2007) | 3 lines

Make sure we don't clear the interrupt before we might have received it in 
shared interrupt line scenarios.

........

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

Modified:
    trunk/   (props changed)
    trunk/wct1xxp.c
    trunk/wctdm.c
    trunk/wctdm24xxp.c
    trunk/wcte11xp.c

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

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Tue Jan 23 15:52:46 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921,1924
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921,1924,1937

Modified: trunk/wct1xxp.c
URL: http://svn.digium.com/view/zaptel/trunk/wct1xxp.c?view=diff&rev=1938&r1=1937&r2=1938
==============================================================================
--- trunk/wct1xxp.c (original)
+++ trunk/wct1xxp.c Tue Jan 23 15:52:46 2007
@@ -1134,14 +1134,14 @@
 	int x;
 
 	ints = inb(wc->ioaddr + WC_INTSTAT);
-	outb(ints, wc->ioaddr + WC_INTSTAT);
-
 	if (!ints)
 #ifdef LINUX26
 		return IRQ_NONE;
 #else
 		return;
 #endif		
+
+	outb(ints, wc->ioaddr + WC_INTSTAT);
 
 	if (!wc->intcount) {
 		if (debug) printk("Got interrupt: 0x%04x\n", ints);

Modified: trunk/wctdm.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm.c?view=diff&rev=1938&r1=1937&r2=1938
==============================================================================
--- trunk/wctdm.c (original)
+++ trunk/wctdm.c Tue Jan 23 15:52:46 2007
@@ -1037,7 +1037,6 @@
 	int mode;
 
 	ints = inb(wc->ioaddr + WC_INTSTAT);
-	outb(ints, wc->ioaddr + WC_INTSTAT);
 
 	if (!ints)
 #ifdef LINUX26
@@ -1045,6 +1044,8 @@
 #else
 		return;
 #endif		
+
+	outb(ints, wc->ioaddr + WC_INTSTAT);
 
 	if (ints & 0x10) {
 		/* Stop DMA, wait for watchdog */

Modified: trunk/wctdm24xxp.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm24xxp.c?view=diff&rev=1938&r1=1937&r2=1938
==============================================================================
--- trunk/wctdm24xxp.c (original)
+++ trunk/wctdm24xxp.c Tue Jan 23 15:52:46 2007
@@ -1559,7 +1559,6 @@
 
 	/* Read and clear interrupts */
 	ints = wctdm_getctl(wc, 0x0028);
-	wctdm_setctl(wc, 0x0028, ints);
 
 	if (!ints)
 #ifdef LINUX26
@@ -1567,6 +1566,9 @@
 #else
 		return;
 #endif		
+
+	wctdm_setctl(wc, 0x0028, ints);
+
 	ints &= wc->intmask;
 	if (ints & 0x00000041) {
 		do {

Modified: trunk/wcte11xp.c
URL: http://svn.digium.com/view/zaptel/trunk/wcte11xp.c?view=diff&rev=1938&r1=1937&r2=1938
==============================================================================
--- trunk/wcte11xp.c (original)
+++ trunk/wcte11xp.c Tue Jan 23 15:52:46 2007
@@ -1289,14 +1289,14 @@
 	int x;
 
 	ints = inb(wc->ioaddr + WC_INTSTAT);
-	outb(ints, wc->ioaddr + WC_INTSTAT);
-
 	if (!ints)
 #ifdef LINUX26
 		return IRQ_NONE;
 #else
 		return;
 #endif		
+
+	outb(ints, wc->ioaddr + WC_INTSTAT);
 
 	if (!wc->intcount) {
 		if (debug) printk("Got interrupt: 0x%04x\n", ints);