From 09fc565b03f37c66c2bb80ce96242c999cb07261 Mon Sep 17 00:00:00 2001 From: mattf Date: Sat, 15 Sep 2007 20:36:58 +0000 Subject: This patch was not thought out well enough. Get rid of it for now (CAS signalling conflicts...) git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@3039 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- wctdm24xxp/base.c | 39 +++++++++++++++++++++++++++------------ ztcfg.c | 10 ---------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/wctdm24xxp/base.c b/wctdm24xxp/base.c index 10217db..874acde 100644 --- a/wctdm24xxp/base.c +++ b/wctdm24xxp/base.c @@ -1133,7 +1133,7 @@ static inline void wctdm_proslic_recheck_sanity(struct wctdm *wc, int card) if (wc->mods[card].fxs.palarms < MAX_ALARMS) { printk("Power alarm (%02x) on module %d, resetting!\n", res, card + 1); if (wc->mods[card].fxs.lasttxhook == 4) - wc->mods[card].fxs.lasttxhook = 1; + wc->mods[card].fxs.lasttxhook = 0x11; wc->sethook[card] = CMD_WR(19, res); #if 0 wc->sethook[card] = CMD_WR(64, wc->mods[card].fxs.lasttxhook); @@ -1149,12 +1149,21 @@ static inline void wctdm_proslic_recheck_sanity(struct wctdm *wc, int card) } #else res = wc->cmdq[card].isrshadow[1]; - if (!res && (res != wc->mods[card].fxs.lasttxhook)) { + /* This makes sure the lasthook was put in reg 64 the linefeed reg */ + if (((res & 0x0f) | 0x10) == wc->mods[card].fxs.lasttxhook) + wc->mods[card].fxs.lasttxhook &= 0x0f; + + res = !res && /* reg 64 has to be zero at last isr read */ + !(wc->mods[card].fxs.lasttxhook & 0x10 ) && /* not a transition */ + wc->mods[card].fxs.lasttxhook; /* not an intended zero */ + + if (res) { wc->mods[card].fxs.palarms++; if (wc->mods[card].fxs.palarms < MAX_ALARMS) { printk("Power alarm on module %d, resetting!\n", card + 1); if (wc->mods[card].fxs.lasttxhook == 4) - wc->mods[card].fxs.lasttxhook = 1; + wc->mods[card].fxs.lasttxhook = 0x11; + wc->mods[card].fxs.lasttxhook |= 0x10; wc->sethook[card] = CMD_WR(64, wc->mods[card].fxs.lasttxhook); /* wctdm_setreg_intr(wc, card, 64, wc->mods[card].fxs.lasttxhook); */ @@ -1436,7 +1445,7 @@ static inline void wctdm_isr_misc(struct wctdm *wc) wc->mods[x].fxs.idletxhookstate = 0x1; /* Switch to active */ if (wc->mods[x].fxs.lasttxhook == 0x2) { /* Apply the change if appropriate */ - wc->mods[x].fxs.lasttxhook = 0x1; + wc->mods[x].fxs.lasttxhook = 0x11; wc->sethook[x] = CMD_WR(64, wc->mods[x].fxs.lasttxhook); /* wctdm_setreg_intr(wc, x, 64, wc->mods[x].fxs.lasttxhook); */ } @@ -1945,6 +1954,7 @@ static int wctdm_init_proslic(struct wctdm *wc, int card, int fast, int manual, /* By default, don't send on hook */ wc->mods[card].fxs.idletxhookstate = 1; + wc->mods[card].fxs.lasttxhook = 0x10; /* Sanity check the ProSLIC */ if (!sane && wctdm_proslic_insane(wc, card)) @@ -2133,8 +2143,8 @@ static int wctdm_init_proslic(struct wctdm *wc, int card, int fast, int manual, printk("Reducing ring power on slot %d (50V peak)\n", card + 1); } } + wc->mods[card].fxs.lasttxhook = 0x11; wctdm_setreg(wc, card, 64, 0x01); - wc->mods[card].fxs.lasttxhook = 1; return 0; } @@ -2185,7 +2195,7 @@ static int wctdm_ioctl(struct zt_chan *chan, unsigned int cmd, unsigned long dat wc->mods[chan->chanpos - 1].fxs.idletxhookstate = 0x2; /* OHT mode when idle */ if (wc->mods[chan->chanpos - 1].fxs.lasttxhook == 0x1) { /* Apply the change if appropriate */ - wc->mods[chan->chanpos - 1].fxs.lasttxhook = 0x2; + wc->mods[chan->chanpos - 1].fxs.lasttxhook = 0x12; 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); */ } @@ -2228,6 +2238,9 @@ static int wctdm_ioctl(struct zt_chan *chan, unsigned int cmd, unsigned long dat wctdm_proslic_setreg_indirect(wc, chan->chanpos - 1, regop.reg, regop.val); } else { regop.val &= 0xff; + if (regop.reg == 64) + wc->mods[chan->chanpos-1].fxs.lasttxhook = (regop.val & 0x0f) | 0x10; + printk("Setting direct %d to %04x on %d\n", regop.reg, regop.val, chan->chanpos); wctdm_setreg(wc, chan->chanpos - 1, regop.reg, regop.val); } @@ -2359,28 +2372,30 @@ static int wctdm_hooksig(struct zt_chan *chan, zt_txsig_t txsig) case ZT_SIG_EM: case ZT_SIG_FXOKS: case ZT_SIG_FXOLS: - wc->mods[chan->chanpos - 1].fxs.lasttxhook = wc->mods[chan->chanpos - 1].fxs.idletxhookstate; + wc->mods[chan->chanpos - 1].fxs.lasttxhook = 0x10 | + wc->mods[chan->chanpos - 1].fxs.idletxhookstate; break; case ZT_SIG_FXOGS: - wc->mods[chan->chanpos - 1].fxs.lasttxhook = 3; + wc->mods[chan->chanpos - 1].fxs.lasttxhook = 0x13; break; } break; case ZT_TXSIG_OFFHOOK: switch(chan->sig) { case ZT_SIG_EM: - wc->mods[chan->chanpos - 1].fxs.lasttxhook = 5; + wc->mods[chan->chanpos - 1].fxs.lasttxhook = 0x15; break; default: - wc->mods[chan->chanpos - 1].fxs.lasttxhook = wc->mods[chan->chanpos - 1].fxs.idletxhookstate; + wc->mods[chan->chanpos - 1].fxs.lasttxhook = 0x10 | + wc->mods[chan->chanpos - 1].fxs.idletxhookstate; break; } break; case ZT_TXSIG_START: - wc->mods[chan->chanpos - 1].fxs.lasttxhook = 4; + wc->mods[chan->chanpos - 1].fxs.lasttxhook = 0x14; break; case ZT_TXSIG_KEWL: - wc->mods[chan->chanpos - 1].fxs.lasttxhook = 0; + wc->mods[chan->chanpos - 1].fxs.lasttxhook = 0x10; break; default: printk("wctdm24xxp: Can't set tx state to %d\n", txsig); diff --git a/ztcfg.c b/ztcfg.c index ae03547..e251f2a 100644 --- a/ztcfg.c +++ b/ztcfg.c @@ -1281,16 +1281,6 @@ int main(int argc, char *argv[]) current_state.channo = cc[x].chan | ZT_GET_PARAMS_RETURN_MASTER; if (ioctl(fd, ZT_GET_PARAMS, ¤t_state)) needupdate = 1; - else if (current_state.chanpos == 16 && - (cc[x].sigtype & ZT_SIG_CLEAR) && - !(lc[current_state.spanno - 1].lineconfig & - (ZT_CONFIG_D4|ZT_CONFIG_ESF|ZT_CONFIG_B8ZS|ZT_CONFIG_CCS))) { - fprintf(stderr, - "CAS signalling on span %u conflicts with %s on channel %u.\n", - current_state.spanno, - sigtype_to_str(cc[x].sigtype), x); - exit(1); - } } if (!needupdate) { -- cgit v1.2.3