[zaptel-commits] mspiceland: branch 1.4 r3402 - in /branches/1.4: ./ wcte12xp/vpmadt032.c

[SVN commits to the Zaptel project]

Author: mspiceland
Date: Mon Dec 10 17:09:35 2007
New Revision: 3402

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

........
r3400 | mspiceland | 2007-12-10 17:01:23 -0600 (Mon, 10 Dec 2007) | 5 lines

Small change to prevent scary messages (one's with "Failed" in them) to users
without hardware echo cancellation modules installed.  In case they actually
have one instead, we still report some info in debug mode to help find
where in the init the module failed for troubleshooting.

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/wcte12xp/vpmadt032.c

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

Modified: branches/1.4/wcte12xp/vpmadt032.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wcte12xp/vpmadt032.c?view=diff&rev=3402&r1=3401&r2=3402
==============================================================================
--- branches/1.4/wcte12xp/vpmadt032.c (original)
+++ branches/1.4/wcte12xp/vpmadt032.c Mon Dec 10 17:09:35 2007
@@ -694,14 +694,18 @@
 	for (i = 0; i < 10; i++)
 		schluffen(&wc->regq);
 
-	debug_printk(1, "VPMADT032 Testing page access: ");
+	debug_printk(1, "Looking for VPMADT032 by testing page access: ");
 	for (i = 0; i < 0xf; i++) {
 		int x;
 		for (x = 0; x < 3; x++) {
 			t1_vpm150m_setpage(wc, i);
 			reg = t1_vpm150m_getpage(wc);
 			if (reg != i) {
-				module_printk("Failed VPM page access test: Sent %x != %x VPMADT032 Failed HI page test\n", i, reg);
+				/* If they have debug turned on we want them to be able to 
+                 * report where in the code the module failed to come up. */
+				debug_printk(1, "Either no VPMADT032 module present or the module failed VPM page access test (%x != %x)\n", i, reg);
+				/* we need a message in case they don't have debug turned on*/
+				module_printk("No working VPMADT032 hardware echo cancellation module found.\n");
 				goto failed_exit;
 			}
 		}