dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 295516 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r295516 | rmudgett | 2010-11-19 10:47:11 -0600 (Fri, 19 Nov 2010) | 13 lines
  
  Bring sig_analog extraction more into alignment with orig-trunk/v1.6.2 chan_dahdi.
  
  * Restore SMDI support.
  * Fixed initial value of struct analog_pvt.use_callerid.  It may get
  forced on depending upon other config options.
  * Call analog_dnd() instead of manual inlined code.
  * Removed unused struct analog_pvt.usedistinctiveringdetection.
  * Removed the struct analog_pvt.unknown_alarm flag.  It was really the
  struct analog_pvt.inalarm flag.
  * Use ast_debug() instead of ast_log(LOG_DEBUG).
  * Rename several function's index variable to idx.
  * Some formatting tweaks.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295517 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
rmudgett 2010-11-19 16:49:54 +00:00
parent d4d9c92953
commit 5a03dbaad3
3 changed files with 271 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
channels/chan_dahdi.c
View File

@ -955,7 +955,7 @@ struct dahdi_pvt {
*/
unsigned int use_smdi:1;
struct mwisend_info mwisend_data;
/*! \brief The serial port to listen for SMDI data on */
/*! \brief The SMDI interface to get SMDI messages from. */
struct ast_smdi_interface *smdi_iface;
/*! \brief Distinctive Ring data */
@ -12589,7 +12589,9 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
analog_p->threewaycalling = conf->chan.threewaycalling;
analog_p->transfer = conf->chan.transfer;
analog_p->transfertobusy = conf->chan.transfertobusy;
analog_p->use_callerid = conf->chan.use_callerid;
analog_p->use_callerid = tmp->use_callerid;
analog_p->use_smdi = tmp->use_smdi;
analog_p->smdi_iface = tmp->smdi_iface;
analog_p->outsigmod = ANALOG_SIG_NONE;
analog_p->echotraining = conf->chan.echotraining;
analog_p->cid_signalling = conf->chan.cid_signalling;
@ -12609,7 +12611,6 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
break;
}
analog_p->callwaitingcallerid = conf->chan.callwaitingcallerid;
analog_p->usedistinctiveringdetection = conf->chan.usedistinctiveringdetection;
analog_p->ringt = conf->chan.ringt;
analog_p->ringt_base = ringt_base;
analog_p->chan_tech = &dahdi_tech;

485
channels/sig_analog.c
View File

File diff suppressed because it is too large Load Diff

15
channels/sig_analog.h
View File

@ -27,7 +27,9 @@
#include "asterisk/channel.h"
#include "asterisk/frame.h"
#include "asterisk/smdi.h"
#define ANALOG_SMDI_MD_WAIT_TIMEOUT 1500 /* 1.5 seconds */
#define ANALOG_MAX_CID 300
#define READ_SIZE 160
#define RING_PATTERNS 3
@ -276,13 +278,13 @@ struct analog_pvt {
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.
* \note For FXO lines
* \note Set indirectly from the "usedistinctiveringdetection" value read in from chan_dahdi.conf
*/
unsigned int usedistinctiveringdetection:1;
* \brief TRUE if SMDI (Simplified Message Desk Interface) is enabled
*/
unsigned int use_smdi:1;
/*! \brief The SMDI interface to get SMDI messages from. */
struct ast_smdi_interface *smdi_iface;
const struct ast_channel_tech *chan_tech;
/* Not used for anything but log messages. Could be just the TCID */
int channel; /*!< Channel Number */
@ -329,7 +331,6 @@ struct analog_pvt {
/* All variables after this are definitely going to be audited */
unsigned int inalarm:1;
unsigned int unknown_alarm:1;
int callwaitcas;