[svn-commits] rmeyerriecks: linux/trunk r9010 - in /linux/trunk: drivers/dahdi/wct4xxp/ inc...

[SVN commits to the Digium repositories]

Author: rmeyerriecks
Date: Mon Jul 26 16:21:06 2010
New Revision: 9010

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9010
Log:
wct4xxp: Removed card level event handler

Upon review the event introduced in r8998 seemed to be
redundant, as the same information was already available.
Performance issues were also a concern. This reverts r8998.

Modified:
    linux/trunk/drivers/dahdi/wct4xxp/base.c
    linux/trunk/include/dahdi/user.h

Modified: linux/trunk/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wct4xxp/base.c?view=diff&rev=9010&r1=9009&r2=9010
==============================================================================
--- linux/trunk/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wct4xxp/base.c Mon Jul 26 16:21:06 2010
@@ -426,7 +426,6 @@
 static void t4_tsi_unassign(struct t4 *wc, int tospan, int tochan);
 static void __t4_set_rclk_src(struct t4 *wc, int span);
 static void __t4_set_sclk_src(struct t4 *wc, int mode, int master, int slave);
-static void t4_card_event(struct t4 *wc, int event);
 static void t4_check_alarms(struct t4 *wc, int span);
 static void t4_check_sigbits(struct t4 *wc, int span);
 
@@ -1560,8 +1559,6 @@
 			/*
 			 * The alarm simulation state machine requires us to
 			 * bring this bit up and down for at least 1 clock cycle
-			 * lock register writes to ensure nobody else tries to
-			 * write to FMR0, while we delay
 			 */
 			spin_lock_irqsave(&wc->reglock, flags);
 			__t4_framer_out(wc, span->offset,
@@ -2074,8 +2071,6 @@
 	cmr1 |= (span << 6);
 	__t4_framer_out(wc, 0, 0x44, cmr1);
 
-	t4_card_event(wc, DAHDI_EVENT_SYNC);
-
 	dev_info(&wc->dev->dev, "RCLK source set to span %d\n", span+1);
 }
 
@@ -2102,32 +2097,6 @@
 		wc->dmactrl &= ~(1 << 29);/* Provide timing from MCLK */
 
 	__t4_pci_out(wc, WC_DMACTRL, wc->dmactrl);
-}
-
-/*
- * We do not have a per-span or per-card event system. In
- * order to create a global event, we send that event to
- * every channel on the card
- */
-void t4_card_event(struct t4 *wc, int event)
-{
-	unsigned long flags;
-	struct dahdi_span *span;
-	struct dahdi_chan *chan;
-	int x, y;
-
-	/* Loop through every channel on this card and
-	 * set the global event that occured
-	 */
-	for (x = 0; x < wc->numspans; x++) {
-		span = &wc->tspans[x]->span;
-		for (y = 0; y < span->channels; y++) {
-			chan = span->chans[y];
-			spin_lock_irqsave(&chan->lock, flags);
-			dahdi_qevent_nolock(chan, event);
-			spin_unlock_irqrestore(&chan->lock, flags);
-		}
-	}
 }
 
 static inline void __t4_update_timing(struct t4 *wc)

Modified: linux/trunk/include/dahdi/user.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/include/dahdi/user.h?view=diff&rev=9010&r1=9009&r2=9010
==============================================================================
--- linux/trunk/include/dahdi/user.h (original)
+++ linux/trunk/include/dahdi/user.h Mon Jul 26 16:21:06 2010
@@ -450,9 +450,6 @@
 #define DAHDI_EVENT_PULSEDIGIT		(1 << 16)	/* This is OR'd with the digit received */
 #define DAHDI_EVENT_DTMFDOWN		(1 << 17)	/* Ditto for DTMF key down event */
 #define DAHDI_EVENT_DTMFUP		(1 << 18)	/* Ditto for DTMF key up event */
-
-/* If the source of timing changes */
-#define DAHDI_EVENT_SYNC		29
 
 /* Transcoder related definitions */