[svn-commits] file: branch file/zaptel-firmware r1857 - in /team/file/zaptel-firmware: ./ w...

[svn-commits at lists.digium.com]

Author: file
Date: Thu Jan 18 22:46:06 2007
New Revision: 1857

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

................
r1836 | qwell | 2007-01-16 18:45:25 -0500 (Tue, 16 Jan 2007) | 14 lines

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

........
r1835 | qwell | 2007-01-16 17:44:28 -0600 (Tue, 16 Jan 2007) | 6 lines

Remove file that was never (literally) able to compile - dates all the way back to zaptel 0.8.0

If we can figure out where this coeffs.h comes from, I suppose it would be easy to add this back in the future.

Issue 8493

........

................
r1855 | mattf | 2007-01-18 18:50:29 -0500 (Thu, 18 Jan 2007) | 2 lines

Backporting revs 1812 and 1854 into 1.4.

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

Removed:
    team/file/zaptel-firmware/fxsdump.c
Modified:
    team/file/zaptel-firmware/   (props changed)
    team/file/zaptel-firmware/wct4xxp/base.c

Propchange: team/file/zaptel-firmware/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/file/zaptel-firmware/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jan 18 22:46:06 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1829
+/branches/1.4:1-1856

Modified: team/file/zaptel-firmware/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/wct4xxp/base.c?view=diff&rev=1857&r1=1856&r2=1857
==============================================================================
--- team/file/zaptel-firmware/wct4xxp/base.c (original)
+++ team/file/zaptel-firmware/wct4xxp/base.c Thu Jan 18 22:46:06 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");