[zaptel-commits] tzafrir: trunk r1389 - /trunk/xpp/card_fxo.c

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Mon Sep  4 17:46:48 2006
New Revision: 1389

URL: http://svn.digium.com/view/zaptel?rev=1389&view=rev
Log:
Finally not using SOFT_RING.

Modified:
    trunk/xpp/card_fxo.c

Modified: trunk/xpp/card_fxo.c
URL: http://svn.digium.com/view/zaptel/trunk/xpp/card_fxo.c?rev=1389&r1=1388&r2=1389&view=diff
==============================================================================
--- trunk/xpp/card_fxo.c (original)
+++ trunk/xpp/card_fxo.c Mon Sep  4 17:46:48 2006
@@ -237,7 +237,9 @@
 	packet_send(xbus, pack);
 	if(!offhook)
 		mark_ring(xpd, pos, 0);				// No more rings
+#ifdef	SOFT_RING
 	priv->ring_sig[pos] = 0;
+#endif
 	return ret;
 }
 
@@ -255,7 +257,6 @@
 	}
 	spin_lock_irqsave(&xpd->lock, flags);
 	mark_ring(xpd, pos, 0);				// No more rings
-	priv->ring_sig[pos] = 0;
 	__do_sethook(xpd->xbus, xpd, pos, offhook);
 	if(offhook) {
 		BIT_SET(xpd->hookstate, pos);
@@ -482,7 +483,6 @@
 }
 
 #ifdef	SOFT_RING
-
 static void poll_ring(xbus_t *xbus, xpd_t *xpd)
 {
 	int			i;