[Asterisk-cvs] zaptel pciradio.c,1.17,1.18 zaptel.c,1.114,1.115

[jim]

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv7010

Modified Files:
	pciradio.c zaptel.c 
Log Message:
Fixed signalling problem with pciradio card


Index: pciradio.c
===================================================================
RCS file: /usr/cvsroot/zaptel/pciradio.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- pciradio.c	24 Aug 2005 04:33:36 -0000	1.17
+++ pciradio.c	8 Sep 2005 17:22:39 -0000	1.18
@@ -890,12 +890,10 @@
 								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; 
 					}

Index: zaptel.c
===================================================================
RCS file: /usr/cvsroot/zaptel/zaptel.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- zaptel.c	2 Sep 2005 20:26:02 -0000	1.114
+++ zaptel.c	8 Sep 2005 17:22:39 -0000	1.115
@@ -5084,7 +5084,7 @@
 	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;