From 8d6e8908f40f4d8b6a3e07a8071aa9235bfb8a7f Mon Sep 17 00:00:00 2001 From: dvossel Date: Wed, 8 Jul 2009 22:15:06 +0000 Subject: 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: http://svn.digium.com/svn/asterisk/trunk@205412 f38db490-d61c-443f-a65b-d21fe96a405b --- main/devicestate.c | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'main/devicestate.c') diff --git a/main/devicestate.c b/main/devicestate.c index d7d8ea4cb..49e24d8ab 100644 --- a/main/devicestate.c +++ b/main/devicestate.c @@ -791,31 +791,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) { -- cgit v1.2.3