diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-22 22:11:01 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-22 22:11:01 +0000 |
commit | 21ecfefe647461701504aeeccc9f795078094436 (patch) | |
tree | 7d7dc3b190e0c231e06caf43a57202700f8c7456 /apps | |
parent | 2d0c70e4ebb0f6d7e826065d6bb75e3e2513089e (diff) |
fix up namespace pollution for dahdi_chan_mode enum
correct registration of AMI actions in chan_dahdi; in zap-only mode, only register the Zap flavors of the actions (and use Zap prefixes for headers and acks), but in dahdi+zap mode, register both Zap and DAHDI flavors of actions
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@132787 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_dahdibarge.c | 4 | ||||
-rw-r--r-- | apps/app_dahdiras.c | 4 | ||||
-rw-r--r-- | apps/app_flash.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/app_dahdibarge.c b/apps/app_dahdibarge.c index 48bc0c62f..88610cc36 100644 --- a/apps/app_dahdibarge.c +++ b/apps/app_dahdibarge.c @@ -336,7 +336,7 @@ static int unload_module(void) { int res = 0; - if (dahdi_chan_mode == DAHDI_PLUS_ZAP) { + if (dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) { res |= ast_unregister_application(dahdi_app); } @@ -351,7 +351,7 @@ static int load_module(void) { int res = 0; - if (dahdi_chan_mode == DAHDI_PLUS_ZAP) { + if (dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) { res |= ast_register_application(dahdi_app, exec_dahdi, dahdi_synopsis, dahdi_descrip); } diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c index 2a9875ed3..1012a5fbe 100644 --- a/apps/app_dahdiras.c +++ b/apps/app_dahdiras.c @@ -260,7 +260,7 @@ static int unload_module(void) { int res = 0; - if (dahdi_chan_mode == DAHDI_PLUS_ZAP) { + if (dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) { res |= ast_unregister_application(dahdi_app); } @@ -275,7 +275,7 @@ static int load_module(void) { int res = 0; - if (dahdi_chan_mode == DAHDI_PLUS_ZAP) { + if (dahdi_chan_mode == CHAN_DAHDI_PLUS_ZAP_MODE) { res |= ast_register_application(dahdi_app, exec, dahdi_synopsis, dahdi_descrip); } diff --git a/apps/app_flash.c b/apps/app_flash.c index 98ea17d03..e6b2db49a 100644 --- a/apps/app_flash.c +++ b/apps/app_flash.c @@ -126,7 +126,7 @@ static int unload_module(void) static int load_module(void) { - if (dahdi_chan_mode == ZAP_ONLY_MODE) { + if (dahdi_chan_mode == CHAN_ZAP_MODE) { return ast_register_application(app, flash_exec, zap_synopsis, zap_descrip); } else { return ast_register_application(app, flash_exec, dahdi_synopsis, dahdi_descrip); |