diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-11 22:12:26 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-11 22:12:26 +0000 |
| commit | 6d24d82f63425210f28b104b68324475163fd542 (patch) | |
| tree | 84040a4ee9d4cb5ae7278c79140a6ff782d84388 /include | |
| parent | dd3bdbadeb89c8ddcb28dce2799f3ac9857ad370 (diff) | |
a whole pile of Zaptel/DAHDI compatibility work, with lots more to come... this tree is not yet ready for users to be easily upgrading or switching, but it needs to be :-)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@130298 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/channel.h | 2 | ||||
| -rw-r--r-- | include/asterisk/options.h | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 29bfbef0e..d5acaf6e4 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -1168,7 +1168,7 @@ int ast_autoservice_start(struct ast_channel *chan); */ int ast_autoservice_stop(struct ast_channel *chan); -/* If built with zaptel optimizations, force a scheduled expiration on the +/* If built with DAHDI optimizations, force a scheduled expiration on the timer fd, at which point we call the callback function / data */ int ast_settimeout(struct ast_channel *c, int samples, int (*func)(const void *data), void *data); diff --git a/include/asterisk/options.h b/include/asterisk/options.h index 492feccd8..57e1374fe 100644 --- a/include/asterisk/options.h +++ b/include/asterisk/options.h @@ -122,8 +122,12 @@ extern pid_t ast_mainpid; extern char record_cache_dir[AST_CACHE_DIR_LEN]; extern char debug_filename[AST_FILENAME_MAX]; -extern char dahdi_chan_name[AST_CHANNEL_NAME]; - +extern const char *dahdi_chan_name; +extern enum dahdi_chan_modes { + ZAP_ONLY_MODE, + DAHDI_PLUS_ZAP, +} dahdi_chan_mode; + extern int ast_language_is_prefix; #if defined(__cplusplus) || defined(c_plusplus) |