diff options
author | sruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2009-06-18 16:37:30 +0000 |
---|---|---|
committer | sruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2009-06-18 16:37:30 +0000 |
commit | c31fd1e104bc963efb481d0c3832d9947821fae8 (patch) | |
tree | c012e7f9afb3f3a8af0e5e4568ad29d89c1ab4d4 | |
parent | 05237901d998fe19d55f5650d84786417c07839b (diff) |
Revert "wctdm24xxp, voicebus: Enable the watchdog for the wctdm24xxp driver."
This reverts revision 4655, which was mistakenly committed.
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4658 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rw-r--r-- | kernel/voicebus.c | 15 | ||||
-rw-r--r-- | kernel/voicebus.h | 3 | ||||
-rw-r--r-- | kernel/wctdm24xxp/base.c | 7 | ||||
-rw-r--r-- | kernel/zconfig.h | 2 |
4 files changed, 1 insertions, 26 deletions
diff --git a/kernel/voicebus.c b/kernel/voicebus.c index 6724d32..aabfd8c 100644 --- a/kernel/voicebus.c +++ b/kernel/voicebus.c @@ -39,7 +39,6 @@ #include <linux/interrupt.h> #include <linux/timer.h> -#include "zconfig.h" #include "voicebus.h" #define assert(__x__) BUG_ON(!(__x__)) @@ -847,7 +846,6 @@ __vb_disable_interrupts(struct voicebus *vb) __vb_setctl(vb, IER_CSR7, 0); } - static void vb_disable_interrupts(struct voicebus *vb) { @@ -949,19 +947,6 @@ voicebus_start(struct voicebus *vb) return 0; } -#ifdef CONFIG_ZAPTEL_WATCHDOG -/** - * voicebus_watchdog - Called from a watchdog function to restart interrupts. - * - */ -int voicebus_watchdog(struct voicebus *vb) -{ - vb_tx_demand_poll(vb); - return 0; -} -EXPORT_SYMBOL(voicebus_watchdog); -#endif - static void vb_clear_start_transmit_bit(struct voicebus *vb) { diff --git a/kernel/voicebus.h b/kernel/voicebus.h index 59ec484..c234690 100644 --- a/kernel/voicebus.h +++ b/kernel/voicebus.h @@ -50,8 +50,5 @@ void voicebus_free(struct voicebus *vb, void *vbb); int voicebus_transmit(struct voicebus *vb, void *vbb); int voicebus_set_minlatency(struct voicebus *vb, unsigned int milliseconds); int voicebus_current_latency(struct voicebus *vb) ; -#ifdef CONFIG_ZAPTEL_WATCHDOG -int voicebus_watchdog(struct voicebus *vb); -#endif #endif /* __VOICEBUS_H__ */ diff --git a/kernel/wctdm24xxp/base.c b/kernel/wctdm24xxp/base.c index e9165f7..bf8a409 100644 --- a/kernel/wctdm24xxp/base.c +++ b/kernel/wctdm24xxp/base.c @@ -2704,16 +2704,11 @@ static int wctdm_open(struct zt_chan *chan) return 0; } -#ifdef CONFIG_ZAPTEL_WATCHDOG static int wctdm_watchdog(struct zt_span *span, int event) { - struct wctdm *wc = span->pvt; printk("TDM: Called watchdog\n"); - if (ZT_WATCHDOG_NOINTS == event) - voicebus_watchdog(wc->vb); return 0; } -#endif static int wctdm_close(struct zt_chan *chan) { @@ -2965,9 +2960,7 @@ static int wctdm_initialize(struct wctdm *wc) wc->span.close = wctdm_close; wc->span.flags = ZT_FLAG_RBS; wc->span.ioctl = wctdm_ioctl; -#ifdef CONFIG_ZAPTEL_WATCHDOG wc->span.watchdog = wctdm_watchdog; -#endif wc->span.dacs= wctdm_dacs; #ifdef VPM_SUPPORT wc->span.echocan_with_params = wctdm_echocan_with_params; diff --git a/kernel/zconfig.h b/kernel/zconfig.h index 7239c7f..26d1755 100644 --- a/kernel/zconfig.h +++ b/kernel/zconfig.h @@ -147,7 +147,7 @@ * Uncomment to enable "watchdog" to monitor if interfaces * stop taking interrupts or otherwise misbehave */ -#define CONFIG_ZAPTEL_WATCHDOG +/* #define CONFIG_ZAPTEL_WATCHDOG */ /* * Uncomment for Non-standard FXS groundstart start state (A=Low, B=Low) |