diff options
Diffstat (limited to 'main/devicestate.c')
| -rw-r--r-- | main/devicestate.c | 68 |
1 files changed, 41 insertions, 27 deletions
diff --git a/main/devicestate.c b/main/devicestate.c index 016f2d6a3..09640a0e5 100644 --- a/main/devicestate.c +++ b/main/devicestate.c @@ -750,14 +750,12 @@ void ast_devstate_aggregate_add(struct ast_devstate_aggregate *agg, enum ast_dev break; case AST_DEVICE_INUSE: agg->in_use = 1; - agg->all_busy = 0; agg->all_unavail = 0; agg->all_free = 0; agg->all_unknown = 0; break; case AST_DEVICE_RINGING: agg->ring = 1; - agg->all_busy = 0; agg->all_unavail = 0; agg->all_free = 0; agg->all_unknown = 0; @@ -765,7 +763,6 @@ void ast_devstate_aggregate_add(struct ast_devstate_aggregate *agg, enum ast_dev case AST_DEVICE_RINGINUSE: agg->in_use = 1; agg->ring = 1; - agg->all_busy = 0; agg->all_unavail = 0; agg->all_free = 0; agg->all_unknown = 0; @@ -790,43 +787,60 @@ void ast_devstate_aggregate_add(struct ast_devstate_aggregate *agg, enum ast_dev agg->all_free = 0; break; case AST_DEVICE_UNKNOWN: + agg->all_busy = 0; + agg->all_free = 0; + break; + case AST_DEVICE_TOTAL: /* not a device state, included for completeness. */ break; } } -enum ast_device_state ast_devstate_aggregate_result(struct ast_devstate_aggregate *agg) +enum ast_extension_states ast_devstate_to_extenstate(enum ast_device_state devstate) { - if (agg->all_unknown) { - return AST_DEVICE_UNKNOWN; + 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; } - if (agg->all_free) { - return AST_DEVICE_NOT_INUSE; - } + return AST_EXTENSION_NOT_INUSE; +} - if ((agg->in_use || agg->on_hold) && agg->ring) { +enum ast_device_state ast_devstate_aggregate_result(struct ast_devstate_aggregate *agg) +{ + if (agg->all_free) + return AST_DEVICE_NOT_INUSE; + if ((agg->in_use || agg->on_hold) && agg->ring) return AST_DEVICE_RINGINUSE; - } - - if (agg->all_busy) { + if (agg->ring) + return AST_DEVICE_RINGING; + if (agg->busy) return AST_DEVICE_BUSY; - } - - if (agg->in_use) { + if (agg->in_use) return AST_DEVICE_INUSE; - } - - if (agg->ring) { - return AST_DEVICE_RINGING; - } - - if (agg->on_hold) { + if (agg->on_hold) return AST_DEVICE_ONHOLD; - } - - if (agg->all_unavail) { + if (agg->all_busy) + return AST_DEVICE_BUSY; + if (agg->all_unknown) + return AST_DEVICE_UNKNOWN; + if (agg->all_unavail) return AST_DEVICE_UNAVAILABLE; - } return AST_DEVICE_NOT_INUSE; } |