[zaptel-commits] trunk - r860 in /trunk: ./ wctdm24xxp.c

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Thu Dec 15 18:17:21 2005
New Revision: 860

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

........
r859 | kpfleming | 2005-12-15 18:16:59 -0600 (Thu, 15 Dec 2005) | 3 lines

remove some debugging #if statements
dont force cardflag on for modules that are not present (so applications can't try to open non-existent ports)

........

Modified:
    trunk/   (props changed)
    trunk/wctdm24xxp.c

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Dec 15 18:17:21 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-857
+/branches/1.2:1-859

Modified: trunk/wctdm24xxp.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm24xxp.c?rev=860&r1=859&r2=860&view=diff
==============================================================================
--- trunk/wctdm24xxp.c (original)
+++ trunk/wctdm24xxp.c Thu Dec 15 18:17:21 2005
@@ -1235,9 +1235,7 @@
 			}
 			if (!wc->mods[card].fxs.oldrxhook && wc->mods[card].fxs.debouncehook) {
 				/* Off hook */
-#if 1
 				if (debug)
-#endif				
 					printk("wctdm: Card %d Going off hook\n", card);
 				zt_hooksig(&wc->chans[card], ZT_RXSIG_OFFHOOK);
 				if (robust)
@@ -1246,9 +1244,7 @@
 			
 			} else if (wc->mods[card].fxs.oldrxhook && !wc->mods[card].fxs.debouncehook) {
 				/* On hook */
-#if 1
 				if (debug)
-#endif				
 					printk("wctdm: Card %d Going on hook\n", card);
 				zt_hooksig(&wc->chans[card], ZT_RXSIG_ONHOOK);
 				wc->mods[card].fxs.oldrxhook = 0;
@@ -1709,7 +1705,7 @@
 	return(0);
 
 }
-#if 1
+
 static int wctdm_proslic_calibrate(struct wctdm *wc, int card)
 {
 	unsigned long origjiffies;
@@ -1738,7 +1734,6 @@
 	}
 	return 0;
 }
-#endif
 
 static void wait_just_a_bit(int foo)
 {
@@ -2271,11 +2266,9 @@
 		if (debug)
 			printk("Setting FXS hook state to %d (%02x)\n", txsig, reg);
 
-#if 1
 		
 		wc->sethook[chan->chanpos - 1] = CMD_WR(64, wc->mods[chan->chanpos - 1].fxs.lasttxhook);
 		/* wctdm_setreg(wc, chan->chanpos - 1, 64, wc->mods[chan->chanpos - 1].fxs.lasttxhook); */
-#endif
 	}
 	return 0;
 }
@@ -2628,20 +2621,12 @@
 				} else {
 					printk("Port %d: FAILED FXS (%s)\n", x + 1, fxshonormode ? fxo_modes[_opermode].name : "FCC");
 				} 
-#if 1
 			} else if (!(ret = wctdm_init_voicedaa(wc, x, 0, 0, sane))) {
 				wc->cardflag |= (1 << x);
 				printk("Port %d: Installed -- AUTO FXO (%s mode)\n",x + 1, fxo_modes[_opermode].name);
-#endif
 			} else
 				printk("Port %d: Not installed\n", x + 1);
 		}
-#if 1
-		if (!(wc->cardflag & (1 << x))) {
-			wc->cardflag |= (1 << x);
-			wc->modtype[x] = MOD_TYPE_NONE;
-		}
-#endif		
 	}
 #ifdef VPM_SUPPORT
 	wctdm_vpm_init(wc);