diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2005-12-16 00:17:21 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2005-12-16 00:17:21 +0000 |
| commit | 5c705fd2ffc223e3557a4e959b3db941422b3017 (patch) | |
| tree | 3c9b7b2a1779493ae040af142c19d731ae9fbba1 /wctdm24xxp.c | |
| parent | 31bd64ed9feb67ad53de51d9f0d6a86a3d381713 (diff) | |
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)
........
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@860 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wctdm24xxp.c')
| -rw-r--r-- | wctdm24xxp.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/wctdm24xxp.c b/wctdm24xxp.c index 14e0d27..7eb5abd 100644 --- a/wctdm24xxp.c +++ b/wctdm24xxp.c @@ -1235,9 +1235,7 @@ static inline void wctdm_proslic_check_hook(struct wctdm *wc, int card) } 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 @@ static inline void wctdm_proslic_check_hook(struct wctdm *wc, int card) } 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 @@ static int wctdm_proslic_manual_calibrate(struct wctdm *wc, int card) return(0); } -#if 1 + static int wctdm_proslic_calibrate(struct wctdm *wc, int card) { unsigned long origjiffies; @@ -1738,7 +1734,6 @@ static int wctdm_proslic_calibrate(struct wctdm *wc, int card) } return 0; } -#endif static void wait_just_a_bit(int foo) { @@ -2271,11 +2266,9 @@ static int wctdm_hooksig(struct zt_chan *chan, zt_txsig_t txsig) 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 @@ static void wctdm_locate_modules(struct wctdm *wc) } 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); |