[svn-commits] kpfleming: branch kpfleming/octasic-PR47-beta r1876 - in /team/kpfleming/octa...

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jan 22 12:53:20 2007
New Revision: 1876

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1876
Log:
Merged revisions 1856 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1856 | mattf | 2007-01-18 17:57:26 -0600 (Thu, 18 Jan 2007) | 2 lines

Merged revisions 1812 and 1854 back from trunk.

........

Modified:
    team/kpfleming/octasic-PR47-beta/   (props changed)
    team/kpfleming/octasic-PR47-beta/wct4xxp/base.c

Propchange: team/kpfleming/octasic-PR47-beta/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 22 12:53:20 2007
@@ -1,1 +1,1 @@
-/branches/1.2:1-1851
+/branches/1.2:1-1875

Modified: team/kpfleming/octasic-PR47-beta/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/kpfleming/octasic-PR47-beta/wct4xxp/base.c?view=diff&rev=1876&r1=1875&r2=1876
==============================================================================
--- team/kpfleming/octasic-PR47-beta/wct4xxp/base.c (original)
+++ team/kpfleming/octasic-PR47-beta/wct4xxp/base.c Mon Jan 22 12:53:20 2007
@@ -399,11 +399,17 @@
 #define MAX_TDM_CHAN 32
 #define MAX_DTMF_DET 16
 
+static inline unsigned int __t4_pci_in(struct t4 *wc, const unsigned int addr)
+{
+	unsigned int res = readl(&wc->membase[addr]);
+	return res;
+}
+
 static inline void __t4_pci_out(struct t4 *wc, const unsigned int addr, const unsigned int value)
 {
 	unsigned int tmp;
-	wc->membase[addr] = cpu_to_le32(value);
-	tmp = le32_to_cpu(wc->membase[WC_VERSION]);
+	writel(value, &wc->membase[addr]);
+	tmp = __t4_pci_in(wc, WC_VERSION);
 	if ((tmp & 0xffff0000) != 0xc01a0000)
 		printk("TE4XXP: Version Synchronization Error!\n");
 #if 0
@@ -412,11 +418,6 @@
 		(addr != WC_GPIO) && (addr != WC_INTR))
 		printk("Tried to load %08x into %08x, but got %08x instead\n", value, addr, tmp);
 #endif		
-}
-
-static inline unsigned int __t4_pci_in(struct t4 *wc, const unsigned int addr)
-{
-	return le32_to_cpu(wc->membase[addr]);
 }
 
 static inline void __t4_gpio_set(struct t4 *wc, unsigned bits, unsigned int val)
@@ -2415,9 +2416,6 @@
 	inirq = 1;
 	/* Make sure it's really for us */
 	status = t4_pci_in(wc, WC_INTR);
-#if 1
-	t4_pci_out(wc, WC_INTR, status & 0x00000008);
-#endif
 
 	/* Ignore if it's not for us */
 	if (!(status & 0x7)) {
@@ -2427,6 +2425,11 @@
 		return;
 #endif		
 	}
+
+#ifdef ENABLE_WORKQUEUES
+	t4_pci_out(wc, WC_INTR, status & 0x00000008);
+#endif
+
 	if (!wc->spansstarted) {
 		printk("Not prepped yet!\n");
 #ifdef LINUX26