kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 03:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 205412 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r205412 | dvossel | 2009-07-08 17:15:06 -0500 (Wed, 08 Jul 2009) | 12 lines
  
  Merged revisions 205409 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r205409 | dvossel | 2009-07-08 16:35:12 -0500 (Wed, 08 Jul 2009) | 6 lines
    
    moving ast_devstate_to_extenstate to pbx.c from devicestate.c
    
    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.6.1@205414 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2009-07-08 22:16:18 +00:00
parent c47f452442
commit 4d54c69ab8
4 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
main/devicestate.c
View File

@@ -821,31 +821,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)
{