From b6457ecf4c95b5fe148afdac555e9b198e666c23 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Fri, 13 Jun 2008 12:45:50 +0000 Subject: Merge changes from timing branch - Convert chan_iax2 to use the timing API - Convert usage of timing in the core to use the timing API instead of using DAHDI directly - Make a change to the timing API to add the set_rate() function - change the timing core to use a rwlock - merge a timing implementation, res_timing_dahdi Basic testing was successful using res_timing_dahdi git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@122523 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/channel.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'include/asterisk/channel.h') diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 1aa4a083e..07282d05a 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -1423,9 +1423,17 @@ int ast_autoservice_start(struct ast_channel *chan); */ int ast_autoservice_stop(struct ast_channel *chan); -/* 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); +/*! + * \brief Enable or disable timer ticks for a channel + * + * \arg rate number of timer ticks per second + * + * If timers are supported, force a scheduled expiration on the + * timer fd, at which point we call the callback function / data + * + * Call this function with a rate of 0 to turn off the timer ticks + */ +int ast_settimeout(struct ast_channel *c, unsigned int rate, int (*func)(const void *data), void *data); /*! \brief Transfer a channel (if supported). Returns -1 on error, 0 if not supported and 1 if supported and requested -- cgit v1.2.3