kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

moving ast_devstate_to_extenstate to pbx.c from devicestate.c

Browse Source 
ast_devstate_to_extenstate belongs in pbx.c.  This change
fixes a compile time error with chan_vpb as well.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@205409 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2009-07-08 21:35:12 +00:00
parent 16d3415cf3
commit 2e330f772c
4 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/asterisk/devicestate.h
View File

@@ -151,15 +151,6 @@ 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); 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 * \brief You shouldn't care about the contents of this struct
* *

8
include/asterisk/pbx.h
View File

@@ -273,6 +273,14 @@ int ast_add_extension2(struct ast_context *con, int replace, const char *extensi
int priority, const char *label, const char *callerid, int priority, const char *label, const char *callerid,
const char *application, void *data, void (*datad)(void *), const char *registrar); const char *application, void *data, void (*datad)(void *), const char *registrar);
/*!
* \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 Register an application. * \brief Register an application.

25
main/devicestate.c
View File

@@ -432,31 +432,6 @@ void ast_devstate_aggregate_add(struct ast_devstate_aggregate *agg, enum ast_dev
} }
} }
enum ast_extension_states ast_devstate_to_extenstate(enum ast_device_state devstate)
{
switch (devstate) {
case AST_DEVICE_ONHOLD:
return AST_EXTENSION_ONHOLD;
case AST_DEVICE_BUSY:
return AST_EXTENSION_BUSY;
case AST_DEVICE_UNAVAILABLE:
case AST_DEVICE_UNKNOWN:
case AST_DEVICE_INVALID:
return AST_EXTENSION_UNAVAILABLE;
case AST_DEVICE_RINGINUSE:
return (AST_EXTENSION_INUSE | AST_EXTENSION_RINGING);
case AST_DEVICE_RINGING:
return AST_EXTENSION_RINGING;
case AST_DEVICE_INUSE:
return AST_EXTENSION_INUSE;
case AST_DEVICE_NOT_INUSE:
return AST_EXTENSION_NOT_INUSE;
case AST_DEVICE_TOTAL: /* not a device state, included for completeness */
break;
}
return AST_EXTENSION_NOT_INUSE;
}
enum ast_device_state ast_devstate_aggregate_result(struct ast_devstate_aggregate *agg) enum ast_device_state ast_devstate_aggregate_result(struct ast_devstate_aggregate *agg)
{ {
if (agg->all_free) if (agg->all_free)

26
main/pbx.c
View File

@@ -1914,6 +1914,32 @@ static struct ast_exten *ast_hint_extension(struct ast_channel *c, const char *c
return e; return e;
} }
enum ast_extension_states ast_devstate_to_extenstate(enum ast_device_state devstate)
{
switch (devstate) {
case AST_DEVICE_ONHOLD:
return AST_EXTENSION_ONHOLD;
case AST_DEVICE_BUSY:
return AST_EXTENSION_BUSY;
case AST_DEVICE_UNAVAILABLE:
case AST_DEVICE_UNKNOWN:
case AST_DEVICE_INVALID:
return AST_EXTENSION_UNAVAILABLE;
case AST_DEVICE_RINGINUSE:
return (AST_EXTENSION_INUSE | AST_EXTENSION_RINGING);
case AST_DEVICE_RINGING:
return AST_EXTENSION_RINGING;
case AST_DEVICE_INUSE:
return AST_EXTENSION_INUSE;
case AST_DEVICE_NOT_INUSE:
return AST_EXTENSION_NOT_INUSE;
case AST_DEVICE_TOTAL: /* not a device state, included for completeness */
break;
}
return AST_EXTENSION_NOT_INUSE;
}
/*! \brief ast_extensions_state2: Check state of extension by using hints */ /*! \brief ast_extensions_state2: Check state of extension by using hints */
static int ast_extension_state2(struct ast_exten *e) static int ast_extension_state2(struct ast_exten *e)
{ {