diff options
author | Russ Meyerriecks <rmeyerreicks@digium.com> | 2010-07-26 21:21:06 +0000 |
---|---|---|
committer | Russ Meyerriecks <rmeyerreicks@digium.com> | 2010-07-26 21:21:06 +0000 |
commit | 23ff0eae5ebc5598fbbbbf2ba54da98f48f4a1f8 (patch) | |
tree | abd555baa605f8a76f9fc57f40d1a7927864a118 | |
parent | 8ae264c892f20ad46da443f1ba5ff0625dd1fb39 (diff) |
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.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9010 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r-- | drivers/dahdi/wct4xxp/base.c | 31 | ||||
-rw-r--r-- | include/dahdi/user.h | 3 |
2 files changed, 0 insertions, 34 deletions
diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c index 9946b58..95c1e4e 100644 --- a/drivers/dahdi/wct4xxp/base.c +++ b/drivers/dahdi/wct4xxp/base.c @@ -426,7 +426,6 @@ static void t4_tsi_assign(struct t4 *wc, int fromspan, int fromchan, int tospan, 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 @@ static int t4_maint(struct dahdi_span *span, int cmd) /* * 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 @@ static void __t4_set_rclk_src(struct t4 *wc, int span) 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); } @@ -2104,32 +2099,6 @@ static void __t4_set_sclk_src(struct t4 *wc, int mode, int master, int slave) __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) { int i; diff --git a/include/dahdi/user.h b/include/dahdi/user.h index fc688c0..4cdabc4 100644 --- a/include/dahdi/user.h +++ b/include/dahdi/user.h @@ -451,9 +451,6 @@ enum { #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 */ struct dahdi_transcoder_formats { |