diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2010-11-19 16:49:54 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2010-11-19 16:49:54 +0000 |
| commit | f6edd47dd6f4b7f357476667bab942ad37c4a88c (patch) | |
| tree | bb3e934b1b9ef555d0848637e44d801881a24bd5 /channels/sig_analog.h | |
| parent | b6d0f09bc556992a51e7f5ae529c64eef4a8914a (diff) | |
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: https://origsvn.digium.com/svn/asterisk/trunk@295517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sig_analog.h')
| -rw-r--r-- | channels/sig_analog.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/channels/sig_analog.h b/channels/sig_analog.h index b58b0985a..3c33aebf0 100644 --- a/channels/sig_analog.h +++ b/channels/sig_analog.h @@ -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; |