[asterisk-commits] rmudgett: trunk r281871 - in /trunk: ./ channels/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Aug 11 15:38:57 2010
New Revision: 281871

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=281871
Log:
Merged revisions 281870 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r281870 | rmudgett | 2010-08-11 15:30:29 -0500 (Wed, 11 Aug 2010) | 4 lines
  
  Fix a call to analog_set_pulsedial() not setting 0 or 1 only.
  
  * Also a couple minor tweaks.
........

Modified:
    trunk/   (props changed)
    trunk/channels/sig_analog.c
    trunk/channels/sig_analog.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/sig_analog.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sig_analog.c?view=diff&rev=281871&r1=281870&r2=281871
==============================================================================
--- trunk/channels/sig_analog.c (original)
+++ trunk/channels/sig_analog.c Wed Aug 11 15:38:57 2010
@@ -2471,7 +2471,7 @@
 	ast_debug(1, "Got event %s(%d) on channel %d (index %d)\n", analog_event2str(res), res, p->channel, index);
 
 	if (res & (ANALOG_EVENT_PULSEDIGIT | ANALOG_EVENT_DTMFUP)) {
-		analog_set_pulsedial(p, (res & ANALOG_EVENT_PULSEDIGIT));
+		analog_set_pulsedial(p, (res & ANALOG_EVENT_PULSEDIGIT) ? 1 : 0);
 		ast_debug(1, "Detected %sdigit '%c'\n", (res & ANALOG_EVENT_PULSEDIGIT) ? "pulse ": "", res & 0xff);
 		analog_confmute(p, 0);
 		p->subs[index].f.frametype = AST_FRAME_DTMF_END;
@@ -3581,11 +3581,9 @@
 		}
 		break;
 	case ANALOG_EVENT_REMOVED: /* destroy channel, will actually do so in do_monitor */
-        ast_log(LOG_NOTICE,
-                "Got DAHDI_EVENT_REMOVED. Destroying channel %d\n",
-                i->channel);
-        return i->chan_pvt;
-        break;
+		ast_log(LOG_NOTICE, "Got DAHDI_EVENT_REMOVED. Destroying channel %d\n",
+			i->channel);
+		return i->chan_pvt;
 	case ANALOG_EVENT_NEONMWI_ACTIVE:
 		analog_handle_notify_message(NULL, i, -1, ANALOG_EVENT_NEONMWI_ACTIVE);
 		break;

Modified: trunk/channels/sig_analog.h
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sig_analog.h?view=diff&rev=281871&r1=281870&r2=281871
==============================================================================
--- trunk/channels/sig_analog.h (original)
+++ trunk/channels/sig_analog.h Wed Aug 11 15:38:57 2010
@@ -271,6 +271,7 @@
 	unsigned int transfer:1;
 	unsigned int transfertobusy:1;			/*!< allow flash-transfers to busy channels */
 	unsigned int use_callerid:1;			/*!< Whether or not to use caller id on this channel */
+	unsigned int callwaitingcallerid:1;
 	const struct ast_channel_tech *chan_tech;
 	/*!
      * \brief TRUE if distinctive rings are to be detected.
@@ -287,7 +288,6 @@
 	int polarityonanswerdelay;
 	int stripmsd;
 	enum analog_cid_start cid_start;
-	int callwaitingcallerid;
 	char mohsuggest[MAX_MUSICCLASS];
 	char cid_num[AST_MAX_EXTENSION];
 	char cid_name[AST_MAX_EXTENSION];