diff options
| author | Jeff Peeler <jpeeler@digium.com> | 2010-07-19 14:39:07 +0000 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@digium.com> | 2010-07-19 14:39:07 +0000 |
| commit | 58061391a11dbd4d1be4ed5829198395b93660d9 (patch) | |
| tree | d6cc2273e7425b7c7fbf11ea067f87d3a455d49b /channels/sig_analog.h | |
| parent | 6fa79e8f77dc945fcad8bec337bc527915d5960c (diff) | |
Fix regression with distinctive ring detection.
The issue here is that passing an array to a function prohibits the ARRAY_LEN
macro from returning the real size. To avoid this the size is now defined and
use of ARRAY_LEN is avoided.
(closes issue #15718)
Reported by: alecdavis
Patches:
bug15718.patch uploaded by jpeeler (license 325)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@277837 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sig_analog.h')
| -rw-r--r-- | channels/sig_analog.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/channels/sig_analog.h b/channels/sig_analog.h index 3f75e5827..e7f1ae2be 100644 --- a/channels/sig_analog.h +++ b/channels/sig_analog.h @@ -28,6 +28,10 @@ #include "asterisk/channel.h" #include "asterisk/frame.h" +#define ANALOG_MAX_CID 300 +#define READ_SIZE 160 +#define RING_PATTERNS 3 + /* Signalling types supported */ enum analog_sigtype { ANALOG_SIG_NONE = -1, @@ -110,8 +114,6 @@ enum analog_cid_start { ANALOG_CID_START_DTMF_NOALERT, }; -#define ANALOG_MAX_CID 300 - enum dialop { ANALOG_DIAL_OP_REPLACE = 2, }; @@ -221,8 +223,6 @@ struct analog_callback { -#define READ_SIZE 160 - struct analog_subchannel { struct ast_channel *owner; struct ast_frame f; /*!< One frame for each channel. How did this ever work before? */ |