diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-02 16:28:29 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-02 16:28:29 +0000 |
| commit | c14e74d3071855048655da68e1da288be086b800 (patch) | |
| tree | 75501b6ebf6d86a1be0221e432dfaa9946fed7da /include | |
| parent | 79c0b4c69ea9a1597df6488b3bb6bc2ba5b8aa43 (diff) | |
Merged revisions 204710 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r204710 | dvossel | 2009-07-02 11:03:44 -0500 (Thu, 02 Jul 2009) | 21 lines
Merged revisions 204681 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r204681 | dvossel | 2009-07-02 10:05:57 -0500 (Thu, 02 Jul 2009) | 14 lines
Improved mapping of extension states from combined device states.
This fixes a few issues with incorrect extension states and adds
a cli command, core show device2extenstate, to display all possible
state mappings.
(closes issue #15413)
Reported by: legart
Patches:
exten_helper.diff uploaded by dvossel (license 671)
Tested by: dvossel, legart, amilcar
Review: https://reviewboard.asterisk.org/r/301/
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@204736 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/devicestate.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/asterisk/devicestate.h b/include/asterisk/devicestate.h index dbd513fec..a88546ff9 100644 --- a/include/asterisk/devicestate.h +++ b/include/asterisk/devicestate.h @@ -58,6 +58,7 @@ enum ast_device_state { AST_DEVICE_RINGING, /*!< Device is ringing */ AST_DEVICE_RINGINUSE, /*!< Device is ringing *and* in use */ AST_DEVICE_ONHOLD, /*!< Device is on hold */ + AST_DEVICE_TOTAL, /*/ Total num of device states, used for testing */ }; /*! \brief Devicestate provider call back */ @@ -247,6 +248,15 @@ void ast_devstate_aggregate_add(struct ast_devstate_aggregate *agg, enum ast_dev enum ast_device_state ast_devstate_aggregate_result(struct ast_devstate_aggregate *agg); /*! + * \brief Map devstate to an extension state. + * + * \param[in] device state + * + * \return the extension state mapping. + */ +enum ast_extension_states ast_devstate_to_extenstate(enum ast_device_state devstate); + +/*! * \brief You shouldn't care about the contents of this struct * * This struct is only here so that it can be easily declared on the stack. |