From 7a6817f350f08b6553c1b7587f2ed4224730a244 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Wed, 29 Apr 2009 17:48:25 +0000 Subject: voicebus: Removing unused code blocks and space in flag definitions. git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@6523 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/voicebus.c | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/drivers/dahdi/voicebus.c b/drivers/dahdi/voicebus.c index 3fb847f..c67be25 100644 --- a/drivers/dahdi/voicebus.c +++ b/drivers/dahdi/voicebus.c @@ -222,7 +222,7 @@ struct voicebus { #define RX_UNDERRUN 2 #define IN_DEFERRED_PROCESSING 3 #define STOP 4 -#define STOPPED 8 +#define STOPPED 5 #if VOICEBUS_DEFERRED == WORKQUEUE #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) @@ -505,24 +505,6 @@ __vb_sdi_sendbits(struct voicebus *vb, u32 bits, int count) } } -#if 0 /* this function might be useful in the future for debugging. */ -static unsigned int -__vb_sdi_recvbits(struct voicebus *vb, int count) -{ - unsigned int bits = 0; - vb->sdi |= CSR9_MMC; - __vb_setctl(vb, 0x0048, vb->sdi); - while (count--) { - bits <<= 1; - if (__vb_sdi_clk(vb)) - bits |= 1; - else - bits &= ~1; - } - return bits; -} -#endif - static void vb_setsdi(struct voicebus *vb, int addr, u16 val) { @@ -1131,27 +1113,11 @@ vb_deferred(struct voicebus *vb) void *vbb; #ifdef DBG static int count; -#endif -#if 0 - int stopping = test_bit(STOP, &vb->flags); #endif int underrun = test_bit(TX_UNDERRUN, &vb->flags); start_vb_deferred(vb); -#if 0 - if (unlikely(stopping)) { - - while ((vbb = vb_get_completed_txb(vb))) - voicebus_free(vb, vbb); - - while ((vbb = vb_get_completed_rxb(vb))) - voicebus_free(vb, vbb); - - stop_vb_deferred(vb); - return; - } -#endif if (unlikely(underrun)) { /* When we've underrun our FIFO, for some reason we're not * able to keep enough transmit descriptors pending. This can -- cgit v1.2.3