[svn-commits] mattf: trunk r2637 - in /trunk: ./ wct4xxp/base.c

[svn-commits at lists.digium.com]

Author: mattf
Date: Mon Jun 11 17:13:53 2007
New Revision: 2637

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

................
r2634 | mattf | 2007-06-11 17:12:04 -0500 (Mon, 11 Jun 2007) | 9 lines

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

........
r2633 | mattf | 2007-06-11 17:10:59 -0500 (Mon, 11 Jun 2007) | 1 line

Make the version check optional
........

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

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

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

Modified: trunk/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp/base.c?view=diff&rev=2637&r1=2636&r2=2637
==============================================================================
--- trunk/wct4xxp/base.c (original)
+++ trunk/wct4xxp/base.c Mon Jun 11 17:13:53 2007
@@ -165,7 +165,8 @@
 
 #endif
 
-static int debug=0x0;
+static int pedanticpci = 1;
+static int debug=0;
 static int timingcable = 0;
 static int highestorder;
 static int t1e1override = -1; //0xFF; // -1 = jumper; 0xFF = E1
@@ -415,9 +416,11 @@
 {
 	unsigned int tmp;
 	writel(value, &wc->membase[addr]);
-	tmp = __t4_pci_in(wc, WC_VERSION);
-	if ((tmp & 0xffff0000) != 0xc01a0000)
-		printk("TE4XXP: Version Synchronization Error!\n");
+	if (pedanticpci) {
+		tmp = __t4_pci_in(wc, WC_VERSION);
+		if ((tmp & 0xffff0000) != 0xc01a0000)
+			printk("TE4XXP: Version Synchronization Error!\n");
+	}
 #if 0
 	tmp = __t4_pci_in(wc, addr);
 	if ((value != tmp) && (addr != WC_LEDS) && (addr != WC_LDATA) &&
@@ -504,7 +507,9 @@
 	unit &= 0x3;
 	__t4_pci_out(wc, WC_LADDR, (unit << 8) | (addr & 0xff));
 	__t4_pci_out(wc, WC_LADDR, (unit << 8) | (addr & 0xff) | WC_LFRMR_CS | WC_LREAD);
-	__t4_pci_out(wc, WC_VERSION, 0);
+	if (pedanticpci) {
+		__t4_pci_out(wc, WC_VERSION, 0);
+	}
 	ret = __t4_pci_in(wc, WC_LDATA);
  	__t4_pci_out(wc, WC_LADDR, (unit << 8) | (addr & 0xff));
 	return ret & 0xff;
@@ -3783,6 +3788,7 @@
 MODULE_LICENSE("GPL");
 #endif
 #ifdef LINUX26
+module_param(pedanticpci, int, 0600);
 module_param(debug, int, 0600);
 module_param(loopback, int, 0600);
 module_param(noburst, int, 0600);
@@ -3798,6 +3804,7 @@
 module_param(dtmfthreshold, int, 0600);
 #endif
 #else
+MODULE_PARM(pedanticpci, "i");
 MODULE_PARM(debug, "i");
 MODULE_PARM(loopback, "i");
 MODULE_PARM(noburst, "i");