[zaptel-commits] mattf: branch 1.4 r1855 - /branches/1.4/wct4xxp/base.c

[zaptel-commits at lists.digium.com]

Author: mattf
Date: Thu Jan 18 17:50:29 2007
New Revision: 1855

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1855
Log:
Backporting revs 1812 and 1854 into 1.4.

Modified:
    branches/1.4/wct4xxp/base.c

Modified: branches/1.4/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wct4xxp/base.c?view=diff&rev=1855&r1=1854&r2=1855
==============================================================================
--- branches/1.4/wct4xxp/base.c (original)
+++ branches/1.4/wct4xxp/base.c Thu Jan 18 17:50:29 2007
@@ -425,14 +425,14 @@
 
 static inline unsigned int __t4_pci_in(struct t4 *wc, const unsigned int addr)
 {
-	unsigned int res = le32_to_cpu(wc->membase[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);
+	writel(value, &wc->membase[addr]);
 	tmp = __t4_pci_in(wc, WC_VERSION);
 	if ((tmp & 0xffff0000) != 0xc01a0000)
 		printk("TE4XXP: Version Synchronization Error!\n");
@@ -2838,9 +2838,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)) {
@@ -2850,6 +2847,10 @@
 		return;
 #endif		
 	}
+
+#ifdef ENABLE_WORKQUEUES
+	t4_pci_out(wc, WC_INTR, status & 0x00000008);
+#endif
 
 	if (!wc->spansstarted) {
 		printk("Not prepped yet!\n");