Fixed signalling problem with pciradio card

git-svn-id: http://svn.digium.com/svn/zaptel/trunk@758 5390a7c7-147a-4af0-8ec9-7488f05a26cb

2 files changed, 3 insertions, 5 deletions

diff --git a/pciradio.c b/pciradio.c
index a2ec582..58df840 100755
--- a/pciradio.c
+++ b/pciradio.c
@@ -890,12 +890,10 @@ static void pciradio_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 								else
 								    printk("Chan %d got rx\n",x + 1);
 							}
-						    rad->chans[x].rxhooksig = ZT_RXSIG_OFFHOOK;
-						    zt_qevent_lock(&rad->chans[x], ZT_EVENT_RINGOFFHOOK);
+						    zt_hooksig(&rad->chans[x],ZT_RXSIG_OFFHOOK);
 						} else {
 						    if (debug) printk("Chan %d lost rx\n",x + 1);
-						    rad->chans[x].rxhooksig = ZT_RXSIG_ONHOOK;
-						    zt_qevent_lock(&rad->chans[x], ZT_EVENT_ONHOOK);
+						    zt_hooksig(&rad->chans[x],ZT_RXSIG_ONHOOK);
 						}
 						rad->encdec.req[x] = 1; 
 					}
diff --git a/zaptel.c b/zaptel.c
index 6ecca4d..9abe625 100755
--- a/zaptel.c
+++ b/zaptel.c
@@ -5084,7 +5084,7 @@ static inline void __rbs_otimer_expire(struct zt_chan *chan)
 	case ZT_TXSTATE_DEBOUNCE:
 		zt_rbs_sethook(chan, ZT_TXSIG_OFFHOOK, ZT_TXSTATE_OFFHOOK, 0);
 		/* See if we've gone back on hook */
-		if (chan->rxhooksig == ZT_RXSIG_ONHOOK)
+		if ((chan->rxhooksig == ZT_RXSIG_ONHOOK) && (chan->rxflashtime > 2))
 			chan->itimerset = chan->itimer = chan->rxflashtime * 8;
 		wake_up_interruptible(&chan->txstateq);
 		break;