diff options
| author | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-05-16 21:39:47 +0000 |
|---|---|---|
| committer | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-05-16 21:39:47 +0000 |
| commit | dd3fad8de5df2f25630d66154f209b6b7cbf4049 (patch) | |
| tree | ed5c05bf8715f685b46da469d8d7c22cc0d8c0dc /kernel/zaptel.h | |
| parent | 5e00740361c43a489bff5d280a80fe7285ea9231 (diff) | |
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4301 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'kernel/zaptel.h')
| -rw-r--r-- | kernel/zaptel.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/zaptel.h b/kernel/zaptel.h index 04ae820..81f7946 100644 --- a/kernel/zaptel.h +++ b/kernel/zaptel.h @@ -25,8 +25,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _LINUX_DAHDI_H -#define _LINUX_DAHDI_H +#ifndef _LINUX_ZAPTEL_H +#define _LINUX_ZAPTEL_H #ifdef __KERNEL__ #include "zconfig.h" @@ -1634,7 +1634,7 @@ struct zt_span { /* Opt: Enable maintenance modes */ int (*maint)(struct zt_span *span, int mode); -#ifdef DAHDI_SYNC_TICK +#ifdef ZAPTEL_SYNC_TICK /* Opt: send sync to spans */ int (*sync_tick)(struct zt_span *span, int is_master); #endif @@ -1694,7 +1694,7 @@ struct zt_span { /* If the watchdog detects no received data, it will call the watchdog routine */ int (*watchdog)(struct zt_span *span, int cause); -#ifdef CONFIG_DAHDI_WATCHDOG +#ifdef CONFIG_ZAPTEL_WATCHDOG int watchcounter; int watchstate; #endif @@ -1842,7 +1842,7 @@ struct zt_tone *zt_mf_tone(const struct zt_chan *chan, char digit, int digitmode /* Echo cancel a receive and transmit chunk for a given channel. This should be called by the low-level driver as close to the interface as possible. ECHO CANCELLATION IS NO LONGER AUTOMATICALLY DONE - AT THE DAHDI LEVEL. zt_ec_chunk will not echo cancel if it should + AT THE ZAPTEL LEVEL. zt_ec_chunk will not echo cancel if it should not be doing so. rxchunk is modified in-place */ void zt_ec_chunk(struct zt_chan *chan, unsigned char *rxchunk, const unsigned char *txchunk); @@ -2104,4 +2104,4 @@ static inline void zap_copy_string(char *dst, const char *src, unsigned int size *dst = '\0'; } -#endif /* _LINUX_DAHDI_H */ +#endif /* _LINUX_ZAPTEL_H */ |