[asterisk-commits] jpeeler: branch jpeeler/asterisk-sigwork-trunk r206486 - /team/jpeeler/asteri...

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Jul 14 11:35:24 2009
New Revision: 206486

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=206486
Log:
add a note about radio, remove my todo

Modified:
    team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c

Modified: team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c?view=diff&rev=206486&r1=206485&r2=206486
==============================================================================
--- team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c (original)
+++ team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c Tue Jul 14 11:35:24 2009
@@ -63,6 +63,11 @@
 #include <dahdi/user.h>
 #include <dahdi/tonezone.h>
 #include "sig_analog.h"
+/* Analog signaling is currently still present in chan_dahdi for use with
+ * radio. Sig_analog does not currently handle any radio operations. If
+ * radio only uses analog signaling, then the radio handling logic could
+ * be placed in sig_analog and the duplicated code could be removed.
+ */
 
 #ifdef HAVE_PRI
 #include "sig_pri.h"
@@ -1571,12 +1576,11 @@
 	}
 
 	if (poller.revents & POLLIN) {
-/* jpeeler, note return 2 */
 		/*** NOTES ***/
 		/* Change API: remove cid_signalling from get_callerid, add a new start_cid_detect and stop_cid_detect function
-		 * to enable slin mode and allocate cid detector.  get_callerid should be able to be called any number of times until
-		 * either a timeout occurss or CID is detected (returns 0).  returning 1 should be event received, and -1 should be fail
-		 * and die */
+		 * to enable slin mode and allocate cid detector. get_callerid should be able to be called any number of times until
+		 * either a timeout occurss or CID is detected (returns 0). returning 1 should be event received, and -1 should be
+		 * a failure and die, and returning 2 means no event was received. */
 		res = read(p->subs[index].dfd, buf, sizeof(buf));
 		if (res < 0) {
 			if (errno != ELAST) {
@@ -8910,7 +8914,7 @@
 						distMatches = 0;
 						/* Clear the current ring data array so we dont have old data in it. */
 						for (receivedRingT = 0; receivedRingT < ARRAY_LEN(curRingData); receivedRingT++)
-						curRingData[receivedRingT] = 0;
+							curRingData[receivedRingT] = 0;
 						receivedRingT = 0;
 						counter = 0;
 						counter1 = 0;